[Digikam-devel] extragear/graphics
Gilles Caulier
caulier.gilles at free.fr
Sun Jul 31 19:11:13 BST 2005
SVN commit 441707 by cgilles:
Bugfix : since imageguidewidget isn't updated periodicly by timerEvent when no guide is diplayed, the preview effect of any plugins isn't rendered.
This commit resolve this problem
CCMAIL: digikam-devel at kde.org
M +3 -2 digikam/digikam.kdevelop
M +13 -14 digikam/libs/widgets/imageguidewidget.cpp
M +1 -0 digikam/libs/widgets/imageguidewidget.h
M +1 -1 digikamimageplugins/adjustcurves/adjustcurves.cpp
M +1 -1 digikamimageplugins/adjustlevels/adjustlevels.cpp
M +1 -1 digikamimageplugins/antivignetting/imageeffect_antivignetting.cpp
M +1 -1 digikamimageplugins/border/imageeffect_border.cpp
M +1 -1 digikamimageplugins/channelmixer/channelmixer.cpp
M +1 -1 digikamimageplugins/distortionfx/imageeffect_distortionfx.cpp
M +1 -1 digikamimageplugins/freerotation/imageeffect_freerotation.cpp
M +1 -1 digikamimageplugins/lensdistortion/imageeffect_lensdistortion.cpp
M +1 -1 digikamimageplugins/raindrop/imageeffect_raindrop.cpp
M +1 -1 digikamimageplugins/sheartool/imageeffect_sheartool.cpp
M +1 -1 digikamimageplugins/whitebalance/imageeffect_whitebalance.cpp
--- trunk/extragear/graphics/digikam/digikam.kdevelop #441706:441707
@@ -14,6 +14,7 @@
<absoluteprojectpath>false</absoluteprojectpath>
<description/>
<ignoreparts>
+ <part>CvsService</part>
<part>KDevClearCase</part>
<part>KDevPerforce</part>
</ignoreparts>
@@ -114,7 +115,7 @@
<envvar value="1" name="WANT_AUTOCONF_2_5" />
<envvar value="1" name="WANT_AUTOMAKE_1_6" />
</envvars>
- <abortonerror>false</abortonerror>
+ <abortonerror>true</abortonerror>
<numberofjobs>1</numberofjobs>
<dontact>false</dontact>
<makebin/>
@@ -126,7 +127,7 @@
<mainprogram>digikam/digikam/digikam</mainprogram>
<programargs/>
<terminal>false</terminal>
- <autocompile>true</autocompile>
+ <autocompile>false</autocompile>
<envvars/>
</run>
<general>
--- trunk/extragear/graphics/digikam/libs/widgets/imageguidewidget.cpp #441706:441707
@@ -93,8 +93,7 @@
{
m_spot.setX( m_w / 2 );
m_spot.setY( m_h / 2 );
- updatePixmap();
- repaint(false);
+ updatePreview();
}
QPoint ImageGuideWidget::getSpotPosition(void)
@@ -134,22 +133,19 @@
m_timerID = 0;
}
- updatePixmap();
- repaint(false);
+ updatePreview();
}
void ImageGuideWidget::slotChangeGuideColor(const QColor &color)
{
m_guideColor = color;
- updatePixmap();
- repaint(false);
+ updatePreview();
}
void ImageGuideWidget::slotChangeGuideSize(int size)
{
m_guideSize = size;
- updatePixmap();
- repaint(false);
+ updatePreview();
}
void ImageGuideWidget::updatePixmap( void )
@@ -206,14 +202,19 @@
bitBlt(this, 0, 0, m_pixmap);
}
+void ImageGuideWidget::updatePreview( void )
+{
+ updatePixmap();
+ repaint(false);
+}
+
void ImageGuideWidget::timerEvent(QTimerEvent * e)
{
if (e->timerId() == m_timerID)
{
if (m_flicker == 5) m_flicker=0;
else m_flicker++;
- updatePixmap();
- repaint(false);
+ updatePreview();
}
else
QWidget::timerEvent(e);
@@ -247,8 +248,7 @@
m_focus = true;
m_spot.setX(e->x()-m_rect.x());
m_spot.setY(e->y()-m_rect.y());;
- updatePixmap();
- repaint(false);
+ updatePreview();
}
}
@@ -279,8 +279,7 @@
{
m_spot.setX(e->x()-m_rect.x());
m_spot.setY(e->y()-m_rect.y());
- updatePixmap();
- repaint(false);
+ updatePreview();
}
else
setCursor( KCursor::arrowCursor() );
--- trunk/extragear/graphics/digikam/libs/widgets/imageguidewidget.h #441706:441707
@@ -64,6 +64,7 @@
QColor getSpotColor(void);
void setSpotVisible(bool v);
void resetSpotPosition(void);
+ void updatePreview( void );
public slots:
--- trunk/extragear/graphics/digikamimageplugins/adjustcurves/adjustcurves.cpp #441706:441707
@@ -368,7 +368,7 @@
m_curves->curvesLutProcess(orgData, desData, w, h);
ifaceDest->putPreviewData(desData);
- m_previewTargetWidget->update();
+ m_previewTargetWidget->updatePreview();
delete [] orgData;
delete [] desData;
--- trunk/extragear/graphics/digikamimageplugins/adjustlevels/adjustlevels.cpp #441706:441707
@@ -505,7 +505,7 @@
m_levels->levelsLutProcess(orgData, desData, w, h);
ifaceDest->putPreviewData(desData);
- m_previewTargetWidget->update();
+ m_previewTargetWidget->updatePreview();
delete [] orgData;
delete [] desData;
--- trunk/extragear/graphics/digikamimageplugins/antivignetting/imageeffect_antivignetting.cpp #441706:441707
@@ -296,7 +296,7 @@
// Adjust Image BCG.
iface->setPreviewBCG(b, c, g);
- m_imagePreviewWidget->update();
+ m_imagePreviewWidget->updatePreview();
}
void ImageEffect_AntiVignetting::putFinalData(void)
--- trunk/extragear/graphics/digikamimageplugins/border/imageeffect_border.cpp #441706:441707
@@ -439,7 +439,7 @@
bitBlt( &imDest, (w-tmp.width())/2, (h-tmp.height())/2, &tmp, 0, 0, tmp.width(), tmp.height());
iface->putPreviewData((uint*)(imDest.smoothScale(w, h)).bits());
- m_imagePreviewWidget->update();
+ m_imagePreviewWidget->updatePreview();
}
void ImageEffect_Border::putFinalData(void)
--- trunk/extragear/graphics/digikamimageplugins/channelmixer/channelmixer.cpp #441706:441707
@@ -438,7 +438,7 @@
}
ifaceDest->putPreviewData(m_destinationPreviewData);
- m_previewTargetWidget->update();
+ m_previewTargetWidget->updatePreview();
// Update histogram.
m_histogramWidget->updateData(m_destinationPreviewData, w, h, 0, 0, 0, false);
--- trunk/extragear/graphics/digikamimageplugins/distortionfx/imageeffect_distortionfx.cpp #441706:441707
@@ -347,7 +347,7 @@
iface->putPreviewData((uint*)(imDest.smoothScale(iface->previewWidth(),
iface->previewHeight())).bits());
- m_imagePreviewWidget->update();
+ m_imagePreviewWidget->updatePreview();
}
void ImageEffect_DistortionFX::putFinalData(void)
--- trunk/extragear/graphics/digikamimageplugins/freerotation/imageeffect_freerotation.cpp #441706:441707
@@ -254,7 +254,7 @@
iface->putPreviewData((uint*)(imDest.smoothScale(iface->previewWidth(),
iface->previewHeight())).bits());
- m_imagePreviewWidget->update();
+ m_imagePreviewWidget->updatePreview();
QSize newSize = dynamic_cast<FreeRotation *>(m_threadedFilter)->getNewSize();
QString temp;
m_newWidthLabel->setText(temp.setNum( newSize.width()) + i18n(" px") );
--- trunk/extragear/graphics/digikamimageplugins/lensdistortion/imageeffect_lensdistortion.cpp #441706:441707
@@ -259,7 +259,7 @@
iface->putPreviewData((uint*)(imDest.smoothScale(iface->previewWidth(),
iface->previewHeight())).bits());
- m_imagePreviewWidget->update();
+ m_imagePreviewWidget->updatePreview();
}
void ImageEffect_LensDistortion::putFinalData(void)
--- trunk/extragear/graphics/digikamimageplugins/raindrop/imageeffect_raindrop.cpp #441706:441707
@@ -216,7 +216,7 @@
iface->putPreviewData((uint*)(imDest.smoothScale(iface->previewWidth(),
iface->previewHeight())).bits());
- m_imagePreviewWidget->update();
+ m_imagePreviewWidget->updatePreview();
}
void ImageEffect_RainDrop::putFinalData(void)
--- trunk/extragear/graphics/digikamimageplugins/sheartool/imageeffect_sheartool.cpp #441706:441707
@@ -230,7 +230,7 @@
iface->putPreviewData((uint*)(imDest.smoothScale(iface->previewWidth(),
iface->previewHeight())).bits());
- m_imagePreviewWidget->update();
+ m_imagePreviewWidget->updatePreview();
QSize newSize = dynamic_cast<ShearTool *>(m_threadedFilter)->getNewSize();
QString temp;
m_newWidthLabel->setText(temp.setNum( newSize.width()) + i18n(" px") );
--- trunk/extragear/graphics/digikamimageplugins/whitebalance/imageeffect_whitebalance.cpp #441706:441707
@@ -648,7 +648,7 @@
whiteBalance(m_destinationPreviewData, w, h);
ifaceDest->putPreviewData(m_destinationPreviewData);
- m_previewTargetWidget->update();
+ m_previewTargetWidget->updatePreview();
// Update histogram.
m_histogramWidget->updateData(m_destinationPreviewData, w, h, 0, 0, 0, false);
More information about the Digikam-devel
mailing list