[Digikam-devel] extragear/graphics/digikam/libs/widgets/imageplugins
Gilles Caulier
caulier.gilles at kdemail.net
Mon Jan 15 08:53:10 GMT 2007
SVN commit 623678 by cgilles:
digiKam from trunk : Image Editor : fix color managed view rendering in all color correction image plugins (probelm reported initialy by a digiKam user from mailing list about Color Management plugin).
CCMAIL: digikam-devel at kde.org
M +10 -11 imageguidewidget.cpp
M +15 -17 imageguidewidget.h
M +5 -5 imagepaniconwidget.cpp
M +3 -3 imagepaniconwidget.h
M +4 -4 imagepannelwidget.cpp
M +3 -4 imagepannelwidget.h
M +5 -6 imageregionwidget.cpp
M +3 -4 imageregionwidget.h
--- trunk/extragear/graphics/digikam/libs/widgets/imageplugins/imageguidewidget.cpp #623677:623678
@@ -1,10 +1,9 @@
/* ============================================================
- * File : imageguidewidget.cpp
- * Author: Gilles Caulier <caulier dot gilles at kdemail dot net>
- * Date : 2004-11-16
- * Description : a widget to display an image with a guide
+ * Authors: Gilles Caulier <caulier dot gilles at kdemail dot net>
+ * Date : 2004-11-16
+ * Description : a widget to display an image with guides
*
- * Copyright 2004-2006 by Gilles Caulier
+ * Copyright 2004-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -44,6 +43,7 @@
#include "dimg.h"
#include "imageiface.h"
#include "imageguidewidget.h"
+#include "imageguidewidget.moc"
namespace Digikam
{
@@ -217,7 +217,7 @@
if (d->renderingPreviewMode == PreviewOriginalImage ||
(d->renderingPreviewMode == PreviewToggleOnMouseOver && d->onMouseMovePreviewToggled == false ))
{
- p.drawPixmap(d->rect, d->preview.convertToPixmap());
+ p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview));
text = i18n("Original");
fontRect = fontMt.boundingRect(0, 0, d->rect.width(), d->rect.height(), 0, text);
@@ -251,7 +251,7 @@
if (d->renderingPreviewMode == PreviewBothImagesVert)
{
// Drawing the original image.
- p.drawPixmap(d->rect, d->preview.convertToPixmap());
+ p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview));
// Drawing the target image under the original.
d->iface->paint(d->pixmap,
@@ -270,7 +270,7 @@
d->rect.height());
// Drawing the original image under the target.
- p.drawPixmap(d->rect.x(), d->rect.y(), d->preview.convertToPixmap(),
+ p.drawPixmap(d->rect.x(), d->rect.y(), d->iface->convertToPixmap(d->preview),
0, 0, d->rect.width()/2, d->rect.height());
}
@@ -313,7 +313,7 @@
if (d->renderingPreviewMode == PreviewBothImagesHorz)
{
// Drawing the original image.
- p.drawPixmap(d->rect, d->preview.convertToPixmap());
+ p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview));
// Drawing the target image under the original.
d->iface->paint(d->pixmap,
@@ -332,7 +332,7 @@
d->rect.height());
// Drawing the original image under the target.
- p.drawPixmap(d->rect.x(), d->rect.y(), d->preview.convertToPixmap(),
+ p.drawPixmap(d->rect.x(), d->rect.y(), d->iface->convertToPixmap(d->preview),
0, 0, d->rect.width(), d->rect.height()/2);
}
@@ -590,4 +590,3 @@
} // NameSpace Digikam
-#include "imageguidewidget.moc"
--- trunk/extragear/graphics/digikam/libs/widgets/imageplugins/imageguidewidget.h #623677:623678
@@ -1,10 +1,9 @@
/* ============================================================
- * File : imageguidewidget.h
- * Author: Gilles Caulier <caulier dot gilles at kdemail dot net>
- * Date : 2004-08-20
- * Description : a widget to display an image with a guide
+ * Authors: Gilles Caulier <caulier dot gilles at kdemail dot net>
+ * Date : 2004-08-20
+ * Description : a widget to display an image with guides
*
- * Copyright 2004-2006 Gilles Caulier
+ * Copyright 2004-2007 Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -97,20 +96,20 @@
signals:
- void spotPositionChangedFromOriginal( const Digikam::DColor &color, const QPoint &position );
- void spotPositionChangedFromTarget( const Digikam::DColor &color, const QPoint &position );
+ void spotPositionChangedFromOriginal(const Digikam::DColor &color, const QPoint &position);
+ void spotPositionChangedFromTarget(const Digikam::DColor &color, const QPoint &position);
void signalResized(void);
protected:
- void paintEvent( QPaintEvent *e );
- void resizeEvent( QResizeEvent * e );
- void timerEvent(QTimerEvent * e);
- void mousePressEvent( QMouseEvent * e );
- void mouseReleaseEvent( QMouseEvent * e );
- void mouseMoveEvent( QMouseEvent * e );
- void enterEvent ( QEvent * e );
- void leaveEvent ( QEvent * e );
+ void paintEvent(QPaintEvent*);
+ void resizeEvent(QResizeEvent*);
+ void timerEvent(QTimerEvent*);
+ void mousePressEvent(QMouseEvent*);
+ void mouseReleaseEvent(QMouseEvent*);
+ void mouseMoveEvent(QMouseEvent*);
+ void enterEvent(QEvent*);
+ void leaveEvent(QEvent*);
private:
@@ -118,8 +117,7 @@
private:
- ImageGuideWidgetPriv* d;
-
+ ImageGuideWidgetPriv* d;
};
} // NameSpace Digikam
--- trunk/extragear/graphics/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp #623677:623678
@@ -1,10 +1,10 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at kdemail dot net>
- * Date : 2004-08-22
+ * Authors: Gilles Caulier <caulier dot gilles at kdemail dot net>
+ * Date : 2004-08-22
* Description : a widget to display a panel to choose
* a rectangular image area.
*
- * Copyright 2004-2006 by Gilles Caulier
+ * Copyright 2004-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -37,8 +37,9 @@
#include "ddebug.h"
#include "imageiface.h"
+#include "imageregionwidget.h"
#include "imagepaniconwidget.h"
-#include "imageregionwidget.h"
+#include "imagepaniconwidget.moc"
namespace Digikam
{
@@ -336,4 +337,3 @@
} // NameSpace Digikam
-#include "imagepaniconwidget.moc"
--- trunk/extragear/graphics/digikam/libs/widgets/imageplugins/imagepaniconwidget.h #623677:623678
@@ -1,10 +1,10 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at kdemail dot net>
- * Date : 2004-08-22
+ * Authors: Gilles Caulier <caulier dot gilles at kdemail dot net>
+ * Date : 2004-08-22
* Description : a widget to display a panel to choose
* a rectangular image area.
*
- * Copyright 2004-2006 by Gilles Caulier
+ * Copyright 2004-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
--- trunk/extragear/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp #623677:623678
@@ -1,9 +1,9 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at kdemail dot net>
- * Date : 2005-07-01
+ * Authors: Gilles Caulier <caulier dot gilles at kdemail dot net>
+ * Date : 2005-07-01
* Description : a widget to draw a control pannel image tool.
*
- * Copyright 2005-2006 by Gilles Caulier
+ * Copyright 2005-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -52,6 +52,7 @@
#include "imageregionwidget.h"
#include "imagepaniconwidget.h"
#include "imagepannelwidget.h"
+#include "imagepannelwidget.moc"
namespace Digikam
{
@@ -488,4 +489,3 @@
} // NameSpace Digikam
-#include "imagepannelwidget.moc"
--- trunk/extragear/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.h #623677:623678
@@ -1,9 +1,9 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at kdemail dot net>
- * Date : 2005-07-01
+ * Authors: Gilles Caulier <caulier dot gilles at kdemail dot net>
+ * Date : 2005-07-01
* Description : a widget to draw a control pannel image tool.
*
- * Copyright 2005-2006 Gilles Caulier
+ * Copyright 2005-2007 Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -112,7 +112,6 @@
private:
ImagePannelWidgetPriv* d;
-
};
} // NameSpace Digikam
--- trunk/extragear/graphics/digikam/libs/widgets/imageplugins/imageregionwidget.cpp #623677:623678
@@ -1,9 +1,9 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at kdemail dot net>
- * Date : 2004-08-17
+ * Authors: Gilles Caulier <caulier dot gilles at kdemail dot net>
+ * Date : 2004-08-17
* Description : a widget to draw an image clip region.
*
- * Copyright 2004-2006 by Gilles Caulier
+ * Copyright 2004-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -43,6 +43,7 @@
#include "ddebug.h"
#include "imageiface.h"
#include "imageregionwidget.h"
+#include "imageregionwidget.moc"
namespace Digikam
{
@@ -205,8 +206,7 @@
break;
}
default:
- DWarning() << "Unknown separation view specified"
- << endl;
+ DWarning() << "Unknown separation view specified" << endl;
}
repaintContents(false);
@@ -497,4 +497,3 @@
} // NameSpace Digikam
-#include "imageregionwidget.moc"
--- trunk/extragear/graphics/digikam/libs/widgets/imageplugins/imageregionwidget.h #623677:623678
@@ -1,9 +1,9 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at kdemail dot net>
- * Date : 2004-08-17
+ * Authors: Gilles Caulier <caulier dot gilles at kdemail dot net>
+ * Date : 2004-08-17
* Description : a widget to draw an image clip region.
*
- * Copyright 2004-2006 by Gilles Caulier
+ * Copyright 2004-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -108,7 +108,6 @@
private:
ImageRegionWidgetPriv* d;
-
};
} // NameSpace Digikam
More information about the Digikam-devel
mailing list