[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/digikam
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2010-02-20 17:54:32
Message-ID: 1266688472.780291.12728.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1093364 by cgilles:
merge Infrared Image Editor tool to core image plugin.
Next stage :
- merge it directly in Black and White converter.
- Port B&W tool to support multithreading and zoomable preview.
- Create a new Batch Queue Manager tool to convert images to B&W
M +0 -1 imageplugins/CMakeLists.txt
M +1 -0 imageplugins/coreplugin/CMakeLists.txt
M +2 -1 imageplugins/coreplugin/digikamimageplugin_core_ui.rc
M +15 -14 imageplugins/coreplugin/imageplugin_core.cpp
M +1 -0 imageplugins/coreplugin/imageplugin_core.h
A imageplugins/coreplugin/infraredtool.cpp \
imageplugins/infrared/infraredtool.cpp#1093234 [License: GPL (v2+)] A \
imageplugins/coreplugin/infraredtool.h imageplugins/infrared/infraredtool.h#1093095 \
[License: GPL (v2+)] D imageplugins/infrared/infraredtool.cpp
D imageplugins/infrared/infraredtool.h
M +7 -6 utilities/imageeditor/canvas/imagepluginloader.cpp
M +4 -4 utilities/imageeditor/canvas/imagepluginloader.h
--- trunk/extragear/graphics/digikam/imageplugins/CMakeLists.txt #1093363:1093364
@@ -46,7 +46,6 @@
ADD_SUBDIRECTORY( filmgrain )
ADD_SUBDIRECTORY( freerotation )
ADD_SUBDIRECTORY( hotpixels )
-ADD_SUBDIRECTORY( infrared )
ADD_SUBDIRECTORY( inpainting )
ADD_SUBDIRECTORY( inserttext )
ADD_SUBDIRECTORY( lenscorrection )
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/CMakeLists.txt \
#1093363:1093364 @@ -14,6 +14,7 @@
../../imageplugins/coreplugin/sharpentool.cpp
../../imageplugins/coreplugin/noisereductiontool.cpp
../../imageplugins/coreplugin/hsltool.cpp
+ ../../imageplugins/coreplugin/infraredtool.cpp
../../imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
../../imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
)
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/digikamimageplugin_core_ui.rc \
#1093363:1093364 @@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui version="14" name="digikamimageplugin_core" >
+<gui version="15" name="digikamimageplugin_core" >
<MenuBar>
@@ -11,6 +11,7 @@
<Separator />
<Action name="implugcore_invert" />
<Action name="implugcore_blackwhite" />
+ <Action name="implugcore_infrared" />
<Menu name="Depth"><text>&Depth</text>
<Action name="implugcore_convertto8bits" />
<Action name="implugcore_convertto16bits" />
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/imageplugin_core.cpp \
#1093363:1093364 @@ -48,6 +48,7 @@
#include "bcgtool.h"
#include "bwsepiatool.h"
#include "hsltool.h"
+#include "infraredtool.h"
#include "profileconversiontool.h"
#include "resizetool.h"
#include "blurtool.h"
@@ -83,6 +84,7 @@
convertTo8Bits(0),
convertTo16Bits(0),
noiseReductionAction(0),
+ infraredAction(0),
profileMenuAction(0)
{}
@@ -100,6 +102,7 @@
KAction* convertTo8Bits;
KAction* convertTo16Bits;
KAction* noiseReductionAction;
+ KAction* infraredAction;
IccProfilesMenuAction* profileMenuAction;
};
@@ -153,12 +156,6 @@
connect(d->convertTo16Bits, SIGNAL(triggered(bool) ),
this, SLOT(slotConvertTo16Bits()));
- /*
- d->colorManagementAction = new KAction(KIcon("colormanagement"), i18n("Color \
Management..."), this);
- actionCollection()->addAction("implugcore_colormanagement", \
d->colorManagementAction );
- connect(d->colorManagementAction, SIGNAL(triggered(bool) ),
- this, SLOT(slotColorManagement()));
- */
d->profileMenuAction = new IccProfilesMenuAction(KIcon("colormanagement"), \
i18n("Color Space Conversion"), this);
actionCollection()->addAction("implugcore_colormanagement", d->profileMenuAction \
); connect(d->profileMenuAction, SIGNAL(triggered(const IccProfile &)),
@@ -202,6 +199,11 @@
connect(d->BWAction, SIGNAL(triggered(bool) ),
this, SLOT(slotBW()));
+ d->infraredAction = new KAction(KIcon("infrared"), i18n("Infrared Film..."), \
this); + actionCollection()->addAction("implugcore_infrared", d->infraredAction );
+ connect(d->infraredAction, SIGNAL(triggered(bool)),
+ this, SLOT(slotInfrared()));
+
//-------------------------------
// Transform menu actions.
@@ -244,6 +246,7 @@
d->redeyeAction->setEnabled(b);
d->autoCorrectionAction->setEnabled(b);
d->BWAction->setEnabled(b);
+ d->infraredAction->setEnabled(b);
d->HSLAction->setEnabled(b);
d->sharpenAction->setEnabled(b);
d->aspectRatioCropAction->setEnabled(b);
@@ -355,14 +358,6 @@
loadTool(tool);
}
-/*
-void ImagePlugin_Core::slotColorManagement()
-{
- ICCProofTool *tool = new ICCProofTool(this);
- loadTool(tool);
-}
-*/
-
void ImagePlugin_Core::slotConvertToColorSpace(const IccProfile& profile)
{
ImageIface iface(0, 0);
@@ -470,3 +465,9 @@
NoiseReductionTool *tool = new NoiseReductionTool(this);
loadTool(tool);
}
+
+void ImagePlugin_Core::slotInfrared()
+{
+ InfraredTool* tool = new InfraredTool(this);
+ loadTool(tool);
+}
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/imageplugin_core.h \
#1093363:1093364 @@ -68,6 +68,7 @@
void slotAutoCorrection();
void slotInvert();
void slotBW();
+ void slotInfrared();
void slotConvertTo8Bits();
void slotConvertTo16Bits();
void slotConvertToColorSpace(const IccProfile&);
--- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp \
#1093363:1093364 @@ -7,7 +7,7 @@
* Description : image plugins loader for image editor.
*
* Copyright (C) 2004-2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu>
- * Copyright (C) 2004-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2004-2010 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
@@ -58,6 +58,7 @@
"digikamimageplugin_antivignetting", // Merged with "Lens Correction" since \
0.10.0.
"digikamimageplugin_lensdistortion", // Merged with "Lens Correction" since \
0.10.0.
"digikamimageplugin_noisereduction", // Merged to core plugin since 1.0.0-rc.
+ "digikamimageplugin_infrared", // Merged to core plugin since 1.2.0.
"-1"
};
@@ -90,11 +91,11 @@
return m_instance;
}
-ImagePluginLoader::ImagePluginLoader(QObject *parent, SplashScreen *splash)
+ImagePluginLoader::ImagePluginLoader(QObject* parent, SplashScreen* splash)
: QObject(parent), d(new ImagePluginLoaderPrivate)
{
m_instance = this;
- d->splash = splash;
+ d->splash = splash;
QStringList imagePluginsList2Load;
@@ -146,7 +147,7 @@
{
QString error;
- ImagePlugin *plugin = corePlugin->createInstance<ImagePlugin>(this, \
QVariantList(), &error); + ImagePlugin* plugin = \
corePlugin->createInstance<ImagePlugin>(this, QVariantList(), &error);
if (plugin && (dynamic_cast<KXMLGUIClient*>(plugin) != 0))
{
@@ -181,7 +182,7 @@
foreach (const QString& name, pluginsToLoad)
{
KService::Ptr service = d->pluginServiceMap.value(name);
- ImagePlugin *plugin;
+ ImagePlugin* plugin;
if ( pluginIsLoaded(name) )
continue;
@@ -262,7 +263,7 @@
return false;
}
-QList<ImagePlugin *> ImagePluginLoader::pluginList()
+QList<ImagePlugin*> ImagePluginLoader::pluginList()
{
return d->pluginMap.values();
}
--- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/imagepluginloader.h \
#1093363:1093364 @@ -7,7 +7,7 @@
* Description : image plugins loader for image editor.
*
* Copyright (C) 2004-2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu>
- * Copyright (C) 2004-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2004-2010 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
@@ -47,12 +47,12 @@
public:
- explicit ImagePluginLoader(QObject *parent, SplashScreen *splash=0);
+ explicit ImagePluginLoader(QObject* parent, SplashScreen* splash=0);
~ImagePluginLoader();
static ImagePluginLoader* instance();
- QList<ImagePlugin *> pluginList();
+ QList<ImagePlugin*> pluginList();
void loadPluginsFromList(const QStringList& list);
// Return true if plugin library is loaded in memory.
@@ -68,7 +68,7 @@
private:
- static ImagePluginLoader *m_instance;
+ static ImagePluginLoader* m_instance;
ImagePluginLoaderPrivate* const d;
};
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic