Re Modicaition : Folder Structure

diff --git a/src/app/app.pro b/src/app/app.pro
index 5caf1dc..5321cec 100644 (file)
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -1,14 +1,2 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Tue Nov 16 21:47:22 2010
-######################################################################
-
-TEMPLATE = app
-TARGET = ../../bin/photoenhancer 
-DEPENDPATH += .
-INCLUDEPATH +=. ../core
-LIBS+=-L../../libs/ -lphotoenhancercore
-# Input
-HEADERS += appwindow.h
-SOURCES += appwindow.cpp main.cpp
-
-FORMS +=
+TEMPLATE = subdirs
+SUBDIRS =  x11

diff --git a/src/app/appwindow.cpp b/src/app/appwindow.cpp
deleted file mode 100644 (file)
index b89219e..0000000
--- a/src/app/appwindow.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "appwindow.h"
-#include "workspace.h"
-#include <QDockWidget>
-#include <QToolBar>
-#include <QMenuBar>
-
-
-AppWindow::AppWindow(QWidget *parent):QMainWindow(parent)
-{
-    mWorkspace=new Workspace();
-    setCentralWidget(mWorkspace);
-    createActions();
-    createMenus();
-    createToolBars();
-    createStatusBar();
-    readSettings();
-}
-
- void AppWindow::newFile()
- {
-
- }
-
- void AppWindow::open()
- {
-
- }
-
- bool AppWindow::save()
- {
-
- }
-
- bool AppWindow::saveAs()
- {
-
- }
-
- void AppWindow::createActions()
- {
-     newAct = new QAction(QIcon(":/images/new.png"), tr("&New"), this);
-     newAct->setShortcuts(QKeySequence::New);
-     newAct->setStatusTip(tr("Create a new file"));
-     connect(newAct, SIGNAL(triggered()), this, SLOT(newFile()));
-
-     openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this);
-     openAct->setShortcuts(QKeySequence::Open);
-     openAct->setStatusTip(tr("Open an existing file"));
-     connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
-
-     saveAct = new QAction(QIcon(":/images/save.png"), tr("&Save"), this);
-     saveAct->setShortcuts(QKeySequence::Save);
-     saveAct->setStatusTip(tr("Save the document to disk"));
-     connect(saveAct, SIGNAL(triggered()), this, SLOT(save()));
-
-     saveAsAct = new QAction(tr("Save &As..."), this);
-     saveAsAct->setShortcuts(QKeySequence::SaveAs);
-     saveAsAct->setStatusTip(tr("Save the document under a new name"));
-     connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs()));
-
-     exitAct = new QAction(tr("E&xit"), this);
-     exitAct->setShortcuts(QKeySequence::Quit);
-     exitAct->setStatusTip(tr("Exit the application"));
-     connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
-
-
-     menuBar()->addSeparator();
-
- }
-
- void AppWindow::createToolBars()
- {
-     fileToolBar = addToolBar(tr("File"));
-     fileToolBar->addAction(newAct);
-     fileToolBar->addAction(openAct);
-     fileToolBar->addAction(saveAct);
-
-
- }
-
- void AppWindow::createStatusBar()
- {
-     statusBar()->showMessage(tr("Ready"));
- }
-
- void AppWindow::readSettings()
- {
-
- }
-
- void AppWindow::writeSettings()
- {
-
- }
-
- bool AppWindow::maybeSave()
- {
-
-     return true;
- }
-
-
- void AppWindow::createMenus()
- {
-    fileMenu = menuBar()->addMenu(tr("&File"));
-    fileMenu->addAction(newAct);
-    fileMenu->addAction(openAct);
-    fileMenu->addAction(saveAct);
-    fileMenu->addAction(saveAsAct);
-    fileMenu->addSeparator();
-    fileMenu->addAction(exitAct);
- }

diff --git a/src/app/appwindow.h b/src/app/appwindow.h
deleted file mode 100644 (file)
index 42b4b47..0000000
--- a/src/app/appwindow.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef APPWINDOW_H
-#define APPWINDOW_H
-#include <QtGui/QMainWindow>
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QHeaderView>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMenu>
-#include <QtGui/QMenuBar>
-#include <QtGui/QStatusBar>
-#include <QtGui/QWidget>
-
-class Workspace;
-
-
-
-class AppWindow:public QMainWindow
-{
-    Q_OBJECT
-
-public:
-    AppWindow(QWidget *parent=0);
-
-private:
-    QMenu *fileMenu;
-    QMenu *editMenu;
-    QToolBar *fileToolBar;
-    QToolBar *editToolBar;
-    QAction *newAct;
-    QAction *openAct;
-    QAction *saveAct;
-    QAction *saveAsAct;
-    QAction *exitAct;
-
-
-    Workspace *mWorkspace;
-
-private slots:
-    void newFile();
-    void open();
-    bool save();
-    bool saveAs();
-
-private:
-
-
-private:
-    void createActions();
-    void createMenus();
-    void createToolBars();
-    void createStatusBar();
-    void readSettings();
-    void writeSettings();
-    bool maybeSave();
-
-
-};
-
-#endif // APPWINDOW_H

diff --git a/src/app/main.cpp b/src/app/main.cpp
deleted file mode 100644 (file)
index b1de183..0000000
--- a/src/app/main.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include<QApplication>
-#include "appwindow.h"
-int main(int argc,char **argv)
-{
-    QApplication app(argc,argv);
-    AppWindow window;
-    window.showMaximized();
-    return app.exec();
-}

diff --git a/src/core/core.pro b/src/core/core.pro
index 0613612..8d9dabe 100644 (file)
--- a/src/core/core.pro
+++ b/src/core/core.pro
@@ -1,12 +1,2 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Tue Nov 16 21:24:19 2010
-######################################################################
-
-TEMPLATE = lib
-TARGET = ../../libs/photoenhancercore
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-HEADERS += filterinterface.h workspace.h
-SOURCES += workspace.cpp
+TEMPLATE = subdirs
+SUBDIRS = baseui utils

diff --git a/src/core/filterinterface.h b/src/core/filterinterface.h
deleted file mode 100644 (file)
index 59d25ce..0000000
--- a/src/core/filterinterface.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef FILTERINTERFACE_H
-#define FILTERINTERFACE_H
-#include <QObject>
-#include <QImage>
-
-class FilterInterface:public QObject
-{
-public:
-    FilterInterface()
-    {
-
-    }
-    virtual void applyFilter(QImage &image)=0;
-    virtual void displayFilterConfig(){}
-};
-
-#endif // FILTERINTERFACE_H

diff --git a/src/core/workspace.cpp b/src/core/workspace.cpp
deleted file mode 100644 (file)
index 673555e..0000000
--- a/src/core/workspace.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "workspace.h"
-#include <QPainter>
-Workspace::Workspace(QWidget *parent) :
-    QWidget(parent)
-{
-    loadImage("/home/shakir/Desktop/Test/test1.jpg");
-}
-void  Workspace::loadImage(QString fileName)
-{
-    mImage=QImage(fileName);
-}
-void  Workspace::zoomIn()
-{
-    mImage=mImage.scaledToHeight(mImage.height()*1.5);
-    mImage=mImage.scaledToWidth(mImage.width()*1.5);
-    update();
-}
-void  Workspace::zoomOut()
-{
-    mImage=mImage.scaledToHeight(mImage.height()*0.5);
-    mImage=mImage.scaledToWidth(mImage.width()*0.5);
-    update();
-}
-
-void  Workspace::paintEvent(QPaintEvent *p)
-{
-    QPainter painter(this);
-    painter.drawImage(mImage.rect(),mImage);
-}

diff --git a/src/core/workspace.h b/src/core/workspace.h
deleted file mode 100644 (file)
index 4fcb21f..0000000
--- a/src/core/workspace.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef WORKSPACE_H
-#define WORKSPACE_H
-
-#include <QWidget>
-
-class Workspace : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit Workspace(QWidget *parent = 0);
-    void loadImage(QString fileName);
-    virtual void paintEvent(QPaintEvent *);
-signals:
-
-
-public slots:
-    void zoomIn();
-    void zoomOut();
-
-private:
-    QImage mImage;
-
-};
-
-#endif // WORKSPACE_H

diff --git a/src/filters/Makefile b/src/filters/Makefile
index 417ce2f..afba3bc 100644 (file)
--- a/src/filters/Makefile
+++ b/src/filters/Makefile
@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: filters
-# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Nov 16 22:36:35 2010
+# Generated by qmake (2.01a) (Qt 4.7.0) on: Wed Nov 17 19:59:07 2010
 # Project:  filters.pro
 # Template: subdirs
-# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile filters.pro
+# Command: /usr/bin/qmake -o Makefile filters.pro
 #############################################################################
 
 first: make_default
@@ -30,10 +30,10 @@ SUBTARGETS    =  \
 
 sepia//$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) sepia/ || $(MKDIR) sepia/ 
-       cd sepia/ && $(QMAKE) /home/everyourgokul/workspace/photoenhancer/src/filters/sepia/sepia.pro -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o $(MAKEFILE)
+       cd sepia/ && $(QMAKE) /home/everyourgokul/workspace/photoenhancer/src/filters/sepia/sepia.pro -o $(MAKEFILE)
 sub-sepia-qmake_all:  FORCE
        @$(CHK_DIR_EXISTS) sepia/ || $(MKDIR) sepia/ 
-       cd sepia/ && $(QMAKE) /home/everyourgokul/workspace/photoenhancer/src/filters/sepia/sepia.pro -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o $(MAKEFILE)
+       cd sepia/ && $(QMAKE) /home/everyourgokul/workspace/photoenhancer/src/filters/sepia/sepia.pro -o $(MAKEFILE)
 sub-sepia: sepia//$(MAKEFILE) FORCE
        cd sepia/ && $(MAKE) -f $(MAKEFILE)
 sub-sepia-make_default: sepia//$(MAKEFILE) FORCE
@@ -52,10 +52,10 @@ sub-sepia-uninstall_subtargets: sepia//$(MAKEFILE) FORCE
        cd sepia/ && $(MAKE) -f $(MAKEFILE) uninstall
 grey//$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) grey/ || $(MKDIR) grey/ 
-       cd grey/ && $(QMAKE) /home/everyourgokul/workspace/photoenhancer/src/filters/grey/grey.pro -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o $(MAKEFILE)
+       cd grey/ && $(QMAKE) /home/everyourgokul/workspace/photoenhancer/src/filters/grey/grey.pro -o $(MAKEFILE)
 sub-grey-qmake_all:  FORCE
        @$(CHK_DIR_EXISTS) grey/ || $(MKDIR) grey/ 
-       cd grey/ && $(QMAKE) /home/everyourgokul/workspace/photoenhancer/src/filters/grey/grey.pro -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o $(MAKEFILE)
+       cd grey/ && $(QMAKE) /home/everyourgokul/workspace/photoenhancer/src/filters/grey/grey.pro -o $(MAKEFILE)
 sub-grey: grey//$(MAKEFILE) FORCE
        cd grey/ && $(MAKE) -f $(MAKEFILE)
 sub-grey-make_default: grey//$(MAKEFILE) FORCE
@@ -82,7 +82,7 @@ Makefile: filters.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt
                /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/debug.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 \
@@ -93,7 +93,7 @@ Makefile: filters.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt
                /usr/share/qt4/mkspecs/features/yacc.prf \
                /usr/share/qt4/mkspecs/features/lex.prf \
                /usr/share/qt4/mkspecs/features/include_source_dir.prf
-       $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile filters.pro
+       $(QMAKE) -o Makefile filters.pro
 /usr/share/qt4/mkspecs/common/g++.conf:
 /usr/share/qt4/mkspecs/common/unix.conf:
 /usr/share/qt4/mkspecs/common/linux.conf:
@@ -103,7 +103,7 @@ Makefile: filters.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt
 /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/debug.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:
@@ -115,7 +115,7 @@ Makefile: filters.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt
 /usr/share/qt4/mkspecs/features/lex.prf:
 /usr/share/qt4/mkspecs/features/include_source_dir.prf:
 qmake: qmake_all FORCE
-       @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile filters.pro
+       @$(QMAKE) -o Makefile filters.pro
 
 qmake_all: sub-sepia-qmake_all sub-grey-qmake_all FORCE
 

diff --git a/src/filters/grey/Makefile b/src/filters/grey/Makefile
deleted file mode 100644 (file)
index c8fabc8..0000000
--- a/src/filters/grey/Makefile
+++ /dev/null
@@ -1,202 +0,0 @@
-#############################################################################
-# Makefile for building: grey
-# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Nov 16 22:36:35 2010
-# Project:  grey.pro
-# Template: app
-# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile grey.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC            = gcc
-CXX           = g++
-DEFINES       = -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS      = -pipe -g -Wall -W -D_REENTRANT $(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.
-LINK          = g++
-LFLAGS        = 
-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/debug.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  = grey
-DESTDIR       = 
-TARGET        = grey
-
-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 $(TARGET)
-
-$(TARGET):  $(OBJECTS)  
-       $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
-
-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/debug.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) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -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/debug.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) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile grey.pro
-
-dist: 
-       @$(CHK_DIR_EXISTS) .tmp/grey1.0.0 || $(MKDIR) .tmp/grey1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/grey1.0.0/ && $(COPY_FILE) --parents greyfilter.h .tmp/grey1.0.0/ && $(COPY_FILE) --parents greyfilter.cpp .tmp/grey1.0.0/ && (cd `dirname .tmp/grey1.0.0` && $(TAR) grey1.0.0.tar grey1.0.0 && $(COMPRESS) grey1.0.0.tar) && $(MOVE) `dirname .tmp/grey1.0.0`/grey1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/grey1.0.0
-
-
-clean:compiler_clean 
-       -$(DEL_FILE) $(OBJECTS)
-       -$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-       -$(DEL_FILE) $(TARGET) 
-       -$(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/grey/grey.pro b/src/filters/grey/grey.pro
index 1e7852a..fec8c88 100644 (file)
--- a/src/filters/grey/grey.pro
+++ b/src/filters/grey/grey.pro
@@ -1,11 +1,11 @@
 ######################################################################
-# Automatically generated by qmake (2.01a) Tue Nov 16 21:44:33 2010
+# Automatically generated by qmake (2.01a) Tue Nov 16 21:24:31 2010
 ######################################################################
 
-TEMPLATE = app
-TARGET = 
+TEMPLATE = lib
+TARGET = ../../../filters/filter_sepia 
 DEPENDPATH += .
-INCLUDEPATH += .
+INCLUDEPATH += . ../../core/interfaces
 
 # Input
 HEADERS += greyfilter.h

diff --git a/src/filters/grey/greyfilter.cpp b/src/filters/grey/greyfilter.cpp
index e69de29..ce240e4 100644 (file)
--- a/src/filters/grey/greyfilter.cpp
+++ b/src/filters/grey/greyfilter.cpp
@@ -0,0 +1,30 @@
+#include "sepiafilter.h"
+#include <QImage>
+#include <QColor>
+#include <QDebug>
+SepiaFilter::SepiaFilter()
+{
+}
+void SepiaFilter::applyFilter(QImage &image)
+{
+    int inputRed,inputGreen,inputBlue;
+    int outputRed,outputGreen,outputBlue;
+
+    for(int i=0;i<image.width();i++)
+        for(int j=0;j<image.height();j++)
+        {
+            QColor inPixel(image.pixel(i,j));
+            inputRed=inPixel.red();
+            inputBlue=inPixel.blue();
+            inputGreen=inPixel.green();
+            outputRed = (inputRed * .393) + (inputGreen *.769) + (inputBlue * .189);
+            outputGreen = (inputRed * .349) + (inputGreen *.686) + (inputBlue * .168);
+            outputBlue = (inputRed * .272) + (inputGreen *.534) + (inputBlue * .131);
+            if(outputBlue>255) outputBlue=255;
+            if(outputGreen>255) outputGreen=255;
+            if(outputRed>255) outputRed=255;
+            QColor outPixel(outputRed,outputGreen,outputBlue);
+            image.setPixel(i,j,outPixel.rgb());
+    }
+
+}

diff --git a/src/filters/grey/greyfilter.h b/src/filters/grey/greyfilter.h
index e69de29..05ca6e8 100644 (file)
--- a/src/filters/grey/greyfilter.h
+++ b/src/filters/grey/greyfilter.h
@@ -0,0 +1,13 @@
+#ifndef SEPIAFILTER_H
+#define SEPIAFILTER_H
+
+#include "filterinterface.h"
+class SepiaFilter:public FilterInterface
+{
+public:
+    SepiaFilter();
+    void applyFilter(QImage &image);
+
+};
+
+#endif // SEPIAFILTER_H

diff --git a/src/filters/sepia/Makefile b/src/filters/sepia/Makefile
index 3d2a8c2..c8f8b5f 100644 (file)
--- a/src/filters/sepia/Makefile
+++ b/src/filters/sepia/Makefile
@@ -1,21 +1,21 @@
 #############################################################################
-# Makefile for building: libsepia.so.1.0.0
-# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Nov 16 22:36:35 2010
+# 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
 # Project:  sepia.pro
 # Template: lib
-# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile sepia.pro
+# Command: /usr/bin/qmake -o Makefile sepia.pro
 #############################################################################
 
 ####### Compiler, tools and options
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -g -Wall -W -D_REENTRANT -fPIC $(DEFINES)
-CXXFLAGS      = -pipe -g -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.
+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        = -shared -Wl,-soname,libsepia.so.1
+LFLAGS        = -Wl,-O1 -shared -Wl,-soname,libfilter_sepia.so.1
 LIBS          = $(SUBLIBS)  -L/usr/lib -lQtGui -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
@@ -54,7 +54,7 @@ DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
                /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/debug.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 \
@@ -66,14 +66,14 @@ DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
                /usr/share/qt4/mkspecs/features/lex.prf \
                /usr/share/qt4/mkspecs/features/include_source_dir.prf \
                sepia.pro
-QMAKE_TARGET  = sepia
-DESTDIR       = 
-TARGET        = libsepia.so.1.0.0
-TARGETA       = libsepia.a
-TARGETD       = libsepia.so.1.0.0
-TARGET0       = libsepia.so
-TARGET1       = libsepia.so.1
-TARGET2       = libsepia.so.1.0
+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
@@ -97,14 +97,20 @@ first: all
 
 ####### Build rules
 
-all: Makefile  $(TARGET)
+all: Makefile  ../../../filters/$(TARGET)
 
-$(TARGET):  $(OBJECTS) $(SUBLIBS) $(OBJCOMP)  
+../../../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/
 
 
 
@@ -123,7 +129,7 @@ Makefile: sepia.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/
                /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/debug.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 \
@@ -136,7 +142,7 @@ Makefile: sepia.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/
                /usr/share/qt4/mkspecs/features/include_source_dir.prf \
                /usr/lib/libQtGui.prl \
                /usr/lib/libQtCore.prl
-       $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile sepia.pro
+       $(QMAKE) -o Makefile sepia.pro
 /usr/share/qt4/mkspecs/common/g++.conf:
 /usr/share/qt4/mkspecs/common/unix.conf:
 /usr/share/qt4/mkspecs/common/linux.conf:
@@ -146,7 +152,7 @@ Makefile: sepia.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/
 /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/debug.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:
@@ -160,11 +166,11 @@ Makefile: sepia.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/
 /usr/lib/libQtGui.prl:
 /usr/lib/libQtCore.prl:
 qmake:  FORCE
-       @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile sepia.pro
+       @$(QMAKE) -o Makefile sepia.pro
 
 dist: 
-       @$(CHK_DIR_EXISTS) .tmp/sepia1.0.0 || $(MKDIR) .tmp/sepia1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/sepia1.0.0/ && $(COPY_FILE) --parents sepiafilter.h .tmp/sepia1.0.0/ && $(COPY_FILE) --parents sepiafilter.cpp .tmp/sepia1.0.0/ && (cd `dirname .tmp/sepia1.0.0` && $(TAR) sepia1.0.0.tar sepia1.0.0 && $(COMPRESS) sepia1.0.0.tar) && $(MOVE) `dirname .tmp/sepia1.0.0`/sepia1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/sepia1.0.0
+       @$(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 sepiafilter.h .tmp/filter_sepia1.0.0/ && $(COPY_FILE) --parents sepiafilter.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 
@@ -175,8 +181,8 @@ clean:compiler_clean
 ####### Sub-libraries
 
 distclean: clean
-       -$(DEL_FILE) $(TARGET) 
-       -$(DEL_FILE) $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
+       -$(DEL_FILE) ../../../filters/$(TARGET) 
+       -$(DEL_FILE) ../../../filters/$(TARGET0) ../../../filters/$(TARGET1) ../../../filters/$(TARGET2) $(TARGETA)
        -$(DEL_FILE) Makefile
 
 

diff --git a/src/filters/sepia/sepia.pro b/src/filters/sepia/sepia.pro
index a68836c..2d5344e 100644 (file)
--- a/src/filters/sepia/sepia.pro
+++ b/src/filters/sepia/sepia.pro
@@ -3,9 +3,9 @@
 ######################################################################
 
 TEMPLATE = lib
-TARGET = 
+TARGET = ../../../filters/filter_sepia 
 DEPENDPATH += .
-INCLUDEPATH += .
+INCLUDEPATH += . ../../core/interfaces
 
 # Input
 HEADERS += sepiafilter.h

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