Commit 6a20e5b2 authored by Casper Boemann's avatar Casper Boemann

------------------------------------------------------------------------

r1202312 | danders | 2010-11-30 13:19:14 +0100 (Tue, 30 Nov 2010) | 2 lines
Changed paths:
   M /trunk/koffice/kplato/libs/kernel/kpttask.cpp

Don't add startup/shutdown cost to bcwp.

------------------------------------------------------------------------
r1202313 | danders | 2010-11-30 13:20:24 +0100 (Tue, 30 Nov 2010) | 2 lines
Changed paths:
   M /trunk/koffice/kplato/libs/kernel/kptresource.cpp

Set overtime rate defualt to 0, it's not used atm.

------------------------------------------------------------------------
r1202314 | danders | 2010-11-30 13:20:52 +0100 (Tue, 30 Nov 2010) | 2 lines
Changed paths:
   M /trunk/koffice/kplato/libs/kernel/tests/debug.cpp

SVN_SILENT debug

------------------------------------------------------------------------
r1202315 | danders | 2010-11-30 13:23:06 +0100 (Tue, 30 Nov 2010) | 2 lines
Changed paths:
   M /trunk/koffice/kplato/libs/kernel/tests/PerformanceTester.cpp

Fix unit test to handle startup/shutdown cost.


------------------------------------------------------------------------
r1202451 | staniek | 2010-11-30 23:43:05 +0100 (Tue, 30 Nov 2010) | 4 lines
Changed paths:
   M /trunk/koffice/kexi/kexidb/roweditbuffer.cpp

KexiDB
*fix memory leak in RowEditBuffer



------------------------------------------------------------------------
r1202494 | scripty | 2010-12-01 07:13:50 +0100 (Wed, 01 Dec 2010) | 1 line
Changed paths:
   M /trunk/koffice/kpresenter/templates/odf/.directory
   M /trunk/koffice/kpresenter/templates/odf/business.desktop
   M /trunk/koffice/tools/f-office/freoffice.desktop
   M /trunk/koffice/tools/okularodpgenerator/okularApplication_odp.desktop

SVN_SILENT made messages (.desktop file)

------------------------------------------------------------------------
r1202539 | staniek | 2010-12-01 10:30:47 +0100 (Wed, 01 Dec 2010) | 4 lines
Changed paths:
   M /trunk/koffice/kexi/core/kexiactionproxy.cpp

Core
*fix memory leak in KexiActionProxy



------------------------------------------------------------------------
r1202541 | staniek | 2010-12-01 10:32:43 +0100 (Wed, 01 Dec 2010) | 4 lines
Changed paths:
   M /trunk/koffice/kexi/widget/tableview/kexitableview.cpp
   M /trunk/koffice/kexi/widget/tableview/kexitableviewheader.cpp

Table View
*unset style in header earlier to avoid reading of uninitialized memory reported by valgrind



------------------------------------------------------------------------
r1202544 | staniek | 2010-12-01 10:36:51 +0100 (Wed, 01 Dec 2010) | 4 lines
Changed paths:
   M /trunk/koffice/libs/koreport/common/krdetailsectiondata.cpp
   M /trunk/koffice/libs/koreport/common/krdetailsectiondata.h
   M /trunk/koffice/libs/koreport/common/krreportdata.cpp
   M /trunk/koffice/libs/koreport/common/krreportdata.h
   M /trunk/koffice/libs/koreport/common/krsectiondata.cpp
   M /trunk/koffice/libs/koreport/common/krsectiondata.h
   M /trunk/koffice/libs/koreport/renderer/KoReportPreRenderer.cpp
   M /trunk/koffice/libs/koreport/renderer/KoReportPreRenderer.h
   M /trunk/koffice/libs/koreport/wrtembed/reportsection.cpp

KoReports
*make KRDetailSectionData, KRSectionData, KoReportReportData, KoReportPreRenderer owned by parent QObect, this fixes memory leaks


------------------------------------------------------------------------
r1202545 | staniek | 2010-12-01 10:37:18 +0100 (Wed, 01 Dec 2010) | 2 lines
Changed paths:
   M /trunk/koffice/kexi/doc/dev/CHANGELOG-Kexi-js

SVN_SILENT update


------------------------------------------------------------------------
r1202552 | rempt | 2010-12-01 11:19:18 +0100 (Wed, 01 Dec 2010) | 4 lines
Changed paths:
   M /trunk/koffice/krita/image/kis_histogram.cc
   M /trunk/koffice/krita/image/kis_histogram.h
   M /trunk/koffice/krita/image/tests/kis_histogram_test.cpp
   M /trunk/koffice/krita/plugins/extensions/dockers/defaultdockers/histogramdock.cpp
   M /trunk/koffice/krita/plugins/extensions/scripting/kritacore/krs_histogram.cpp
   M /trunk/koffice/krita/plugins/filters/colorsfilters/colorsfilters.cpp
   M /trunk/koffice/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
   M /trunk/koffice/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h
   M /trunk/koffice/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp

Fix usage of histograms in brightness/contrast filter

Patch by William Steidtmann
CCMAIL:billstei@hbci.com

------------------------------------------------------------------------
r1202752 | berger | 2010-12-02 08:09:45 +0100 (Thu, 02 Dec 2010) | 7 lines
Changed paths:
   M /trunk/koffice/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp

Disable painting with color adjustment filter for 2.3

(Not to be commited in koffice-essen, please :) )

CCMAIL: cbr@boemann.dk
CCBUG: 258530

------------------------------------------------------------------------
r1202753 | danders | 2010-12-02 08:43:44 +0100 (Thu, 02 Dec 2010) | 2 lines
Changed paths:
   M /trunk/koffice/kplato/libs/ui/reports/reportdata.cpp
   M /trunk/koffice/kplato/libs/ui/reports/reportdata.h
   M /trunk/koffice/kplato/libs/ui/reports/reportview.cpp
   M /trunk/koffice/kplato/libs/ui/reports/reportview.h
   M /trunk/koffice/kplato/libs/ui/reports/reportview_p.h

Reports: Enable chart to get access to report data.



svn path=/branches/work/koffice-essen/; revision=1202769
parent cc1eb111
......@@ -43,21 +43,6 @@ KisHistogram::KisHistogram(const KisPaintLayerSP layer,
updateHistogram();
}
// TODO: get rid of this, make all Histogram clients pass bounds (they can pass paintdev->exactBounds() if they want)
KisHistogram::KisHistogram(const KisPaintDeviceSP paintdev,
KoHistogramProducerSP producer,
const enumHistogramType type)
{
m_paintDevice = paintdev;
m_bounds = m_paintDevice->exactBounds();
m_type = type;
m_producer = producer;
m_selection = false;
m_channel = 0;
updateHistogram();
}
KisHistogram::KisHistogram(const KisPaintDeviceSP paintdev,
const QRect &bounds,
KoHistogramProducerSP producer,
......
......@@ -108,10 +108,6 @@ public:
KoHistogramProducerSP producer,
const enumHistogramType type);
KisHistogram(KisPaintDeviceSP paintdev,
KoHistogramProducerSP producer,
const enumHistogramType type);
KisHistogram(KisPaintDeviceSP paintdev,
const QRect &bounds,
KoHistogramProducerSP producer,
......
......@@ -24,6 +24,8 @@
#include <KoHistogramProducer.h>
#include "kis_paint_device.h"
#include "kis_histogram.h"
#include "kis_paint_layer.h"
#include "kis_types.h"
void KisHistogramTest::testCreation()
{
......@@ -32,7 +34,7 @@ void KisHistogramTest::testCreation()
QList<QString> producers = KoHistogramProducerFactoryRegistry::instance()->keysCompatibleWith(cs);
foreach (const QString &id, producers) {
KoHistogramProducerSP producer = KoHistogramProducerFactoryRegistry::instance()->get(id)->generate();
KisHistogram test(dev, producer, LINEAR);
KisHistogram test(dev, QRect(0, 0, 100, 100), producer, LINEAR);
}
}
......
......@@ -172,7 +172,8 @@ void KisHistogramDocker::producerChanged(QAction *action)
// use dummy layer as a source; we are not going to actually use or need it
// All of these are SP, no need to delete them afterwards
m_histogram = new KisHistogram(new KisPaintDevice(KoColorSpaceRegistry::instance()->alpha8()),
KisPaintDeviceSP paintDevice = new KisPaintDevice(KoColorSpaceRegistry::instance()->alpha8());
m_histogram = new KisHistogram(paintDevice, paintDevice->exactBounds(),
KoHistogramProducerSP(m_producer), LOGARITHMIC);
kDebug() << "created histogram " << m_histogram;
......
......@@ -38,7 +38,7 @@ Histogram::Histogram(ConstPaintDevice* layer, KoHistogramProducerSP producer, co
: QObject(layer)
{
setObjectName("KritaHistogram");
m_histogram = new KisHistogram(layer->paintDevice(), producer, type);
m_histogram = new KisHistogram(layer->paintDevice(), layer->paintDevice()->exactBounds(), producer, type);
}
Histogram::~Histogram()
......
......@@ -116,7 +116,7 @@ void KisAutoContrast::process(KisConstProcessingInformation srcInfo,
Q_UNUSED(config);
// initialize
KoHistogramProducerSP producer = KoHistogramProducerSP(new KoGenericLabHistogramProducer());
KisHistogram histogram(src, producer, LINEAR);
KisHistogram histogram(src, src->exactBounds(), producer, LINEAR);
int minvalue = int(255 * histogram.calculations().getMin() + 0.5);
int maxvalue = int(255 * histogram.calculations().getMax() + 0.5);
......
......@@ -152,8 +152,7 @@ KisBrightnessContrastFilter::KisBrightnessContrastFilter()
KisConfigWidget * KisBrightnessContrastFilter::createConfigurationWidget(QWidget *parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
{
Q_UNUSED(image);
return new KisBrightnessContrastConfigWidget(parent, dev);
return new KisBrightnessContrastConfigWidget(parent, dev, image->bounds());
}
KisFilterConfiguration* KisBrightnessContrastFilter::factoryConfiguration(const KisPaintDeviceSP)
......@@ -177,7 +176,7 @@ KoColorTransformation* KisBrightnessContrastFilter::createTransformation(const K
return adjustment;
}
KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(QWidget * parent, KisPaintDeviceSP dev, Qt::WFlags f)
KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const QRect &bounds, Qt::WFlags f)
: KisConfigWidget(parent, f)
{
int i;
......@@ -219,7 +218,7 @@ KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(QWidget * p
m_page->vgradient->setPixmap(vgradientpix);
KoHistogramProducerSP producer = KoHistogramProducerSP(new KoGenericLabHistogramProducer());
KisHistogram histogram(dev, producer, LINEAR);
KisHistogram histogram(dev, bounds, producer, LINEAR);
QPixmap pix(256, height);
pix.fill();
QPainter p(&pix);
......
......@@ -98,7 +98,7 @@ class KisBrightnessContrastConfigWidget : public KisConfigWidget
{
public:
KisBrightnessContrastConfigWidget(QWidget * parent, KisPaintDeviceSP dev, Qt::WFlags f = 0);
KisBrightnessContrastConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const QRect &bounds, Qt::WFlags f = 0);
virtual ~KisBrightnessContrastConfigWidget() {}
virtual KisBrightnessContrastFilterConfiguration * configuration() const;
......
......@@ -87,7 +87,7 @@ KisPerChannelConfigWidget::KisPerChannelConfigWidget(QWidget * parent, KisPaintD
{
KoHistogramProducerFactory *hpf;
hpf = KoHistogramProducerFactoryRegistry::instance()->get(keys.at(0));
m_histogram = new KisHistogram(m_dev, hpf->generate(), LINEAR);
m_histogram = new KisHistogram(m_dev, m_dev->exactBounds(), hpf->generate(), LINEAR);
}
connect(m_page->curveWidget, SIGNAL(modified()), this, SIGNAL(sigConfigurationItemChanged()));
......@@ -380,7 +380,7 @@ void KisPerChannelFilterConfiguration::toXML(QDomDocument& doc, QDomElement& roo
KisPerChannelFilter::KisPerChannelFilter() : KisColorTransformationFilter(id(), categoryAdjust(), i18n("&Color Adjustment curves..."))
{
setSupportsPainting(true);
setSupportsPainting(false);
setSupportsIncrementalPainting(false);
setColorSpaceIndependence(TO_LAB16);
}
......
......@@ -20,16 +20,19 @@
#include "krdetailsectiondata.h"
#include "krsectiondata.h"
#include "krreportdata.h"
#include <kdebug.h>
KRDetailSectionData::KRDetailSectionData()
KRDetailSectionData::KRDetailSectionData(QObject *parent)
: QObject(parent)
{
m_pageBreak = BreakNone;
m_detailSection = 0;
}
KRDetailSectionData::KRDetailSectionData(const QDomElement &elemSource, KoReportReportData *report)
: QObject(report)
{
m_pageBreak = BreakNone;
m_detailSection = 0;
......
......@@ -35,8 +35,8 @@ class KRDetailSectionData : public QObject
{
Q_OBJECT
public:
KRDetailSectionData();
KRDetailSectionData(const QDomElement &, KoReportReportData*);
explicit KRDetailSectionData(QObject *parent = 0);
KRDetailSectionData(const QDomElement &elemSource, KoReportReportData *report);
~KRDetailSectionData();
enum PageBreak {
......
......@@ -29,15 +29,17 @@ void KoReportReportData::init()
m_reportHeader = m_reportFooter = 0;
}
KoReportReportData::KoReportReportData()
: m_detailSection(0)
KoReportReportData::KoReportReportData(QObject *parent)
: QObject(parent)
, m_detailSection(0)
{
init();
m_valid = true;
}
KoReportReportData::KoReportReportData(const QDomElement & elemSource)
: m_detailSection(0)
KoReportReportData::KoReportReportData(const QDomElement & elemSource, QObject *parent)
: QObject(parent)
, m_detailSection(0)
{
m_valid = false;
init();
......
......@@ -41,8 +41,8 @@ class KoReportReportData : public QObject
Q_OBJECT
public:
explicit KoReportReportData(const QDomElement & elemSource);
KoReportReportData();
explicit KoReportReportData(const QDomElement & elemSource, QObject *parent = 0);
explicit KoReportReportData(QObject *parent = 0);
~KoReportReportData();
bool isValid() const {
......
......@@ -30,14 +30,15 @@
#include "KoReportPluginManager.h"
#include "KoReportItemLine.h"
KRSectionData::KRSectionData()
KRSectionData::KRSectionData(QObject* parent)
: QObject(parent)
{
createProperties(QDomElement());
}
KRSectionData::KRSectionData(const QDomElement & elemSource, KoReportReportData* report)
: QObject(report)
{
Q_UNUSED(report)
setObjectName(elemSource.tagName());
if (objectName() != QLatin1String("report:section")) {
......
......@@ -66,7 +66,7 @@ public:
Detail
};
KRSectionData();
explicit KRSectionData(QObject* parent = 0);
KRSectionData(const QDomElement &, KoReportReportData* report);
~KRSectionData();
KoProperty::Set* propertySet() const {
......
......@@ -657,7 +657,7 @@ bool KoReportPreRenderer::setDom(const QDomElement &docReport)
return false;
}
d->m_reportData = new KoReportReportData(docReport);
d->m_reportData = new KoReportReportData(docReport, this);
d->m_valid = d->m_reportData->isValid();
}
return isValid();
......
......@@ -37,10 +37,10 @@ class KoReportData;
// This class takes a report definition and prerenders the result to
// an ORODocument that can be used to pass to any number of renderers.
//
class KOREPORT_EXPORT KoReportPreRenderer
class KOREPORT_EXPORT KoReportPreRenderer : public QObject
{
public:
KoReportPreRenderer(const QDomElement&);
explicit KoReportPreRenderer(const QDomElement&);
virtual ~KoReportPreRenderer();
......
......@@ -74,7 +74,7 @@ static const char *arrow_xpm[] = {
ReportSection::ReportSection(KoReportDesigner * rptdes)
: QWidget(rptdes)
{
m_sectionData = new KRSectionData();
m_sectionData = new KRSectionData(this);
connect(m_sectionData->propertySet(), SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
int dpiY = KoDpi::dpiY();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment