diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f0adfe3..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Ignoring build files -IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/ diff --git a/IntelliPhoto/Painting/GUI/IntelliPhotoGui.cpp b/IntelliPhoto/Painting/GUI/IntelliPhotoGui.cpp new file mode 100644 index 0000000..1c13e71 --- /dev/null +++ b/IntelliPhoto/Painting/GUI/IntelliPhotoGui.cpp @@ -0,0 +1,423 @@ +// ---------- IntelliPhotoGui.cpp ---------- + +#include +#include + +#include "IntelliPhotoGui.h" +#include "Layer/PaintingArea.h" + +// IntelliPhotoGui constructor +IntelliPhotoGui::IntelliPhotoGui() +{ + //create Gui elemnts and lay them out + createGui(); + // Create actions + createActions(); + //create Menus + createMenus(); + //set style of the gui + setIntelliStyle(); + + // Size the app + resize(500, 500); +} + + +// User tried to close the app +void IntelliPhotoGui::closeEvent(QCloseEvent *event) +{ + // If they try to close maybeSave() returns true + // if no changes have been made and the app closes + if (maybeSave()) { + event->accept(); + } else { + + // If there have been changes ignore the event + event->ignore(); + } +} + +// Check if the current image has been changed and then +// open a dialog to open a file +void IntelliPhotoGui::open() +{ + // Check if changes have been made since last save + // maybeSave() returns true if no changes have been made + if (maybeSave()) { + + // Get the file to open from a dialog + // tr sets the window title to Open File + // QDir opens the current dirctory + QString fileName = QFileDialog::getOpenFileName(this, + tr("Open File"), QDir::currentPath()); + + // If we have a file name load the image and place + // it in the paintingArea + if (!fileName.isEmpty()) + paintingArea->openImage(fileName); + } +} + +// Called when the user clicks Save As in the menu +void IntelliPhotoGui::save() +{ + // A QAction represents the action of the user clicking + QAction *action = qobject_cast(sender()); + + // Stores the array of bytes of the users data + QByteArray fileFormat = action->data().toByteArray(); + + // Pass it to be saved + saveFile(fileFormat); +} + +// Opens a dialog to change the pen color +void IntelliPhotoGui::penColor() +{ + // Store the chosen color from the dialog + QColor newColor = QColorDialog::getColor(paintingArea->penColor()); + + // If a valid color set it + if (newColor.isValid()) + paintingArea->setPenColor(newColor); +} + +// Opens a dialog that allows the user to change the pen width +void IntelliPhotoGui::penWidth() +{ + // Stores button value + bool ok; + + // tr("Painting") is the title + // the next tr is the text to display + // Get the current pen width + // Define the min, max, step and ok button + int newWidth = QInputDialog::getInt(this, tr("Painting"), + tr("Select pen width:"), + paintingArea->penWidth(), + 1, 500, 1, &ok); + // Change the pen width + if (ok) + paintingArea->setPenWidth(newWidth); +} + +// Open an about dialog +void IntelliPhotoGui::about() +{ + // Window title and text to display + QMessageBox::about(this, tr("About Painting"), + tr("

IntelliPhoto Some nice ass looking software

")); +} + +void IntelliPhotoGui::onSetAlpha(){ + int a = this->setAlphaEdit->text().toInt(); + emit this->sendAlpha(a); +} + +void IntelliPhotoGui::onMoveUp(){ + int a = 5; + emit this->moveUp(a); +} + +void IntelliPhotoGui::onMoveDown(){ + int a = 5; + emit this->moveDown(a); +} + +void IntelliPhotoGui::onMoveLeft(){ + int a = 5; + emit this->moveLeft(a); +} + +void IntelliPhotoGui::onMoveRight(){ + int a = 5; + emit this->moveRight(a); +} + +void IntelliPhotoGui::onMoveLayerUp(){ + emit this->moveLayerUp(); +} + +void IntelliPhotoGui::onMoveLayerDown(){ + emit this->moveLayerDown(); +} + +void IntelliPhotoGui::onClearedPressed(){ + int r = this->RedEdit->text().toInt(); + int g = this->GreenEdit->text().toInt(); + int b = this->BlueEdit->text().toInt(); + emit this->sendClearColor(r,g,b); +} + +void IntelliPhotoGui::onActivePressed(){ + int a = this->selectActiveEdit->text().toInt(); + emit this->sendActiveLayer(a); +}; + + + +// Define menu actions that call functions +void IntelliPhotoGui::createActions() +{ + //connect signal and slots of gui element + connect(this->clearButton, SIGNAL(clicked()), this, SLOT(onClearedPressed())); + connect(this, SIGNAL(sendClearColor(int,int,int)), paintingArea, SLOT(clearImage(int, int, int))); + + connect(this->selectActiveButton, SIGNAL(clicked()), this, SLOT(onActivePressed())); + connect(this, SIGNAL(sendActiveLayer(int)),paintingArea, SLOT(activate(int))); + + connect(this->setAlphaButton, SIGNAL(clicked()), this, SLOT(onSetAlpha())); + connect(this, SIGNAL(sendAlpha(int)), paintingArea, SLOT(setAlpha(int))); + + connect(this->moveActiveUpButton, SIGNAL(clicked()), this, SLOT(onMoveUp())); + connect(this, SIGNAL(moveUp(int)), paintingArea, SLOT(getMoveUp(int))); + + connect(this->moveActiveDownButton, SIGNAL(clicked()), this, SLOT(onMoveDown())); + connect(this, SIGNAL(moveDown(int)), paintingArea, SLOT(getMoveDown(int))); + + connect(this->moveActiveLeftButton, SIGNAL(clicked()), this, SLOT(onMoveLeft())); + connect(this, SIGNAL(moveLeft(int)), paintingArea, SLOT(getMoveLeft(int))); + + connect(this->moveActiveRightButton, SIGNAL(clicked()), this, SLOT(onMoveRight())); + connect(this, SIGNAL(moveRight(int)), paintingArea, SLOT(getMoveRight(int))); + + connect(this->layerMoveActiveDownButton, SIGNAL(clicked()), this, SLOT(onMoveLayerDown())); + connect(this, SIGNAL(moveLayerDown()), paintingArea, SLOT(getMoveLayerDown())); + + connect(this->layerMoveActiveUpButton, SIGNAL(clicked()), this, SLOT(onMoveLayerUp())); + connect(this, SIGNAL(moveLayerUp()), paintingArea, SLOT(getMoveLayerUp())); + + + + // Create the action tied to the menu + openAct = new QAction(tr("&Open..."), this); + + // Define the associated shortcut key + openAct->setShortcuts(QKeySequence::Open); + + // Tie the action to IntelliPhotoGui::open() + connect(openAct, SIGNAL(triggered()), this, SLOT(open())); + + // Get a list of the supported file formats + // QImageWriter is used to write images to files + foreach (QByteArray format, QImageWriter::supportedImageFormats()) { + QString text = tr("%1...").arg(QString(format).toUpper()); + + // Create an action for each file format + QAction *action = new QAction(text, this); + + // Set an action for each file format + action->setData(format); + + // When clicked call IntelliPhotoGui::save() + connect(action, SIGNAL(triggered()), this, SLOT(save())); + + // Attach each file format option menu item to Save As + saveAsActs.append(action); + } + + QAction *action = new QAction("PNG-8", this); + + // Set an action for each file format + action->setData("PNG"); + + // When clicked call IntelliPhotoGui::save() + connect(action, SIGNAL(triggered()), this, SLOT(save())); + + // Attach each file format option menu item to Save As + saveAsActs.append(action); + + + // Create exit action and tie to IntelliPhotoGui::close() + exitAct = new QAction(tr("&Exit"), this); + exitAct->setShortcuts(QKeySequence::Quit); + connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); + + // Create pen color action and tie to IntelliPhotoGui::penColor() + penColorAct = new QAction(tr("&Pen Color..."), this); + connect(penColorAct, SIGNAL(triggered()), this, SLOT(penColor())); + + // Create pen width action and tie to IntelliPhotoGui::penWidth() + penWidthAct = new QAction(tr("Pen &Width..."), this); + connect(penWidthAct, SIGNAL(triggered()), this, SLOT(penWidth())); + + // Create clear screen action and tie to IntelliPhotoGui::clearImage() + clearScreenAct = new QAction(tr("&Clear Screen"), this); + clearScreenAct->setShortcut(tr("Ctrl+L")); + connect(clearScreenAct, SIGNAL(triggered()), + paintingArea, SLOT(clearImage())); + + // Create about action and tie to IntelliPhotoGui::about() + aboutAct = new QAction(tr("&About"), this); + connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); + + // Create about Qt action and tie to IntelliPhotoGui::aboutQt() + aboutQtAct = new QAction(tr("About &Qt"), this); + connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt())); +} + +// Create the menubar +void IntelliPhotoGui::createMenus() +{ + // Create Save As option and the list of file types + saveAsMenu = new QMenu(tr("&Save As"), this); + foreach (QAction *action, saveAsActs) + saveAsMenu->addAction(action); + + + // Attach all actions to File + fileMenu = new QMenu(tr("&File"), this); + fileMenu->addAction(openAct); + fileMenu->addMenu(saveAsMenu); + fileMenu->addSeparator(); + fileMenu->addAction(exitAct); + + // Attach all actions to Options + optionMenu = new QMenu(tr("&Options"), this); + optionMenu->addAction(penColorAct); + optionMenu->addAction(penWidthAct); + optionMenu->addSeparator(); + optionMenu->addAction(clearScreenAct); + + // Attach all actions to Help + helpMenu = new QMenu(tr("&Help"), this); + helpMenu->addAction(aboutAct); + helpMenu->addAction(aboutQtAct); + + // Add menu items to the menubar + menuBar()->addMenu(fileMenu); + menuBar()->addMenu(optionMenu); + menuBar()->addMenu(helpMenu); +} + +void IntelliPhotoGui::createGui(){ + //create a central widget to work on + centralGuiWidget = new QWidget(this); + setCentralWidget(centralGuiWidget); + + //create the grid for the layout + mainLayout = new QGridLayout(centralGuiWidget); + centralGuiWidget->setLayout(mainLayout); + + //create Gui elements + clearButton = new QPushButton("set Color"); + paintingArea = new PaintingArea(); + + + RedLabel = new QLabel("Red:"); + GreenLabel = new QLabel("Green"); + BlueLabel = new QLabel("Blue:"); + RedEdit = new QLineEdit("255"); + GreenEdit = new QLineEdit("255"); + BlueEdit = new QLineEdit("255"); + RedEdit->setMaximumSize(150,20); + GreenEdit->setMaximumSize(150,20); + BlueEdit->setMaximumSize(150,20); + + selectActiveButton = new QPushButton("select Active"); + selectActiveLabel = new QLabel("Active:"); + selectActiveEdit = new QLineEdit("0"); + selectActiveLabel->setMaximumSize(150,20); + selectActiveEdit->setMaximumSize(150,20); + + setAlphaButton = new QPushButton("set Alpha"); + setAlphaLabel = new QLabel("Alpha:"); + setAlphaEdit = new QLineEdit("255"); + setAlphaEdit->setMaximumSize(150,20); + + moveActiveUpButton = new QPushButton("move 5 Up"); + moveActiveDownButton = new QPushButton("move 5 Down"); + moveActiveLeftButton = new QPushButton("move 5 Left"); + moveActiveRightButton = new QPushButton("move 5 Right"); + + layerMoveActiveDownButton = new QPushButton("Active Layer Down"); + layerMoveActiveUpButton = new QPushButton("Active Layer Up"); + + //set gui elemtns position + mainLayout->addWidget(clearButton,0,25,1,1); + mainLayout->addWidget(paintingArea,0,0,25,25); + + mainLayout->addWidget(RedLabel,1,25,1,1); + mainLayout->addWidget(RedEdit,2,25,1,1); + mainLayout->addWidget(GreenLabel,3,25,1,1); + mainLayout->addWidget(GreenEdit,4,25,1,1); + mainLayout->addWidget(BlueLabel,5,25,1,1); + mainLayout->addWidget(BlueEdit,6,25,1,1); + + mainLayout->addWidget(selectActiveButton,7,25,1,1); + mainLayout->addWidget(selectActiveLabel,8,25,1,1); + mainLayout->addWidget(selectActiveEdit,9,25,1,1); + + mainLayout->addWidget(setAlphaButton,10,25,1,1); + mainLayout->addWidget(setAlphaLabel,11,25,1,1); + mainLayout->addWidget(setAlphaEdit,12,25,1,1); + + mainLayout->addWidget(moveActiveUpButton,13,25,1,1); + mainLayout->addWidget(moveActiveDownButton,14,25,1,1); + mainLayout->addWidget(moveActiveLeftButton,15,25,1,1); + mainLayout->addWidget(moveActiveRightButton,16,25,1,1); + + mainLayout->addWidget(layerMoveActiveDownButton,17,25,1,1); + mainLayout->addWidget(layerMoveActiveUpButton,18,25,1,1); + + +} + +void IntelliPhotoGui::setIntelliStyle(){ + // Set the title + setWindowTitle("IntelliPhoto Prototype"); + //set style sheet + this->setStyleSheet("background-color:rgb(64,64,64)"); + this->centralGuiWidget->setStyleSheet("color:rgb(255,255,255)"); + this->menuBar()->setStyleSheet("color:rgb(255,255,255)"); +} + +bool IntelliPhotoGui::maybeSave() +{ + // Check for changes since last save + if (paintingArea->isModified()) { + QMessageBox::StandardButton ret; + + // Painting is the title + // Add text and the buttons + ret = QMessageBox::warning(this, tr("Painting"), + tr("The image has been modified.\n" + "Do you want to save your changes?"), + QMessageBox::Save | QMessageBox::Discard + | QMessageBox::Cancel); + + // If save button clicked call for file to be saved + if (ret == QMessageBox::Save) { + return saveFile("png"); + + // If cancel do nothing + } else if (ret == QMessageBox::Cancel) { + return false; + } + } + return true; +} + +bool IntelliPhotoGui::saveFile(const QByteArray &fileFormat) +{ + // Define path, name and default file type + QString initialPath = QDir::currentPath() + "/untitled." + fileFormat; + + // Get selected file from dialog + // Add the proper file formats and extensions + QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), + initialPath, + tr("%1 Files (*.%2);;All Files (*)") + .arg(QString::fromLatin1(fileFormat.toUpper())) + .arg(QString::fromLatin1(fileFormat))); + + // If no file do nothing + if (fileName.isEmpty()) { + return false; + } else { + + // Call for the file to be saved + return paintingArea->saveImage(fileName, fileFormat.constData()); + } +} + diff --git a/IntelliPhoto/Painting/Image/IntelliImage.cpp b/IntelliPhoto/Painting/Image/IntelliImage.cpp new file mode 100644 index 0000000..879e8c7 --- /dev/null +++ b/IntelliPhoto/Painting/Image/IntelliImage.cpp @@ -0,0 +1,81 @@ +#include"Image/IntelliImage.h" +#include +#include + +IntelliImage::IntelliImage(int weight, int height) + :imageData(QSize(weight, height), QImage::Format_ARGB32){ + imageData.fill(QColor(255,255,255,255)); +} + +IntelliImage::~IntelliImage(){ + +} + +bool IntelliImage::loadImage(const QString &fileName){ + // Holds the image + QImage loadedImage; + + // If the image wasn't loaded leave this function + if (!loadedImage.load(fileName)) + return false; + + // scaled Image to size of Layer + // loadedImage = loadedImage.scaled(imageData.size(),Qt::IgnoreAspectRatio); + + imageData = loadedImage.convertToFormat(QImage::Format_ARGB32); + return true; +} + +void IntelliImage::resizeImage(QImage *image, const QSize &newSize){ + // Check if we need to redraw the image + if (image->size() == newSize) + return; + + // Create a new image to display and fill it with white + QImage newImage(newSize, QImage::Format_ARGB32); + newImage.fill(qRgb(255, 255, 255)); + + // Draw the image + QPainter painter(&newImage); + painter.drawImage(QPoint(0, 0), *image); + *image = newImage; +} + +void IntelliImage::drawPixel(const QPoint &p1, const QColor& color){ + // Used to draw on the widget + QPainter painter(&imageData); + + // Set the current settings for the pen + painter.setPen(QPen(color, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + + // Draw a line from the last registered point to the current + painter.drawPoint(p1); + + // Call to update the rectangular space where we drew + //update(QRect(p1, p2)); +} + +void IntelliImage::drawLine(const QPoint &p1, const QPoint& p2, const QColor& color, const int& penWidth){ + // Used to draw on the widget + QPainter painter(&imageData); + + // Set the current settings for the pen + painter.setPen(QPen(color, penWidth, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + + // Draw a line from the last registered point to the current + painter.drawLine(p1, p2); + +} + +void IntelliImage::floodFill(const QColor& color){ + imageData.fill(color); + +} + +int IntelliImage::x(){ + return imageData.size().width(); +} + +int IntelliImage::y(){ + return imageData.size().height(); +} diff --git a/IntelliPhoto/Painting/Image/IntelliImage.h b/IntelliPhoto/Painting/Image/IntelliImage.h new file mode 100644 index 0000000..a2fb3c0 --- /dev/null +++ b/IntelliPhoto/Painting/Image/IntelliImage.h @@ -0,0 +1,46 @@ +#ifndef INTELLIIMAGE_H +#define INTELLIIMAGE_H + +#include +#include +#include +#include +#include +#include + +enum class ImageType{ + Raster_Image, + Shaped_Image +}; + +class IntelliImage{ + +protected: + void resizeImage(QImage *image, const QSize &newSize); + + QImage imageData; +public: + IntelliImage(int weight, int height); + virtual ~IntelliImage() = 0; + + //start on top left + virtual void drawPixel(const QPoint &p1, const QColor& color); + virtual void drawLine(const QPoint &p1, const QPoint& p2, const QColor& color, const int& penWidth); + virtual void floodFill(const QColor& color); + + //returns the filtered output + virtual QImage getDisplayable(const QSize& displaySize, int alpha)=0; + virtual QImage getDisplayable(int alpha=255)=0; + + //returns the filtered output + + //sets the data for the visible image + virtual void setPolygon(const std::vector& polygonData)=0; + + virtual bool loadImage(const QString &fileName); + + int x(); + int y(); +}; + +#endif diff --git a/IntelliPhoto/Painting/Image/IntelliRasterImage.cpp b/IntelliPhoto/Painting/Image/IntelliRasterImage.cpp new file mode 100644 index 0000000..b73c264 --- /dev/null +++ b/IntelliPhoto/Painting/Image/IntelliRasterImage.cpp @@ -0,0 +1,34 @@ +#include"Image/IntelliRasterImage.h" +#include +#include +#include + +IntelliRasterImage::IntelliRasterImage(int weight, int height) + :IntelliImage(weight, height){ + +} + +IntelliRasterImage::~IntelliRasterImage(){ + +} + +QImage IntelliRasterImage::getDisplayable(int alpha){ + return getDisplayable(imageData.size(), alpha); +} + +QImage IntelliRasterImage::getDisplayable(const QSize& displaySize, int alpha){ + QImage copy = imageData; + for(int y = 0; y& polygonData){ + qDebug() << "Raster Image has no polygon data " << polygonData.size() <<"\n"; + return; +} diff --git a/IntelliPhoto/Painting/Image/IntelliRasterImage.h b/IntelliPhoto/Painting/Image/IntelliRasterImage.h new file mode 100644 index 0000000..3b3e600 --- /dev/null +++ b/IntelliPhoto/Painting/Image/IntelliRasterImage.h @@ -0,0 +1,21 @@ +#ifndef INTELLIRASTER_H +#define INTELLIRASTER_H + +#include"Image/IntelliImage.h" + +class IntelliRasterImage : public IntelliImage{ + +public: + IntelliRasterImage(int weight, int height); + virtual ~IntelliRasterImage() override; + + //returns the filtered output + virtual QImage getDisplayable(const QSize& displaySize,int alpha) override; + virtual QImage getDisplayable(int alpha=255) override; + + + //sets the data for the visible image + virtual void setPolygon(const std::vector& polygonData) override; +}; + +#endif diff --git a/IntelliPhoto/Painting/Image/IntelliShapedImage.cpp b/IntelliPhoto/Painting/Image/IntelliShapedImage.cpp new file mode 100644 index 0000000..6b7a829 --- /dev/null +++ b/IntelliPhoto/Painting/Image/IntelliShapedImage.cpp @@ -0,0 +1,71 @@ +#include"Image/IntelliShapedImage.h" +#include"IntelliHelper/IntelliHelper.h" +#include +#include +#include + +IntelliShapedImage::IntelliShapedImage(int weight, int height) + :IntelliImage(weight, height){ +} + +IntelliShapedImage::~IntelliShapedImage(){ + +} + +QImage IntelliShapedImage::getDisplayable(int alpha){ + return getDisplayable(imageData.size()); +} + +QImage IntelliShapedImage::getDisplayable(const QSize& displaySize, int alpha){ + if(polygonData.size()==0){ + QImage copy = imageData; + for(int y = 0; y not in Polygon + if(!(cutNumberX&1)){ + QColor tmpColor(0,0,0); + tmpColor.setAlpha(0); + copy.setPixelColor(startPoint,tmpColor); + }else{ + QColor clr = copy.pixelColor(x,y); + clr.setAlpha(alpha); + copy.setPixelColor(x,y,clr); + } + } + } + + return copy.scaled(displaySize,Qt::IgnoreAspectRatio); +} + +void IntelliShapedImage::setPolygon(const std::vector& polygonData){ + if(polygonData.size()<3){ + return; + } + for(auto element:polygonData){ + this->polygonData.push_back(QPoint(element.x(), element.y())); + } + return; +} diff --git a/IntelliPhoto/Painting/Image/IntelliShapedImage.h b/IntelliPhoto/Painting/Image/IntelliShapedImage.h new file mode 100644 index 0000000..6c38366 --- /dev/null +++ b/IntelliPhoto/Painting/Image/IntelliShapedImage.h @@ -0,0 +1,22 @@ +#ifndef INTELLISHAPE_H +#define INTELLISHAPE_H + +#include"Image/IntelliImage.h" + +class IntelliShapedImage : public IntelliImage{ + +protected: + std::vector polygonData; +public: + IntelliShapedImage(int weight, int height); + virtual ~IntelliShapedImage() override; + + //returns the filtered output + virtual QImage getDisplayable(const QSize& displaySize, int alpha=255) override; + virtual QImage getDisplayable(int alpha=255) override; + + //sets the data for the visible image + virtual void setPolygon(const std::vector& polygonData) override; +}; + +#endif diff --git a/IntelliPhoto/Painting/IntelliPhoto.pro.user b/IntelliPhoto/Painting/IntelliPhoto.pro.user new file mode 100644 index 0000000..34921a9 --- /dev/null +++ b/IntelliPhoto/Painting/IntelliPhoto.pro.user @@ -0,0 +1,337 @@ + + + + + + EnvironmentId + {d22feba4-9460-41e9-9ac3-cddcd407714c} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop (x86-windows-msvc2017-pe-64bit) + Desktop (x86-windows-msvc2017-pe-64bit) + {39c3549a-728d-484f-a9ec-e2904e3853e7} + 0 + 0 + 0 + + Z:/Uni/ws 19_20/mathe/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_x86_windows_msvc2017_pe_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + Z:/Uni/ws 19_20/mathe/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_x86_windows_msvc2017_pe_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + Z:/Uni/ws 19_20/mathe/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_x86_windows_msvc2017_pe_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deployment + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deployment-Konfiguration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + IntelliPhoto + + Qt4ProjectManager.Qt4RunConfiguration:Z:/Uni/ws 19_20/mathe/intelliphoto/IntelliPhoto/Painting/IntelliPhoto.pro + + 3768 + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/IntelliPhoto/Painting/IntelliPhoto.pro.user.2eff11b b/IntelliPhoto/Painting/IntelliPhoto.pro.user.2eff11b new file mode 100644 index 0000000..06819e8 --- /dev/null +++ b/IntelliPhoto/Painting/IntelliPhoto.pro.user.2eff11b @@ -0,0 +1,337 @@ + + + + + + EnvironmentId + {2eff11b9-2504-4003-b4ce-30c119b76df9} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.12.5 MSVC2017 64bit + Desktop Qt 5.12.5 MSVC2017 64bit + qt.qt5.5125.win64_msvc2017_64_kit + 0 + 0 + 0 + + C:/Users/Basti/OneDrive/Documents/Uni/Softwaretechnologie/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MSVC2017_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Users/Basti/OneDrive/Documents/Uni/Softwaretechnologie/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MSVC2017_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + C:/Users/Basti/OneDrive/Documents/Uni/Softwaretechnologie/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MSVC2017_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deployment + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deployment-Konfiguration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + IntelliPhoto + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Basti/OneDrive/Documents/Uni/Softwaretechnologie/IntelliPhoto/Painting/IntelliPhoto.pro + + 3768 + false + true + true + false + false + true + + C:/Users/Basti/OneDrive/Documents/Uni/Softwaretechnologie/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MSVC2017_64bit-Debug + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/IntelliPhoto/Painting/IntelliPhoto.pro.user.426164d b/IntelliPhoto/Painting/IntelliPhoto.pro.user.426164d new file mode 100644 index 0000000..7a6a7ab --- /dev/null +++ b/IntelliPhoto/Painting/IntelliPhoto.pro.user.426164d @@ -0,0 +1,342 @@ + + + + + + EnvironmentId + {426164d9-3771-4235-8f83-cb0b49423ffc} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + true + + + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.12.5 MinGW 64-bit + Desktop Qt 5.12.5 MinGW 64-bit + qt.qt5.5125.win64_mingw73_kit + 1 + 0 + 0 + + C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deployment + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deployment-Konfiguration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + IntelliPhoto + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/Painting/IntelliPhoto.pro + + 3768 + false + true + true + false + false + true + + C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Release + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/IntelliPhoto/Painting/Layer/PaintingArea.cpp b/IntelliPhoto/Painting/Layer/PaintingArea.cpp new file mode 100644 index 0000000..de6ec85 --- /dev/null +++ b/IntelliPhoto/Painting/Layer/PaintingArea.cpp @@ -0,0 +1,331 @@ +// ---------- PaintingArea.cpp ---------- + +#include +#include +#include "PaintingArea.h" +#include "Image/IntelliRasterImage.h" +#include "Image/IntelliShapedImage.h" + +#include +#include + +PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget *parent) + :QWidget(parent){ + this->setUp(maxWidth, maxHeight); + + //tetsing + this->addLayer(200,200,0,0,ImageType::Shaped_Image); + layerStructure[0].image->floodFill(QColor(255,0,0,255)); + std::vector polygon; + polygon.push_back(QPoint(100,0)); + polygon.push_back(QPoint(200,200)); + polygon.push_back(QPoint(0,200)); + polygon.push_back(QPoint(100,0)); + layerStructure[0].image->setPolygon(polygon); + + this->addLayer(200,200,150,150); + layerStructure[1].image->floodFill(QColor(0,255,0,255)); + layerStructure[1].alpha=200; + activeLayer=1; +} + + + + +void PaintingArea::setUp(int maxWidth, int maxHeight){ + + //set standart parameter + this->maxWidth = maxWidth; + this->maxHeight = maxHeight; + Canvas = new QImage(maxWidth,maxHeight, QImage::Format_ARGB32); + Canvas->fill(Qt::GlobalColor::white); + + // Roots the widget to the top left even if resized + setAttribute(Qt::WA_StaticContents); + + // Set defaults for the monitored variables + scribbling = false; + myPenWidth = 1; + myPenColor = Qt::blue; +} + +void PaintingArea::addLayer(int width, int height, int widthOffset, int heightOffset, ImageType type){ + LayerObject newLayer; + newLayer.width = width; + newLayer.height = height; + newLayer.widthOffset = widthOffset; + newLayer.heightOffset = heightOffset; + if(type==ImageType::Raster_Image){ + newLayer.image = new IntelliRasterImage(width,height); + }else if(type==ImageType::Shaped_Image){ + newLayer.image = new IntelliShapedImage(width, height); + } + newLayer.alpha = 255; + this->layerStructure.push_back(newLayer); + +} + +void PaintingArea::deleteLayer(int index){ + if(indexlayerStructure.erase(layerStructure.begin()+index); + if(activeLayer>=index){ + activeLayer--; + } + } +} + +void PaintingArea::setLayerToActive(int index) { + if(indexactiveLayer=index; + } +} + +void PaintingArea::setAlphaToLayer(int index, int alpha){ + if(indexactiveLayer==-1){ + return false; + } + IntelliImage* active = layerStructure[activeLayer].image; + bool open = active->loadImage(fileName); + update(); + return open; +} + +// Save the current image +bool PaintingArea::saveImage(const QString &fileName, const char *fileFormat) +{ + if(layerStructure.size()==0){ + return false; + } + this->assembleLayers(true); + + if(!std::strcmp(fileFormat,"PNG")){ + QImage visibleImage = Canvas->convertToFormat(QImage::Format_Indexed8); + fileFormat = "png"; + if (visibleImage.save(fileName, fileFormat)) { + return true; + } else { + return false; + } + } + + + if (Canvas->save(fileName, fileFormat)) { + return true; + } else { + return false; + } +} + +// Used to change the pen color +void PaintingArea::setPenColor(const QColor &newColor) +{ + myPenColor = newColor; +} + +// Used to change the pen width +void PaintingArea::setPenWidth(int newWidth) +{ + myPenWidth = newWidth; +} + +// Color the image area with white +void PaintingArea::clearImage(int r, int g, int b){ + if(this->activeLayer==-1){ + return; + } + IntelliImage* active = layerStructure[activeLayer].image; + active->floodFill(QColor(r, g, b, 255)); + + update(); +} + +void PaintingArea::activate(int a){ + this->setLayerToActive(a); +} + +void PaintingArea::setAlpha(int a){ + if(activeLayer>=0){ + layerStructure[activeLayer].alpha=a; + } +} + +void PaintingArea::getMoveUp(int a){ + layerStructure[activeLayer].heightOffset-=a; +} + +void PaintingArea::getMoveDown(int a){ + layerStructure[activeLayer].heightOffset+=a; +} + +void PaintingArea::getMoveRight(int a){ + layerStructure[activeLayer].widthOffset+=a; +} + +void PaintingArea::getMoveLeft(int a){ + layerStructure[activeLayer].widthOffset-=a; +} + +void PaintingArea::getMoveLayerUp(){ + if(activeLayer=0){ + std::swap(layerStructure[activeLayer], layerStructure[activeLayer+1]); + activeLayer++; + } +} + +void PaintingArea::getMoveLayerDown(){ + if(activeLayer>0){ + std::swap(layerStructure[activeLayer], layerStructure[activeLayer-1]); + activeLayer--; + } +} + +// If a mouse button is pressed check if it was the +// left button and if so store the current position +// Set that we are currently drawing +void PaintingArea::mousePressEvent(QMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) { + if(this->activeLayer==-1){ + return; + } + LayerObject& active = layerStructure[activeLayer]; + + int x = event->x()-active.widthOffset; + int y = event->y()-active.heightOffset; + //TODO CALCULATE LAST POINT + lastPoint=QPoint(x,y); + scribbling = true; + } +} + + +// When the mouse moves if the left button is clicked +// we call the drawline function which draws a line +// from the last position to the current +void PaintingArea::mouseMoveEvent(QMouseEvent *event) +{ + + if ((event->buttons() & Qt::LeftButton) && scribbling){ + if(this->activeLayer==-1){ + return; + } + LayerObject& active = layerStructure[activeLayer]; + + int x = event->x()-active.widthOffset; + int y = event->y()-active.heightOffset; + + //TODO CALCULATE NEW POINT + drawLineTo(QPoint(x,y)); + update(); + } +} + +// If the button is released we set variables to stop drawing +void PaintingArea::mouseReleaseEvent(QMouseEvent *event) +{ + if (event->button() == Qt::LeftButton && scribbling) { + if(this->activeLayer==-1){ + return; + } + LayerObject& active = layerStructure[activeLayer]; + + int x = event->x()-active.widthOffset; + int y = event->y()-active.heightOffset; + + //TODO CALCULATE NEW POINT + drawLineTo(QPoint(x,y)); + update(); + scribbling = false; + } +} + +// QPainter provides functions to draw on the widget +// The QPaintEvent is sent to widgets that need to +// update themselves +void PaintingArea::paintEvent(QPaintEvent *event) +{ + this->assembleLayers(); + + QPainter painter(this); + QRect dirtyRec = event->rect(); + painter.drawImage(dirtyRec, *Canvas, dirtyRec); + update(); +} + +// Resize the image to slightly larger then the main window +// to cut down on the need to resize the image +void PaintingArea::resizeEvent(QResizeEvent *event) +{ + if(this->activeLayer==-1){ + return; + } + LayerObject active = layerStructure[activeLayer]; + + QPainter painter(this); + QRect dirtyRec(QPoint(0,0), event->size()); + painter.drawImage(dirtyRec, active.image->getDisplayable(event->size(), active.alpha), dirtyRec); + update(); +} + +void PaintingArea::drawLineTo(const QPoint &endPoint) +{ + //// Used to draw on the widget + if(this->activeLayer==-1){ + return; + } + LayerObject active = layerStructure[activeLayer]; + + active.image->drawLine(lastPoint, endPoint,myPenColor, myPenWidth); + lastPoint = endPoint; + update(); +} + +void PaintingArea::resizeImage(QImage *image_res, const QSize &newSize){ + image_res->scaled(newSize,Qt::IgnoreAspectRatio); +} + +void PaintingArea::assembleLayers(bool forSaving){ + if(forSaving){ + Canvas->fill(Qt::GlobalColor::transparent); + }else{ + Canvas->fill(Qt::GlobalColor::black); + } + //TODO interpolation of alpha for saving + for(size_t i=0; igetDisplayable(layer.alpha); + QColor clr_0; + QColor clr_1; + for(int y=0; ypixelColor(layer.widthOffset+x, layer.heightOffset+y); + clr_1=cpy.pixelColor(x,y); + float t = (float)clr_1.alpha()/255.f; + int r =(float)clr_1.red()*(t)+(float)clr_0.red()*(1.-t); + int g =(float)clr_1.green()*(t)+(float)clr_0.green()*(1.-t); + int b =(float)clr_1.blue()*(t)+(float)clr_0.blue()*(1.-t); + int a =std::min(clr_0.alpha()+clr_1.alpha(), 255); + clr_0.setRed(r); + clr_0.setGreen(g); + clr_0.setBlue(b); + clr_0.setAlpha(a); + + Canvas->setPixelColor(layer.widthOffset+x, layer.heightOffset+y, clr_0); + } + } + } +} + diff --git a/IntelliPhoto/Painting/Layer/PaintingArea.h b/IntelliPhoto/Painting/Layer/PaintingArea.h new file mode 100644 index 0000000..6346687 --- /dev/null +++ b/IntelliPhoto/Painting/Layer/PaintingArea.h @@ -0,0 +1,110 @@ + +#ifndef PaintingArea_H +#define PaintingArea_H + +#include +#include +#include"Image/IntelliImage.h" +#include +#include +#include + +class PaintingArea : public QWidget +{ + // Declares our class as a QObject which is the base class + // for all Qt objects + // QObjects handle events + Q_OBJECT + +public: + PaintingArea(int maxWidth=1000, int maxHeight=800, QWidget *parent = nullptr); + + // Handles all events + bool openImage(const QString &fileName); + bool saveImage(const QString &fileName, const char *fileFormat); + + void addLayer(int width, int height, int widthOffset=0, int heightOffset=0, ImageType type = ImageType::Raster_Image); + void deleteLayer(int index); + void setLayerToActive(int index); + void setAlphaToLayer(int index, int alpha); + + // Has the image been modified since last save + bool isModified() const { return modified; } + + void setPenColor(const QColor &newColor); + QColor penColor() const { return myPenColor; } + + void setPenWidth(int newWidth); + int penWidth() const { return myPenWidth; } + + + QPixmap getAsPixmap(); +public slots: + + // Events to handle + void clearImage(int r, int g, int b); + void activate(int a); + + void setAlpha(int a); + void getMoveUp(int a); + void getMoveDown(int a); + void getMoveRight(int a); + void getMoveLeft(int a); + void getMoveLayerUp(); + void getMoveLayerDown(); + //void setUp helper for konstruktor + void setUp(int maxWidth, int maxHeight); +protected: + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + + // Updates the painting area where we are painting + void paintEvent(QPaintEvent *event) override; + + // Makes sure the area we are drawing on remains + // as large as the widget + void resizeEvent(QResizeEvent *event) override; + +private: + struct LayerObject{ + IntelliImage* image; + int width; + int height; + int widthOffset; + int heightOffset; + int alpha=255; + }; + + QImage* Canvas; + int maxWidth; + int maxHeight; + + std::vector layerStructure; + int activeLayer=-1; + + void assembleLayers(bool forSaving=false); + + void drawLineTo(const QPoint &endPoint); + void resizeImage(QImage *image_res, const QSize &newSize); + + // Will be marked true or false depending on if + // we have saved after a change + bool modified=false; + + // Marked true or false depending on if the user + // is drawing + bool scribbling; + + // Holds the current pen width & color + int myPenWidth; + QColor myPenColor; + + // Stores the image being drawn + + // Stores the location at the current mouse event + QPoint lastPoint; +}; + +#endif + diff --git a/IntelliPhoto/Painting/main.cpp b/IntelliPhoto/Painting/main.cpp new file mode 100644 index 0000000..6ada0cb --- /dev/null +++ b/IntelliPhoto/Painting/main.cpp @@ -0,0 +1,20 @@ +#include "GUI/IntelliPhotoGui.h" +#include +#include + +int main(int argc, char *argv[]) +{ + // The main application + QApplication app(argc, argv); + + //some nice ass looking comment + // Create and open the main window + IntelliPhotoGui window; + window.show(); + + return app.exec(); +} + + + + diff --git a/icon.png b/icon.png deleted file mode 100644 index 2829667..0000000 Binary files a/icon.png and /dev/null differ diff --git a/icon.svg b/icon.svg deleted file mode 100644 index ab6ba5b..0000000 --- a/icon.svg +++ /dev/null @@ -1,244 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -