[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/digikam/imageplugins
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2008-04-23 12:29:08
Message-ID: 1208953748.718556.4339.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 800127 by cgilles:

merge in progress


 M  +1 -0      CMakeLists.txt  
 A             lenscorrection/CMakeLists.txt   \
lenscorrection/lensfuniface/CMakeLists.txt#800119  M  +2 -2      \
lenscorrection/digikamimageplugin_lenscorrection.desktop    M  +6 -2      \
lenscorrection/digikamimageplugin_lenscorrection_ui.rc    D             \
lenscorrection/distortion/CMakeLists.txt    D             \
lenscorrection/distortion/digikamimageplugin_lensdistortion.desktop    D             \
lenscorrection/distortion/digikamimageplugin_lensdistortion_ui.rc    D             \
lenscorrection/distortion/imageplugin_lensdistortion.cpp    D             \
lenscorrection/distortion/imageplugin_lensdistortion.h    M  +43 -7     \
lenscorrection/imageplugin_lenscorrection.cpp    M  +6 -2      \
lenscorrection/imageplugin_lenscorrection.h    D             \
lenscorrection/vignetting/CMakeLists.txt    D             \
lenscorrection/vignetting/digikamimageplugin_antivignetting.desktop    D             \
lenscorrection/vignetting/digikamimageplugin_antivignetting_ui.rc    D             \
lenscorrection/vignetting/imageplugin_antivignetting.cpp    D             \
lenscorrection/vignetting/imageplugin_antivignetting.h  


--- trunk/extragear/graphics/digikam/imageplugins/CMakeLists.txt #800126:800127
@@ -16,6 +16,7 @@
                     ../libs/threadimageio
                     ../libs/dmetadata 
                     ../digikam 
+                    ../
                     ${CMAKE_BINARY_DIR}/digikam/digikam
                    )
 
--- trunk/extragear/graphics/digikam/imageplugins/lenscorrection/digikamimageplugin_lenscorrection.desktop \
#800126:800127 @@ -4,7 +4,7 @@
 Type=Service
 ServiceTypes=Digikam/ImagePlugin
 Encoding=UTF-8
-Comment=Automatic correction based on lens database
+Comment=Lens aberrations correction tools
 
 X-KDE-Library=digikamimageplugin_lenscorrection
-author=Adrian Schroeter <adrian@suse.de>
+author=Gilles Caulier, caulier dot gilles at gmail dot com
--- trunk/extragear/graphics/digikam/imageplugins/lenscorrection/digikamimageplugin_lenscorrection_ui.rc \
#800126:800127 @@ -1,10 +1,14 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui version="5" name="digikamimageplugin_lenscorrection" >
+<kpartgui version="6" name="digikamimageplugin_lenscorrection" >
 
  <MenuBar>
 
   <Menu name="Enhance" ><text>Enh&amp;ance</text>
-   <Action name="imageplugin_lenscorrection" /> 
+      <Menu name="Lens" ><text>&amp;Lens</text>
+          <Action name="imageplugin_autocorrection" /> 
+          <Action name="imageplugin_lensdistortion" /> 
+          <Action name="imageplugin_antivignetting" /> 
+      </Menu>
   </Menu>
 
  </MenuBar>
--- trunk/extragear/graphics/digikam/imageplugins/lenscorrection/imageplugin_lenscorrection.cpp \
#800126:800127 @@ -30,8 +30,14 @@
 
 // Local includes.
 
+#include "config-digikam.h"
+#ifdef HAVE_LENSFUN
+#include "imageeffect_lenscorrection.h"
+#endif // HAVE_LENSFUN
+
 #include "ddebug.h"
-#include "imageeffect_lenscorrection.h"
+#include "imageeffect_antivignetting.h"
+#include "imageeffect_lensdistortion.h"
 #include "imageplugin_lenscorrection.h"
 #include "imageplugin_lenscorrection.moc"
 
@@ -41,12 +47,28 @@
 ImagePlugin_LensCorrection::ImagePlugin_LensCorrection(QObject *parent, const \
                QVariantList &)
                           : Digikam::ImagePlugin(parent, \
"ImagePlugin_LensCorrection")  {
-    m_lensCorrectionAction  = new KAction(KIcon("embosstool"), i18n("Lens \
                Correction..."), this);
-    actionCollection()->addAction("imageplugin_lenscorrection", \
m_lensCorrectionAction ); +#ifdef HAVE_LENSFUN
 
-    connect(m_lensCorrectionAction, SIGNAL(triggered(bool)), 
-            this, SLOT(slotLensCorrection()));
+    m_autoCorrectionAction  = new KAction(KIcon("lensdistortion"), \
i18n("Auto-Correction..."), this); +    \
actionCollection()->addAction("imageplugin_autocorrection", m_lensCorrectionAction ); \
 +    connect(m_autoCorrectionAction, SIGNAL(triggered(bool)), 
+            this, SLOT(slotAutoCorrection()));
+
+#endif // HAVE_LENSFUN
+
+    m_lensdistortionAction  = new KAction(KIcon("lensdistortion"), \
i18n("Distortion..."), this); +    \
actionCollection()->addAction("imageplugin_lensdistortion", m_lensdistortionAction ); \
+ +    connect(m_lensdistortionAction, SIGNAL(triggered(bool)), 
+            this, SLOT(slotLensDistortion()));
+
+    m_antivignettingAction  = new KAction(KIcon("antivignetting"), \
i18n("Vignetting..."), this); +    \
actionCollection()->addAction("imageplugin_antivignetting", m_antivignettingAction ); \
+ +    connect(m_antivignettingAction, SIGNAL(triggered(bool)), 
+            this, SLOT(slotAntiVignetting()));
+
     setXMLFile("digikamimageplugin_lenscorrection_ui.rc");
 
     DDebug() << "ImagePlugin_LensCorrection plugin loaded" << endl;
@@ -58,11 +80,25 @@
 
 void ImagePlugin_LensCorrection::setEnabledActions(bool enable)
 {
-    m_lensCorrectionAction->setEnabled(enable);
+    m_autoCorrectionAction->setEnabled(enable);
 }
 
-void ImagePlugin_LensCorrection::slotLensCorrection()
+void ImagePlugin_LensCorrection::slotAutoCorrection()
 {
+#ifdef HAVE_LENSFUN
     DigikamLensCorrectionImagesPlugin::ImageEffect_LensCorrection \
dlg(parentWidget());  dlg.exec();
+#endif // HAVE_LENSFUN
 }
+
+void ImagePlugin_LensCorrection::slotLensDistortion()
+{
+    DigikamLensDistortionImagesPlugin::ImageEffect_LensDistortion \
dlg(parentWidget()); +    dlg.exec();
+}
+
+void ImagePlugin_LensCorrection::slotAntiVignetting()
+{
+    DigikamAntiVignettingImagesPlugin::ImageEffect_AntiVignetting \
dlg(parentWidget()); +    dlg.exec();
+}
--- trunk/extragear/graphics/digikam/imageplugins/lenscorrection/imageplugin_lenscorrection.h \
#800126:800127 @@ -42,11 +42,15 @@
 
 private slots:
 
-    void slotLensCorrection();
+    void slotAutoCorrection();
+    void slotLensDistortion();
+    void slotAntiVignetting();
 
 private:
 
-    KAction *m_lensCorrectionAction;
+    KAction *m_autoCorrectionAction;
+    KAction *m_lensdistortionAction;
+    KAction *m_antivignettingAction;
 };
 
 #endif /* IMAGEPLUGIN_LENSCORRECTION_H */


[prev in list] [next in list] [prev in thread] [next in thread]