From: Gokul Kartha Date: Tue, 16 Nov 2010 19:26:07 +0000 (+0200) Subject: Folder Structure Modeifications X-Git-Url: http://git.maemo.org/git/?p=photoenhancer;a=commitdiff_plain;h=f3777992798dd68268ba0c5d579ed10acf609a83 Folder Structure Modeifications --- diff --git a/photoenhancer.pro b/photoenhancer.pro new file mode 100644 index 0000000..e69de29 diff --git a/src/app/app.pro b/src/app/app.pro new file mode 100644 index 0000000..b7c0b7a --- /dev/null +++ b/src/app/app.pro @@ -0,0 +1,12 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Tue Nov 16 21:24:12 2010 +###################################################################### + +TEMPLATE = app +TARGET = +DEPENDPATH += . +INCLUDEPATH += . + +# Input +HEADERS += appwindow.h +SOURCES += appwindow.cpp main.cpp diff --git a/src/app/appwindow.cpp b/src/app/appwindow.cpp new file mode 100644 index 0000000..aa2718b --- /dev/null +++ b/src/app/appwindow.cpp @@ -0,0 +1,14 @@ +#include "appwindow.h" +#include "workspace.h" +#include +AppWindow::AppWindow() +{ + QDockWidget *dockWidget = new QDockWidget(tr("Workspace"), this); + dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | + Qt::RightDockWidgetArea); + + addDockWidget(Qt::LeftDockWidgetArea, dockWidget); + mWorkspace=new Workspace(); + dockWidget->setWidget(mWorkspace); +} + diff --git a/src/app/appwindow.h b/src/app/appwindow.h new file mode 100644 index 0000000..eac97f8 --- /dev/null +++ b/src/app/appwindow.h @@ -0,0 +1,14 @@ +#ifndef APPWINDOW_H +#define APPWINDOW_H +#include +class Workspace; +class AppWindow:public QMainWindow +{ +public: + AppWindow(); + +private: + Workspace *mWorkspace; +}; + +#endif // APPWINDOW_H diff --git a/src/app/main.cpp b/src/app/main.cpp new file mode 100644 index 0000000..e69de29 diff --git a/src/appwindow.cpp b/src/appwindow.cpp deleted file mode 100644 index aa2718b..0000000 --- a/src/appwindow.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "appwindow.h" -#include "workspace.h" -#include -AppWindow::AppWindow() -{ - QDockWidget *dockWidget = new QDockWidget(tr("Workspace"), this); - dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | - Qt::RightDockWidgetArea); - - addDockWidget(Qt::LeftDockWidgetArea, dockWidget); - mWorkspace=new Workspace(); - dockWidget->setWidget(mWorkspace); -} - diff --git a/src/appwindow.h b/src/appwindow.h deleted file mode 100644 index eac97f8..0000000 --- a/src/appwindow.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef APPWINDOW_H -#define APPWINDOW_H -#include -class Workspace; -class AppWindow:public QMainWindow -{ -public: - AppWindow(); - -private: - Workspace *mWorkspace; -}; - -#endif // APPWINDOW_H diff --git a/src/core/core.pro b/src/core/core.pro new file mode 100644 index 0000000..aa7427e --- /dev/null +++ b/src/core/core.pro @@ -0,0 +1,12 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Tue Nov 16 21:24:19 2010 +###################################################################### + +TEMPLATE = app +TARGET = +DEPENDPATH += . +INCLUDEPATH += . + +# Input +HEADERS += filterinterface.h workspace.h +SOURCES += workspace.cpp diff --git a/src/core/filterinterface.h b/src/core/filterinterface.h new file mode 100644 index 0000000..59d25ce --- /dev/null +++ b/src/core/filterinterface.h @@ -0,0 +1,17 @@ +#ifndef FILTERINTERFACE_H +#define FILTERINTERFACE_H +#include +#include + +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 new file mode 100644 index 0000000..8901609 --- /dev/null +++ b/src/core/workspace.cpp @@ -0,0 +1,33 @@ +#include "workspace.h" +#include +#include "sepiafilter.h" +Workspace::Workspace(QWidget *parent) : + QWidget(parent) +{ + loadImage("/home/shakir/Desktop/Test/test1.jpg"); +} +void Workspace::loadImage(QString fileName) +{ + mImage=QImage(fileName); + SepiaFilter *filter=new SepiaFilter(); + filter->applyFilter(mImage); + +} +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 new file mode 100644 index 0000000..4fcb21f --- /dev/null +++ b/src/core/workspace.h @@ -0,0 +1,25 @@ +#ifndef WORKSPACE_H +#define WORKSPACE_H + +#include + +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/filterinterface.h b/src/filterinterface.h deleted file mode 100644 index 59d25ce..0000000 --- a/src/filterinterface.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef FILTERINTERFACE_H -#define FILTERINTERFACE_H -#include -#include - -class FilterInterface:public QObject -{ -public: - FilterInterface() - { - - } - virtual void applyFilter(QImage &image)=0; - virtual void displayFilterConfig(){} -}; - -#endif // FILTERINTERFACE_H diff --git a/src/filtermanager.cpp b/src/filtermanager.cpp deleted file mode 100644 index d290b4b..0000000 --- a/src/filtermanager.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "filtermanager.h" - -FilterManager::FilterManager() -{ -} diff --git a/src/filtermanager.h b/src/filtermanager.h deleted file mode 100644 index 1809e55..0000000 --- a/src/filtermanager.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef FILTERMANAGER_H -#define FILTERMANAGER_H - -#include "filterinterface.h" -#include -#include - -class FilterManager:public QObject -{ -public: - FilterManager(); - void loadFilters(); -private: - QMap mFilters; -}; - -#endif // FILTERMANAGER_H diff --git a/src/main.cpp b/src/main.cpp deleted file mode 100644 index 2edf9a0..0000000 --- a/src/main.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "appwindow.h" - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - AppWindow w; - w.show(); - - return a.exec(); -} diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp deleted file mode 100644 index 49d64fc..0000000 --- a/src/mainwindow.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "mainwindow.h" -#include "ui_mainwindow.h" - -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindow) -{ - ui->setupUi(this); -} - -MainWindow::~MainWindow() -{ - delete ui; -} diff --git a/src/mainwindow.h b/src/mainwindow.h deleted file mode 100644 index c9fd6a9..0000000 --- a/src/mainwindow.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include - -namespace Ui { - class MainWindow; -} - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit MainWindow(QWidget *parent = 0); - ~MainWindow(); - -private: - Ui::MainWindow *ui; -}; - -#endif // MAINWINDOW_H diff --git a/src/photoenahnacer.pro.user b/src/photoenahnacer.pro.user deleted file mode 100644 index 266d04e..0000000 --- a/src/photoenahnacer.pro.user +++ /dev/null @@ -1,113 +0,0 @@ - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - System - - - - ProjectExplorer.Project.Target.0 - - Desktop - Qt4ProjectManager.Target.DesktopTarget - 0 - 0 - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /home/shakir/workspace/photoenahnacer-build-desktop - 2 - 0 - true - - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /home/shakir/workspace/photoenahnacer-build-desktop - 2 - 0 - true - - 2 - - photoenahnacer - Qt4ProjectManager.Qt4RunConfiguration - 2 - - photoenahnacer.pro - false - false - - false - false - - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 4 - - diff --git a/src/plugins/grey/grey.pro b/src/plugins/grey/grey.pro new file mode 100644 index 0000000..5c1b286 --- /dev/null +++ b/src/plugins/grey/grey.pro @@ -0,0 +1,7 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Tue Nov 16 21:24:38 2010 +###################################################################### + +TEMPLATE = subdirs + +# Directories diff --git a/src/plugins/sepia/sepia.pro b/src/plugins/sepia/sepia.pro new file mode 100644 index 0000000..e39a46c --- /dev/null +++ b/src/plugins/sepia/sepia.pro @@ -0,0 +1,12 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Tue Nov 16 21:24:31 2010 +###################################################################### + +TEMPLATE = app +TARGET = +DEPENDPATH += . +INCLUDEPATH += . + +# Input +HEADERS += sepiafilter.h +SOURCES += sepiafilter.cpp diff --git a/src/plugins/sepia/sepiafilter.cpp b/src/plugins/sepia/sepiafilter.cpp new file mode 100644 index 0000000..ce240e4 --- /dev/null +++ b/src/plugins/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/plugins/sepia/sepiafilter.h b/src/plugins/sepia/sepiafilter.h new file mode 100644 index 0000000..05ca6e8 --- /dev/null +++ b/src/plugins/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/sepiafilter.cpp b/src/sepiafilter.cpp deleted file mode 100644 index ce240e4..0000000 --- a/src/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/sepiafilter.h b/src/sepiafilter.h deleted file mode 100644 index 05ca6e8..0000000 --- a/src/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/welcome b/src/welcome deleted file mode 100644 index ba4c514..0000000 --- a/src/welcome +++ /dev/null @@ -1 +0,0 @@ -Welcome diff --git a/src/workspace.cpp b/src/workspace.cpp deleted file mode 100644 index 8901609..0000000 --- a/src/workspace.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "workspace.h" -#include -#include "sepiafilter.h" -Workspace::Workspace(QWidget *parent) : - QWidget(parent) -{ - loadImage("/home/shakir/Desktop/Test/test1.jpg"); -} -void Workspace::loadImage(QString fileName) -{ - mImage=QImage(fileName); - SepiaFilter *filter=new SepiaFilter(); - filter->applyFilter(mImage); - -} -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/workspace.h b/src/workspace.h deleted file mode 100644 index 4fcb21f..0000000 --- a/src/workspace.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef WORKSPACE_H -#define WORKSPACE_H - -#include - -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