[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/extragear/kde3/graphics/digikam
From: Andi Clemens <andi.clemens () gmx ! net>
Date: 2008-08-23 22:25:59
Message-ID: 1219530359.436566.28156.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 851522 by aclemens:
polish
M +22 -23 imageplugins/inpainting/imageeffect_inpainting.cpp
M +52 -51 libs/greycstoration/greycstorationwidget.cpp
--- branches/extragear/kde3/graphics/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp \
#851521:851522 @@ -22,7 +22,7 @@
*
* ============================================================ */
-// C++ include.
+// C++ includes.
#include <cstdio>
#include <cmath>
@@ -30,40 +30,39 @@
// Qt includes.
-#include <qvgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qframe.h>
+#include <qbrush.h>
#include <qcheckbox.h>
#include <qcombobox.h>
-#include <qtabwidget.h>
-#include <qtimer.h>
#include <qevent.h>
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qbrush.h>
#include <qfile.h>
+#include <qframe.h>
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qpainter.h>
+#include <qpixmap.h>
+#include <qpushbutton.h>
+#include <qtabwidget.h>
+#include <qtimer.h>
+#include <qtooltip.h>
+#include <qvgroupbox.h>
+#include <qwhatsthis.h>
// KDE includes.
-#include <kcursor.h>
-#include <kurllabel.h>
-#include <klocale.h>
#include <kaboutdata.h>
-#include <khelpmenu.h>
-#include <kiconloader.h>
#include <kapplication.h>
-#include <kpopupmenu.h>
+#include <kcursor.h>
#include <kfiledialog.h>
-#include <kstandarddirs.h>
-#include <kprogress.h>
-#include <kmessagebox.h>
-#include <knuminput.h>
#include <kglobalsettings.h>
+#include <khelpmenu.h>
+#include <kiconloader.h>
+#include <klocale.h>
+#include <kmessagebox.h>
#include <kpassivepopup.h>
+#include <kpopupmenu.h>
+#include <kprogress.h>
+#include <kstandarddirs.h>
+#include <kurllabel.h>
// Local includes.
--- branches/extragear/kde3/graphics/digikam/libs/greycstoration/greycstorationwidget.cpp \
#851521:851522 @@ -26,10 +26,10 @@
#include <qcombobox.h>
#include <qlabel.h>
#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qtooltip.h>
#include <qtabwidget.h>
#include <qtextstream.h>
+#include <qtooltip.h>
+#include <qwhatsthis.h>
// KDE includes.
@@ -58,48 +58,49 @@
GreycstorationWidgetPriv()
{
+ parent = 0;
+
+ advancedPage = 0;
+ alphaInput = 0;
+ alphaLabel = 0;
+ amplitudeInput = 0;
amplitudeLabel = 0;
- iterationLabel = 0;
- sharpnessLabel = 0;
+ anisotropyInput = 0;
anisotropyLabel = 0;
- alphaLabel = 0;
- sigmaLabel = 0;
- gaussianPrecLabel = 0;
+ btileInput = 0;
+ btileLabel = 0;
+ daInput = 0;
+ daLabel = 0;
+ dlInput = 0;
dlLabel = 0;
- daLabel = 0;
- tileLabel = 0;
- btileLabel = 0;
- interpolationLabel = 0;
fastApproxCBox = 0;
+ gaussianPrecInput = 0;
+ gaussianPrecLabel = 0;
+ generalPage = 0;
interpolationBox = 0;
- amplitudeInput = 0;
+ interpolationLabel = 0;
+ iterationInput = 0;
+ iterationLabel = 0;
sharpnessInput = 0;
- anisotropyInput = 0;
- alphaInput = 0;
+ sharpnessLabel = 0;
sigmaInput = 0;
- gaussianPrecInput = 0;
- dlInput = 0;
- daInput = 0;
- iterationInput = 0;
+ sigmaLabel = 0;
tileInput = 0;
- btileInput = 0;
- advancedPage = 0;
- generalPage = 0;
- parent = 0;
+ tileLabel = 0;
}
+ QLabel *alphaLabel;
QLabel *amplitudeLabel;
+ QLabel *anisotropyLabel;
+ QLabel *btileLabel;
+ QLabel *daLabel;
+ QLabel *dlLabel;
+ QLabel *gaussianPrecLabel;
+ QLabel *interpolationLabel;
QLabel *iterationLabel;
QLabel *sharpnessLabel;
- QLabel *anisotropyLabel;
- QLabel *alphaLabel;
QLabel *sigmaLabel;
- QLabel *gaussianPrecLabel;
- QLabel *dlLabel;
- QLabel *daLabel;
QLabel *tileLabel;
- QLabel *btileLabel;
- QLabel *interpolationLabel;
QWidget *advancedPage;
QWidget *generalPage;
@@ -110,18 +111,18 @@
RComboBox *interpolationBox;
+ RDoubleNumInput *alphaInput;
RDoubleNumInput *amplitudeInput;
+ RDoubleNumInput *anisotropyInput;
+ RDoubleNumInput *daInput;
+ RDoubleNumInput *dlInput;
+ RDoubleNumInput *gaussianPrecInput;
RDoubleNumInput *sharpnessInput;
- RDoubleNumInput *anisotropyInput;
- RDoubleNumInput *alphaInput;
RDoubleNumInput *sigmaInput;
- RDoubleNumInput *gaussianPrecInput;
- RDoubleNumInput *dlInput;
- RDoubleNumInput *daInput;
+ RIntNumInput *btileInput;
RIntNumInput *iterationInput;
RIntNumInput *tileInput;
- RIntNumInput *btileInput;
};
GreycstorationWidget::GreycstorationWidget(QTabWidget *parent)
@@ -268,38 +269,38 @@
void GreycstorationWidget::setSettings(GreycstorationSettings settings)
{
blockSignals(true);
+ d->alphaInput->setValue(settings.alpha);
+ d->amplitudeInput->setValue(settings.amplitude);
+ d->anisotropyInput->setValue(settings.anisotropy);
+ d->btileInput->setValue(settings.btile);
+ d->daInput->setValue(settings.da);
+ d->dlInput->setValue(settings.dl);
d->fastApproxCBox->setChecked(settings.fastApprox);
+ d->gaussianPrecInput->setValue(settings.gaussPrec);
d->interpolationBox->setCurrentItem(settings.interp);
- d->amplitudeInput->setValue(settings.amplitude);
+ d->iterationInput->setValue(settings.nbIter);
d->sharpnessInput->setValue(settings.sharpness);
- d->anisotropyInput->setValue(settings.anisotropy);
- d->alphaInput->setValue(settings.alpha);
d->sigmaInput->setValue(settings.sigma);
- d->gaussianPrecInput->setValue(settings.gaussPrec);
- d->dlInput->setValue(settings.dl);
- d->daInput->setValue(settings.da);
- d->iterationInput->setValue(settings.nbIter);
d->tileInput->setValue(settings.tile);
- d->btileInput->setValue(settings.btile);
blockSignals(false);
}
void GreycstorationWidget::setDefaultSettings(GreycstorationSettings settings)
{
blockSignals(true);
+ d->alphaInput->setDefaultValue(settings.alpha);
+ d->amplitudeInput->setDefaultValue(settings.amplitude);
+ d->anisotropyInput->setDefaultValue(settings.anisotropy);
+ d->btileInput->setDefaultValue(settings.btile);
+ d->daInput->setDefaultValue(settings.da);
+ d->dlInput->setDefaultValue(settings.dl);
d->fastApproxCBox->setChecked(settings.fastApprox);
+ d->gaussianPrecInput->setDefaultValue(settings.gaussPrec);
d->interpolationBox->setDefaultItem(settings.interp);
- d->amplitudeInput->setDefaultValue(settings.amplitude);
+ d->iterationInput->setDefaultValue(settings.nbIter);
d->sharpnessInput->setDefaultValue(settings.sharpness);
- d->anisotropyInput->setDefaultValue(settings.anisotropy);
- d->alphaInput->setDefaultValue(settings.alpha);
d->sigmaInput->setDefaultValue(settings.sigma);
- d->gaussianPrecInput->setDefaultValue(settings.gaussPrec);
- d->dlInput->setDefaultValue(settings.dl);
- d->daInput->setDefaultValue(settings.da);
- d->iterationInput->setDefaultValue(settings.nbIter);
d->tileInput->setDefaultValue(settings.tile);
- d->btileInput->setDefaultValue(settings.btile);
blockSignals(false);
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic