Done ! Testing and not working :)

diff --git a/src/app/x11/appwindow.cpp b/src/app/x11/appwindow.cpp
index 2d48258..dddde4f 100644 (file)
--- a/src/app/x11/appwindow.cpp
+++ b/src/app/x11/appwindow.cpp
@@ -13,12 +13,12 @@
 AppWindow::AppWindow(QWidget *parent):QMainWindow(parent)
 {
     //Creates the workspace objec
 AppWindow::AppWindow(QWidget *parent):QMainWindow(parent)
 {
     //Creates the workspace objec

-    mWorkspace=new Workspace(this);
+    mWorkspace=new Workspace();

 
     //Creates the Filter Handler Object and Connect the Signals
 
     //Creates the Filter Handler Object and Connect the Signals

-    mFilterHandle=new FilterLoader(this);
-    connect(mFilterHandle,SIGNAL(filterReady(QString,QString)),this,SLOT(onFilterReady(QString,QString)));
-    mFilterHandle->loadFilters();
+ //   mFilterHandle=new FilterLoader(this);
+ //   connect(mFilterHandle,SIGNAL(filterReady(QString,QString)),this,SLOT(onFilterReady(QString,QString)));
+  //  mFilterHandle->loadFilters();

 
     //Temporary
     QDockWidget *dockWidget = new QDockWidget(tr("Dock Widget"), this);
 
     //Temporary
     QDockWidget *dockWidget = new QDockWidget(tr("Dock Widget"), this);

diff --git a/src/core/baseui/workspace.cpp b/src/core/baseui/workspace.cpp
index 38b18f9..58e527c 100644 (file)
--- a/src/core/baseui/workspace.cpp
+++ b/src/core/baseui/workspace.cpp
@@ -20,8 +20,8 @@ void ImageLoader::run()
 }
 void Workspace::testEffect()
 {
 }
 void Workspace::testEffect()
 {

-    QTransform sharpness(0,-1,0,-1,5,-1,0,-1,0);
-    mImage=mImage.transformed(sharpness);
+
+

 }
 
 Workspace::Workspace(QWidget *parent) :
 }
 
 Workspace::Workspace(QWidget *parent) :

diff --git a/src/filters/Makefile b/src/filters/Makefile
index afba3bc..661da2f 100644 (file)
--- a/src/filters/Makefile
+++ b/src/filters/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: filters
 #############################################################################
 # Makefile for building: filters

-# Generated by qmake (2.01a) (Qt 4.7.0) on: Wed Nov 17 19:59:07 2010
+# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Nov 30 00:42:31 2010

 # Project:  filters.pro
 # Template: subdirs
 # Command: /usr/bin/qmake -o Makefile filters.pro
 # Project:  filters.pro
 # Template: subdirs
 # Command: /usr/bin/qmake -o Makefile filters.pro

@@ -26,7 +26,8 @@ CHK_DIR_EXISTS= test -d
 MKDIR         = mkdir -p
 SUBTARGETS    =  \
                sub-sepia \
 MKDIR         = mkdir -p
 SUBTARGETS    =  \
                sub-sepia \

-               sub-grey
+               sub-grey \
+               sub-autocolor

 
 sepia//$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) sepia/ || $(MKDIR) sepia/ 
 
 sepia//$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) sepia/ || $(MKDIR) sepia/ 

@@ -72,6 +73,28 @@ sub-grey-install_subtargets: grey//$(MAKEFILE) FORCE
        cd grey/ && $(MAKE) -f $(MAKEFILE) install
 sub-grey-uninstall_subtargets: grey//$(MAKEFILE) FORCE
        cd grey/ && $(MAKE) -f $(MAKEFILE) uninstall
        cd grey/ && $(MAKE) -f $(MAKEFILE) install
 sub-grey-uninstall_subtargets: grey//$(MAKEFILE) FORCE
        cd grey/ && $(MAKE) -f $(MAKEFILE) uninstall

+autocolor//$(MAKEFILE): 
+       @$(CHK_DIR_EXISTS) autocolor/ || $(MKDIR) autocolor/ 
+       cd autocolor/ && $(QMAKE) /home/everyourgokul/workspace/photoenhancer/src/filters/autocolor/autocolor.pro -o $(MAKEFILE)
+sub-autocolor-qmake_all:  FORCE
+       @$(CHK_DIR_EXISTS) autocolor/ || $(MKDIR) autocolor/ 
+       cd autocolor/ && $(QMAKE) /home/everyourgokul/workspace/photoenhancer/src/filters/autocolor/autocolor.pro -o $(MAKEFILE)
+sub-autocolor: autocolor//$(MAKEFILE) FORCE
+       cd autocolor/ && $(MAKE) -f $(MAKEFILE)
+sub-autocolor-make_default: autocolor//$(MAKEFILE) FORCE
+       cd autocolor/ && $(MAKE) -f $(MAKEFILE) 
+sub-autocolor-make_first: autocolor//$(MAKEFILE) FORCE
+       cd autocolor/ && $(MAKE) -f $(MAKEFILE) first
+sub-autocolor-all: autocolor//$(MAKEFILE) FORCE
+       cd autocolor/ && $(MAKE) -f $(MAKEFILE) all
+sub-autocolor-clean: autocolor//$(MAKEFILE) FORCE
+       cd autocolor/ && $(MAKE) -f $(MAKEFILE) clean
+sub-autocolor-distclean: autocolor//$(MAKEFILE) FORCE
+       cd autocolor/ && $(MAKE) -f $(MAKEFILE) distclean
+sub-autocolor-install_subtargets: autocolor//$(MAKEFILE) FORCE
+       cd autocolor/ && $(MAKE) -f $(MAKEFILE) install
+sub-autocolor-uninstall_subtargets: autocolor//$(MAKEFILE) FORCE
+       cd autocolor/ && $(MAKE) -f $(MAKEFILE) uninstall

 
 Makefile: filters.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
                /usr/share/qt4/mkspecs/common/unix.conf \
 
 Makefile: filters.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
                /usr/share/qt4/mkspecs/common/unix.conf \

@@ -117,22 +140,24 @@ Makefile: filters.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt
 qmake: qmake_all FORCE
        @$(QMAKE) -o Makefile filters.pro
 
 qmake: qmake_all FORCE
        @$(QMAKE) -o Makefile filters.pro
 

-qmake_all: sub-sepia-qmake_all sub-grey-qmake_all FORCE
+qmake_all: sub-sepia-qmake_all sub-grey-qmake_all sub-autocolor-qmake_all FORCE

 
 

-make_default: sub-sepia-make_default sub-grey-make_default FORCE
-make_first: sub-sepia-make_first sub-grey-make_first FORCE
-all: sub-sepia-all sub-grey-all FORCE
-clean: sub-sepia-clean sub-grey-clean FORCE
-distclean: sub-sepia-distclean sub-grey-distclean FORCE
+make_default: sub-sepia-make_default sub-grey-make_default sub-autocolor-make_default FORCE
+make_first: sub-sepia-make_first sub-grey-make_first sub-autocolor-make_first FORCE
+all: sub-sepia-all sub-grey-all sub-autocolor-all FORCE
+clean: sub-sepia-clean sub-grey-clean sub-autocolor-clean FORCE
+distclean: sub-sepia-distclean sub-grey-distclean sub-autocolor-distclean FORCE

        -$(DEL_FILE) Makefile
        -$(DEL_FILE) Makefile

-install_subtargets: sub-sepia-install_subtargets sub-grey-install_subtargets FORCE
-uninstall_subtargets: sub-sepia-uninstall_subtargets sub-grey-uninstall_subtargets FORCE
+install_subtargets: sub-sepia-install_subtargets sub-grey-install_subtargets sub-autocolor-install_subtargets FORCE
+uninstall_subtargets: sub-sepia-uninstall_subtargets sub-grey-uninstall_subtargets sub-autocolor-uninstall_subtargets FORCE

 
 sub-sepia-check: sepia/$(MAKEFILE)
        cd sepia/ && $(MAKE) check
 sub-grey-check: grey/$(MAKEFILE)
        cd grey/ && $(MAKE) check
 
 sub-sepia-check: sepia/$(MAKEFILE)
        cd sepia/ && $(MAKE) check
 sub-grey-check: grey/$(MAKEFILE)
        cd grey/ && $(MAKE) check

-check: sub-sepia-check sub-grey-check
+sub-autocolor-check: autocolor/$(MAKEFILE)
+       cd autocolor/ && $(MAKE) check
+check: sub-sepia-check sub-grey-check sub-autocolor-check

 
 mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 
 mocclean: compiler_moc_header_clean compiler_moc_source_clean
 

diff --git a/src/filters/grey/Makefile b/src/filters/grey/Makefile
new file mode 100644 (file)
index 0000000..3ecf81d
--- /dev/null
+++ b/src/filters/grey/Makefile
@@ -0,0 +1,226 @@
+#############################################################################
+# Makefile for building: libfilter_sepia.so.1.0.0
+# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Nov 30 00:42:32 2010
+# Project:  grey.pro
+# Template: lib
+# Command: /usr/bin/qmake -o Makefile grey.pro
+#############################################################################
+
+####### Compiler, tools and options
+
+CC            = gcc
+CXX           = g++
+DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
+CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
+INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. -I../../core/interfaces -I.
+LINK          = g++
+LFLAGS        = -Wl,-O1 -shared -Wl,-soname,libfilter_sepia.so.1
+LIBS          = $(SUBLIBS)  -L/usr/lib -lQtGui -lQtCore -lpthread 
+AR            = ar cqs
+RANLIB        = 
+QMAKE         = /usr/bin/qmake
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = $(COPY)
+COPY_DIR      = $(COPY) -r
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR   = ./
+
+####### Files
+
+SOURCES       = greyfilter.cpp 
+OBJECTS       = greyfilter.o
+DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
+               /usr/share/qt4/mkspecs/common/unix.conf \
+               /usr/share/qt4/mkspecs/common/linux.conf \
+               /usr/share/qt4/mkspecs/qconfig.pri \
+               /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
+               /usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /usr/share/qt4/mkspecs/features/qt_config.prf \
+               /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /usr/share/qt4/mkspecs/features/default_pre.prf \
+               /usr/share/qt4/mkspecs/features/release.prf \
+               /usr/share/qt4/mkspecs/features/default_post.prf \
+               /usr/share/qt4/mkspecs/features/warn_on.prf \
+               /usr/share/qt4/mkspecs/features/qt.prf \
+               /usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /usr/share/qt4/mkspecs/features/moc.prf \
+               /usr/share/qt4/mkspecs/features/resources.prf \
+               /usr/share/qt4/mkspecs/features/uic.prf \
+               /usr/share/qt4/mkspecs/features/yacc.prf \
+               /usr/share/qt4/mkspecs/features/lex.prf \
+               /usr/share/qt4/mkspecs/features/include_source_dir.prf \
+               grey.pro
+QMAKE_TARGET  = filter_sepia
+DESTDIR       = ../../../filters/
+TARGET        = libfilter_sepia.so.1.0.0
+TARGETA       = ../../../filters/libfilter_sepia.a
+TARGETD       = libfilter_sepia.so.1.0.0
+TARGET0       = libfilter_sepia.so
+TARGET1       = libfilter_sepia.so.1
+TARGET2       = libfilter_sepia.so.1.0
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+       $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile  ../../../filters/$(TARGET)
+
+../../../filters/$(TARGET):  $(OBJECTS) $(SUBLIBS) $(OBJCOMP)  
+       @$(CHK_DIR_EXISTS) ../../../filters/ || $(MKDIR) ../../../filters/ 
+       -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
+       $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP)
+       -ln -s $(TARGET) $(TARGET0)
+       -ln -s $(TARGET) $(TARGET1)
+       -ln -s $(TARGET) $(TARGET2)
+       -$(DEL_FILE) ../../../filters/$(TARGET)
+       -$(DEL_FILE) ../../../filters/$(TARGET0)
+       -$(DEL_FILE) ../../../filters/$(TARGET1)
+       -$(DEL_FILE) ../../../filters/$(TARGET2)
+       -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) ../../../filters/
+
+
+
+staticlib: $(TARGETA)
+
+$(TARGETA):  $(OBJECTS) $(OBJCOMP) 
+       -$(DEL_FILE) $(TARGETA) 
+       $(AR) $(TARGETA) $(OBJECTS)
+
+Makefile: grey.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
+               /usr/share/qt4/mkspecs/common/unix.conf \
+               /usr/share/qt4/mkspecs/common/linux.conf \
+               /usr/share/qt4/mkspecs/qconfig.pri \
+               /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
+               /usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /usr/share/qt4/mkspecs/features/qt_config.prf \
+               /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /usr/share/qt4/mkspecs/features/default_pre.prf \
+               /usr/share/qt4/mkspecs/features/release.prf \
+               /usr/share/qt4/mkspecs/features/default_post.prf \
+               /usr/share/qt4/mkspecs/features/warn_on.prf \
+               /usr/share/qt4/mkspecs/features/qt.prf \
+               /usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /usr/share/qt4/mkspecs/features/moc.prf \
+               /usr/share/qt4/mkspecs/features/resources.prf \
+               /usr/share/qt4/mkspecs/features/uic.prf \
+               /usr/share/qt4/mkspecs/features/yacc.prf \
+               /usr/share/qt4/mkspecs/features/lex.prf \
+               /usr/share/qt4/mkspecs/features/include_source_dir.prf \
+               /usr/lib/libQtGui.prl \
+               /usr/lib/libQtCore.prl
+       $(QMAKE) -o Makefile grey.pro
+/usr/share/qt4/mkspecs/common/g++.conf:
+/usr/share/qt4/mkspecs/common/unix.conf:
+/usr/share/qt4/mkspecs/common/linux.conf:
+/usr/share/qt4/mkspecs/qconfig.pri:
+/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri:
+/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/usr/share/qt4/mkspecs/features/qt_config.prf:
+/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/usr/share/qt4/mkspecs/features/default_pre.prf:
+/usr/share/qt4/mkspecs/features/release.prf:
+/usr/share/qt4/mkspecs/features/default_post.prf:
+/usr/share/qt4/mkspecs/features/warn_on.prf:
+/usr/share/qt4/mkspecs/features/qt.prf:
+/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/usr/share/qt4/mkspecs/features/moc.prf:
+/usr/share/qt4/mkspecs/features/resources.prf:
+/usr/share/qt4/mkspecs/features/uic.prf:
+/usr/share/qt4/mkspecs/features/yacc.prf:
+/usr/share/qt4/mkspecs/features/lex.prf:
+/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/usr/lib/libQtGui.prl:
+/usr/lib/libQtCore.prl:
+qmake:  FORCE
+       @$(QMAKE) -o Makefile grey.pro
+
+dist: 
+       @$(CHK_DIR_EXISTS) .tmp/filter_sepia1.0.0 || $(MKDIR) .tmp/filter_sepia1.0.0 
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/filter_sepia1.0.0/ && $(COPY_FILE) --parents greyfilter.h .tmp/filter_sepia1.0.0/ && $(COPY_FILE) --parents greyfilter.cpp .tmp/filter_sepia1.0.0/ && (cd `dirname .tmp/filter_sepia1.0.0` && $(TAR) filter_sepia1.0.0.tar filter_sepia1.0.0 && $(COMPRESS) filter_sepia1.0.0.tar) && $(MOVE) `dirname .tmp/filter_sepia1.0.0`/filter_sepia1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/filter_sepia1.0.0
+
+
+clean:compiler_clean 
+       -$(DEL_FILE) $(OBJECTS)
+       -$(DEL_FILE) *~ core *.core
+
+
+####### Sub-libraries
+
+distclean: clean
+       -$(DEL_FILE) ../../../filters/$(TARGET) 
+       -$(DEL_FILE) ../../../filters/$(TARGET0) ../../../filters/$(TARGET1) ../../../filters/$(TARGET2) $(TARGETA)
+       -$(DEL_FILE) Makefile
+
+
+check: first
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_image_collection_make_all: qmake_image_collection.cpp
+compiler_image_collection_clean:
+       -$(DEL_FILE) qmake_image_collection.cpp
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_uic_make_all:
+compiler_uic_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean: 
+
+####### Compile
+
+greyfilter.o: greyfilter.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o greyfilter.o greyfilter.cpp
+
+####### Install
+
+install:   FORCE
+
+uninstall:   FORCE
+
+FORCE:
+

diff --git a/src/filters/sepia/Makefile b/src/filters/sepia/Makefile
index c8f8b5f..fba74b1 100644 (file)
--- a/src/filters/sepia/Makefile
+++ b/src/filters/sepia/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: libfilter_sepia.so.1.0.0
 #############################################################################
 # Makefile for building: libfilter_sepia.so.1.0.0

-# Generated by qmake (2.01a) (Qt 4.7.0) on: Wed Nov 17 20:04:19 2010
+# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Nov 30 00:42:31 2010

 # Project:  sepia.pro
 # Template: lib
 # Command: /usr/bin/qmake -o Makefile sepia.pro
 # Project:  sepia.pro
 # Template: lib
 # Command: /usr/bin/qmake -o Makefile sepia.pro

diff --git a/src/src.pro b/src/src.pro
index 849a10b..d6a51be 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
 TEMPLATE = subdirs

-SUBDIRS =  core app
+SUBDIRS =  core app