From: Gokul Kartha Date: Tue, 16 Nov 2010 21:50:12 +0000 (+0200) Subject: Inititalization.baseUi Demo X-Git-Url: http://git.maemo.org/git/?p=photoenhancer;a=commitdiff_plain;h=f3e560c0dd50219a3c13275b73ccf40bc4128bc8;hp=4180e135617509b95c6e01d1e5a42b7f3394ddb5 Inititalization.baseUi Demo --- diff --git a/bin/photoenhancer b/bin/photoenhancer deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/app.pro b/src/app/app.pro index 9ebc010..5caf1dc 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -3,10 +3,12 @@ ###################################################################### TEMPLATE = app -TARGET = +TARGET = ../../bin/photoenhancer DEPENDPATH += . -INCLUDEPATH += . - +INCLUDEPATH +=. ../core +LIBS+=-L../../libs/ -lphotoenhancercore # Input HEADERS += appwindow.h SOURCES += appwindow.cpp main.cpp + +FORMS += diff --git a/src/app/appwindow.cpp b/src/app/appwindow.cpp index aa2718b..b89219e 100644 --- a/src/app/appwindow.cpp +++ b/src/app/appwindow.cpp @@ -1,14 +1,112 @@ #include "appwindow.h" #include "workspace.h" #include -AppWindow::AppWindow() -{ - QDockWidget *dockWidget = new QDockWidget(tr("Workspace"), this); - dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | - Qt::RightDockWidgetArea); +#include +#include + - addDockWidget(Qt::LeftDockWidgetArea, dockWidget); +AppWindow::AppWindow(QWidget *parent):QMainWindow(parent) +{ mWorkspace=new Workspace(); - dockWidget->setWidget(mWorkspace); + 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 index eac97f8..42b4b47 100644 --- a/src/app/appwindow.h +++ b/src/app/appwindow.h @@ -1,14 +1,61 @@ #ifndef APPWINDOW_H #define APPWINDOW_H -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + class Workspace; + + + class AppWindow:public QMainWindow { + Q_OBJECT + public: - AppWindow(); + 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 index e69de29..b1de183 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -0,0 +1,9 @@ +#include +#include "appwindow.h" +int main(int argc,char **argv) +{ + QApplication app(argc,argv); + AppWindow window; + window.showMaximized(); + return app.exec(); +} diff --git a/src/filters/Makefile b/src/filters/Makefile new file mode 100644 index 0000000..417ce2f --- /dev/null +++ b/src/filters/Makefile @@ -0,0 +1,145 @@ +############################################################################# +# Makefile for building: filters +# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Nov 16 22:36:35 2010 +# Project: filters.pro +# Template: subdirs +# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile filters.pro +############################################################################# + +first: make_default +MAKEFILE = Makefile +QMAKE = /usr/bin/qmake +DEL_FILE = rm -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p +COPY = cp -f +COPY_FILE = $(COPY) +COPY_DIR = $(COPY) -r +INSTALL_FILE = install -m 644 -p +INSTALL_PROGRAM = install -m 755 -p +INSTALL_DIR = $(COPY_DIR) +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p +SUBTARGETS = \ + sub-sepia \ + sub-grey + +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) +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) +sub-sepia: sepia//$(MAKEFILE) FORCE + cd sepia/ && $(MAKE) -f $(MAKEFILE) +sub-sepia-make_default: sepia//$(MAKEFILE) FORCE + cd sepia/ && $(MAKE) -f $(MAKEFILE) +sub-sepia-make_first: sepia//$(MAKEFILE) FORCE + cd sepia/ && $(MAKE) -f $(MAKEFILE) first +sub-sepia-all: sepia//$(MAKEFILE) FORCE + cd sepia/ && $(MAKE) -f $(MAKEFILE) all +sub-sepia-clean: sepia//$(MAKEFILE) FORCE + cd sepia/ && $(MAKE) -f $(MAKEFILE) clean +sub-sepia-distclean: sepia//$(MAKEFILE) FORCE + cd sepia/ && $(MAKE) -f $(MAKEFILE) distclean +sub-sepia-install_subtargets: sepia//$(MAKEFILE) FORCE + cd sepia/ && $(MAKE) -f $(MAKEFILE) install +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) +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) +sub-grey: grey//$(MAKEFILE) FORCE + cd grey/ && $(MAKE) -f $(MAKEFILE) +sub-grey-make_default: grey//$(MAKEFILE) FORCE + cd grey/ && $(MAKE) -f $(MAKEFILE) +sub-grey-make_first: grey//$(MAKEFILE) FORCE + cd grey/ && $(MAKE) -f $(MAKEFILE) first +sub-grey-all: grey//$(MAKEFILE) FORCE + cd grey/ && $(MAKE) -f $(MAKEFILE) all +sub-grey-clean: grey//$(MAKEFILE) FORCE + cd grey/ && $(MAKE) -f $(MAKEFILE) clean +sub-grey-distclean: grey//$(MAKEFILE) FORCE + cd grey/ && $(MAKE) -f $(MAKEFILE) distclean +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 + +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 \ + /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 + $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -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: +/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: +qmake: qmake_all FORCE + @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile filters.pro + +qmake_all: sub-sepia-qmake_all sub-grey-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 + -$(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 + +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 + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all +install: install_subtargets FORCE + +uninstall: uninstall_subtargets FORCE + +FORCE: + diff --git a/src/filters/filters.pro b/src/filters/filters.pro new file mode 100644 index 0000000..44f4f7e --- /dev/null +++ b/src/filters/filters.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = sepia grey diff --git a/src/filters/grey/Makefile b/src/filters/grey/Makefile new file mode 100644 index 0000000..c8fabc8 --- /dev/null +++ b/src/filters/grey/Makefile @@ -0,0 +1,202 @@ +############################################################################# +# 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 new file mode 100644 index 0000000..1e7852a --- /dev/null +++ b/src/filters/grey/grey.pro @@ -0,0 +1,12 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Tue Nov 16 21:44:33 2010 +###################################################################### + +TEMPLATE = app +TARGET = +DEPENDPATH += . +INCLUDEPATH += . + +# Input +HEADERS += greyfilter.h +SOURCES += greyfilter.cpp diff --git a/src/filters/grey/greyfilter.cpp b/src/filters/grey/greyfilter.cpp new file mode 100644 index 0000000..e69de29 diff --git a/src/filters/grey/greyfilter.h b/src/filters/grey/greyfilter.h new file mode 100644 index 0000000..e69de29 diff --git a/src/filters/sepia/Makefile b/src/filters/sepia/Makefile new file mode 100644 index 0000000..3d2a8c2 --- /dev/null +++ b/src/filters/sepia/Makefile @@ -0,0 +1,220 @@ +############################################################################# +# 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 +# Project: sepia.pro +# Template: lib +# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -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. +LINK = g++ +LFLAGS = -shared -Wl,-soname,libsepia.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 = sepiafilter.cpp +OBJECTS = sepiafilter.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 \ + 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 + +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) $(SUBLIBS) $(OBJCOMP) + -$(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) + + + +staticlib: $(TARGETA) + +$(TARGETA): $(OBJECTS) $(OBJCOMP) + -$(DEL_FILE) $(TARGETA) + $(AR) $(TARGETA) $(OBJECTS) + +Makefile: sepia.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 sepia.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 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 + + +clean:compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +####### Sub-libraries + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) $(TARGET0) $(TARGET1) $(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 + +sepiafilter.o: sepiafilter.cpp sepiafilter.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o sepiafilter.o sepiafilter.cpp + +####### Install + +install: FORCE + +uninstall: FORCE + +FORCE: + diff --git a/src/filters/sepia/sepia.pro b/src/filters/sepia/sepia.pro new file mode 100644 index 0000000..a68836c --- /dev/null +++ b/src/filters/sepia/sepia.pro @@ -0,0 +1,12 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Tue Nov 16 21:24:31 2010 +###################################################################### + +TEMPLATE = lib +TARGET = +DEPENDPATH += . +INCLUDEPATH += . + +# Input +HEADERS += sepiafilter.h +SOURCES += sepiafilter.cpp diff --git a/src/filters/sepia/sepiafilter.cpp b/src/filters/sepia/sepiafilter.cpp new file mode 100644 index 0000000..ce240e4 --- /dev/null +++ b/src/filters/sepia/sepiafilter.cpp @@ -0,0 +1,30 @@ +#include "sepiafilter.h" +#include +#include +#include +SepiaFilter::SepiaFilter() +{ +} +void SepiaFilter::applyFilter(QImage &image) +{ + int inputRed,inputGreen,inputBlue; + int outputRed,outputGreen,outputBlue; + + for(int i=0;i255) 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/sepia/sepiafilter.h b/src/filters/sepia/sepiafilter.h new file mode 100644 index 0000000..05ca6e8 --- /dev/null +++ b/src/filters/sepia/sepiafilter.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/plugins/Makefile b/src/plugins/Makefile new file mode 100644 index 0000000..28dcf1d --- /dev/null +++ b/src/plugins/Makefile @@ -0,0 +1,95 @@ +############################################################################# +# Makefile for building: plugins +# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Nov 16 22:36:35 2010 +# Project: plugins.pro +# Template: subdirs +# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile plugins.pro +############################################################################# + +first: make_default +MAKEFILE = Makefile +QMAKE = /usr/bin/qmake +DEL_FILE = rm -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p +COPY = cp -f +COPY_FILE = $(COPY) +COPY_DIR = $(COPY) -r +INSTALL_FILE = install -m 644 -p +INSTALL_PROGRAM = install -m 755 -p +INSTALL_DIR = $(COPY_DIR) +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p +SUBTARGETS = + + +Makefile: plugins.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 + $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile plugins.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: +qmake: qmake_all FORCE + @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile plugins.pro + +qmake_all: FORCE + +make_default: FORCE +make_first: FORCE +all: FORCE +clean: FORCE +distclean: FORCE + -$(DEL_FILE) Makefile +install_subtargets: FORCE +uninstall_subtargets: FORCE + +check: + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all +install: install_subtargets FORCE + +uninstall: uninstall_subtargets FORCE + +FORCE: + diff --git a/src/plugins/grey/grey.pro b/src/plugins/grey/grey.pro deleted file mode 100644 index 1e7852a..0000000 --- a/src/plugins/grey/grey.pro +++ /dev/null @@ -1,12 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Tue Nov 16 21:44:33 2010 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -HEADERS += greyfilter.h -SOURCES += greyfilter.cpp diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro new file mode 100644 index 0000000..900a41f --- /dev/null +++ b/src/plugins/plugins.pro @@ -0,0 +1,7 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Tue Nov 16 22:33:11 2010 +###################################################################### + +TEMPLATE = subdirs + +# Directories diff --git a/src/plugins/sepia/sepia.pro b/src/plugins/sepia/sepia.pro deleted file mode 100644 index a68836c..0000000 --- a/src/plugins/sepia/sepia.pro +++ /dev/null @@ -1,12 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Tue Nov 16 21:24:31 2010 -###################################################################### - -TEMPLATE = lib -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -HEADERS += sepiafilter.h -SOURCES += sepiafilter.cpp diff --git a/src/plugins/sepia/sepiafilter.cpp b/src/plugins/sepia/sepiafilter.cpp deleted file mode 100644 index ce240e4..0000000 --- a/src/plugins/sepia/sepiafilter.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "sepiafilter.h" -#include -#include -#include -SepiaFilter::SepiaFilter() -{ -} -void SepiaFilter::applyFilter(QImage &image) -{ - int inputRed,inputGreen,inputBlue; - int outputRed,outputGreen,outputBlue; - - for(int i=0;i255) 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/plugins/sepia/sepiafilter.h b/src/plugins/sepia/sepiafilter.h deleted file mode 100644 index 05ca6e8..0000000 --- a/src/plugins/sepia/sepiafilter.h +++ /dev/null @@ -1,13 +0,0 @@ -#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/src.pro b/src/src.pro new file mode 100644 index 0000000..7708e3f --- /dev/null +++ b/src/src.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = app core