[Digikam-devel] branches/extragear/kde3/graphics/digikam/imageplugins/lensdistortion

[Gilles Caulier]

SVN commit 853520 by cgilles:

digiKam from KDE3 branch: LensDistortion image plugin is now ported to Editor Tool API
CCMAIL: digikam-devel at kde.org


 M  +1 -2      Makefile.am  
 D             imageeffect_lensdistortion.cpp  
 D             imageeffect_lensdistortion.h  
 M  +13 -11    imageplugin_lensdistortion.cpp  
 M  +8 -8      imageplugin_lensdistortion.h  
 A             lensdistortiontool.cpp   imageeffect_lensdistortion.cpp#853347 [License: GPL (v2+)]
 A             lensdistortiontool.h   imageeffect_lensdistortion.h#853347 [License: GPL (v2+)]


--- branches/extragear/kde3/graphics/digikam/imageplugins/lensdistortion/Makefile.am #853519:853520
@@ -18,7 +18,7 @@
 	       $(all_includes) 
 
 digikamimageplugin_lensdistortion_la_SOURCES = imageplugin_lensdistortion.cpp \
-	                                           imageeffect_lensdistortion.cpp \
+	                                           lensdistortiontool.cpp \
 	                                           lensdistortion.cpp pixelaccess.cpp 
 
 digikamimageplugin_lensdistortion_la_LIBADD = $(LIB_KPARTS) \
@@ -32,4 +32,3 @@
 
 rcdir = $(kde_datadir)/digikam
 rc_DATA = digikamimageplugin_lensdistortion_ui.rc
-       
--- branches/extragear/kde3/graphics/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp #853519:853520
@@ -5,20 +5,20 @@
  *
  * Date        : 2004-12-27
  * Description : a plugin to reduce lens distorsions to an image.
- * 
- * Copyright (C) 2004-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * 
+ *
+ * Copyright (C) 2004-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * ============================================================ */
 
 // KDE includes.
@@ -32,10 +32,12 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_lensdistortion.h"
+#include "lensdistortiontool.h"
 #include "imageplugin_lensdistortion.h"
 #include "imageplugin_lensdistortion.moc"
 
+using namespace DigikamLensDistortionImagesPlugin;
+
 K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_lensdistortion,
                            KGenericFactory<ImagePlugin_LensDistortion>("digikamimageplugin_lensdistortion"));
 
@@ -45,9 +47,9 @@
     m_lensdistortionAction = new KAction(i18n("Lens Distortion..."), "lensdistortion", 0, 
                                  this, SLOT(slotLensDistortion()),
                                  actionCollection(), "imageplugin_lensdistortion");
-    
-    setXMLFile("digikamimageplugin_lensdistortion_ui.rc");            
-        
+
+    setXMLFile("digikamimageplugin_lensdistortion_ui.rc");
+
     DDebug() << "ImagePlugin_LensDistortion plugin loaded" << endl;
 }
 
@@ -62,6 +64,6 @@
 
 void ImagePlugin_LensDistortion::slotLensDistortion()
 {
-    DigikamLensDistortionImagesPlugin::ImageEffect_LensDistortion dlg(parentWidget());
-    dlg.exec();
+    LensDistortionTool *tool = new LensDistortionTool(this);
+    loadTool(tool);
 }
--- branches/extragear/kde3/graphics/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h #853519:853520
@@ -5,20 +5,20 @@
  *
  * Date        : 2004-12-27
  * Description : a plugin to reduce lens distorsions to an image.
- * 
- * Copyright (C) 2004-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * 
+ *
+ * Copyright (C) 2004-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * ============================================================ */
 
 #ifndef IMAGEPLUGIN_LENSDISTORTION_H
@@ -34,11 +34,11 @@
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_LensDistortion : public Digikam::ImagePlugin
 {
     Q_OBJECT
-    
+
 public:
 
     ImagePlugin_LensDistortion(QObject *parent, const char* name,
-                                 const QStringList &args);
+                               const QStringList &args);
     ~ImagePlugin_LensDistortion();
 
     void setEnabledActions(bool enable);
@@ -51,5 +51,5 @@
 
     KAction *m_lensdistortionAction;
 };
-    
+
 #endif /* IMAGEPLUGIN_LENSDISTORTION_H */