Merge branch 'dev-scrollbar' into dev-history

src/GUI/IntelliPhotoGui.cpp

@@ -20,8 +20,7 @@ IntelliPhotoGui::IntelliPhotoGui(){
 		setIntelliStyle();
 		// Size the app
 		resize(600,600);
-		showMaximized();
-		setDefaultToolValue();
+        setDefaultValues();
 }
 
 // User tried to close the app
@@ -138,6 +137,8 @@ void IntelliPhotoGui::slotChangeDim(){
 
 		int height = IntelliInputDialog::getInt("New Canvas Size", "Height:", 600, 1, 50000, 1, &ok2);
 
+
+
 		// Change dimension
 		if (ok1&&ok2) {
 				paintingArea->setLayerDimensions(width,height);
@@ -594,6 +595,7 @@ void IntelliPhotoGui::createMenus(){
 		layerCreationMenu = new QMenu(tr("&Create new Layer"), this);
 		layerCreationMenu->addAction(actionCreateNewRasterLayer);
 		layerCreationMenu->addAction(actionCreateNewShapedLayer);
+
 		// Attach all actions to Layer
 		layerMenu = new QMenu(tr("&Layer"), this);
 		layerMenu->addMenu(layerCreationMenu);
@@ -672,7 +674,7 @@ void IntelliPhotoGui::createGui(){
 		// create Gui elements
 		// get and set max width and height
 		paintingArea = new PaintingArea(1280, 720);
-		paintingArea->DummyGui = this;
+        paintingArea->guiReference = this;
 
 		preview = QPixmap(":/Icons/Buttons/icons/circle-tool.svg");
 		CircleButton = new QPushButton();
@@ -786,8 +788,14 @@ void IntelliPhotoGui::createGui(){
 		QString String = QString("%1x%2").arg(paintingArea->Canvas->width()).arg(paintingArea->Canvas->height());
 		dimCanvas->setText(String);
 
+        ScrollArea = new QScrollArea(this);
+        ScrollArea->setBackgroundRole(QPalette::Dark);
+        ScrollArea->setWidget(paintingArea);
+        ScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+        ScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+
 		// set gui elements
-		mainLayout->addWidget(paintingArea,1,1,20,1);
+        mainLayout->addWidget(ScrollArea,1,1,20,1);
 		mainLayout->addWidget(CircleButton,1,2,1,1);
 		mainLayout->addWidget(FloodFillButton,1,3,1,1);
 		mainLayout->addWidget(LineButton,2,2,1,1);
@@ -807,6 +815,7 @@ void IntelliPhotoGui::createGui(){
 		mainLayout->addWidget(dimActive,13,2,1,2);
 		mainLayout->addWidget(dimCanvas,14,2,1,2);
 		mainLayout->setHorizontalSpacing(0);
+
 }
 
 void IntelliPhotoGui::setIntelliStyle(){
@@ -871,7 +880,7 @@ bool IntelliPhotoGui::saveFile(const QByteArray &fileFormat){
 		}
 }
 
-void IntelliPhotoGui::setDefaultToolValue(){
+void IntelliPhotoGui::setDefaultValues(){
 		slotEnterPressed();
 }
 
@@ -896,7 +905,9 @@ void IntelliPhotoGui::UpdateGui(){
 				tmp.fill(Qt::transparent);
 				preview = preview.fromImage(tmp);
 		}
-		ActiveLayerImageLabel->setPixmap(preview.scaled(Buttonsize * 2));
+
+
+        ActiveLayerImageLabel->setPixmap(preview.scaled(Buttonsize * 2));
 
 		string = QString("background-color: %1").arg(paintingArea->colorPicker.getFirstColor().name());
 		FirstColorButton->setStyleSheet(string);

src/GUI/IntelliPhotoGui.h

@@ -14,6 +14,7 @@
 #include <QTextEdit>
 #include <QLabel>
 #include <QLineEdit>
+#include <QScrollArea>
 #include "IntelliInputDialog.h"
 #include "IntelliHelper/IntelliDatamanager.h"
 
@@ -100,10 +101,11 @@ void slotGoBack();
 void slotGoForward();
 
 private:
+
+//setup functions for gui
 void createActions();
 void createMenus();
 void createGui();
-// Set the style of the GUI
 void setIntelliStyle();
 
 // Will check if changes have occurred since last save
@@ -111,13 +113,19 @@ bool maybeSave();
 // Opens the Save dialog and saves
 bool saveFile(const QByteArray &fileFormat);
 
-void setDefaultToolValue();
+//basic to set tool values to begin
+void setDefaultValues();
 
 // What we'll draw on
 PaintingArea* paintingArea;
 
-const QSize Buttonsize = QSize(35,35);
+//used to display a preview of the active layer
 QPixmap preview;
+
+//size of all buttons
+const QSize Buttonsize = QSize(35,35);
+
+//buttons used for gui
 QPushButton* CircleButton;
 QPushButton* FloodFillButton;
 QPushButton* LineButton;
@@ -125,35 +133,42 @@ QPushButton* PenButton;
 QPushButton* PlainButton;
 QPushButton* PolygonButton;
 QPushButton* RectangleButton;
-QLabel* WidthLine;
-QLabel* innerAlphaLine;
-QLineEdit* EditLineWidth;
-QLineEdit* EditLineInnerAlpha;
-QIntValidator* ValidatorLineWidth;
-QIntValidator* ValidatorInnerAlpha;
-
 QPushButton* FirstColorButton;
 QPushButton* SecondColorButton;
 QPushButton* SwitchColorButton;
-
-QLabel* ActiveLayerLine;
-QLabel* ActiveLayerImageLabel;
-
 QPushButton* dimActive;
 QPushButton* dimCanvas;
 
+//labels used for gui
+QLabel* WidthLine;
+QLabel* innerAlphaLine;
+QLabel* ActiveLayerLine;
+QLabel* ActiveLayerImageLabel;
+
+//scroll area to display canvas
+QScrollArea* ScrollArea;
+
+//line edits used for gui
+QLineEdit* EditLineWidth;
+QLineEdit* EditLineInnerAlpha;
+
+//int validator used for gui
+QIntValidator* ValidatorLineWidth;
+QIntValidator* ValidatorInnerAlpha;
+
+
 // The menu widgets
-QMenu*saveAsMenu;
-QMenu*fileMenu;
-QMenu*renderMenu;
-QMenu*optionMenu;
-QMenu*layerCreationMenu;
-QMenu*layerMenu;
-QMenu*colorMenu;
-QMenu*toolCreationMenu;
-QMenu*toolSettingsMenu;
-QMenu*toolMenu;
-QMenu*helpMenu;
+QMenu* saveAsMenu;
+QMenu* fileMenu;
+QMenu* renderMenu;
+QMenu* optionMenu;
+QMenu* layerCreationMenu;
+QMenu* layerMenu;
+QMenu* colorMenu;
+QMenu* toolCreationMenu;
+QMenu* toolSettingsMenu;
+QMenu* toolMenu;
+QMenu* helpMenu;
 
 // All the actions that can occur
 // meta image actions (need further modularisation)
@@ -179,7 +194,9 @@ QAction* actionCreatePolygonTool;
 QAction* actionCreateFloodFillTool;
 
 // dimension actions
-QAction*actionChangeDim;
+QAction* actionChangeDim;
+QAction* actionSetWidth;
+QAction* actionSetInnerAlpha;
 
 // dialog actions
 QAction* actionAboutDialog;
@@ -202,8 +219,7 @@ QAction* actionMoveLayerDown;
 // actions tied to specific file formats
 QList<QAction*> actionSaveAs;
 
-QAction* actionSetWidth;
-QAction* actionSetInnerAlpha;
+
 
 // history actions
 QAction* actionGoBack;

src/Layer/PaintingArea.cpp

@@ -37,7 +37,7 @@ LayerObject::LayerObject(const LayerObject& layer){
 }
 
 PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget*parent)
-		: QWidget(parent){
+        : QLabel(parent){
 		this->Tool = nullptr;
 		this->setLayerDimensions(maxWidth, maxHeight);
 
@@ -75,6 +75,9 @@ void PaintingArea::setLayerDimensions(int maxWidth, int maxHeight){
 		this->maxHeight = maxHeight;
 		Canvas = new QImage(maxWidth,maxHeight, QImage::Format_ARGB32);
 
+        this->offsetXDimension = maxWidth/2;
+        this->offsetYDimension = maxHeight/2;
+
 		// Roots the widget to the top left even if resized
 		setAttribute(Qt::WA_StaticContents);
 
@@ -151,7 +154,7 @@ void PaintingArea::setPolygon(int idx){
 						delete this->Tool;
 						this->Tool = new IntelliToolPolygon(this,&colorPicker,&Toolsettings, true);
 						isSettingPolygon = true;
-						this->DummyGui->setToolWidth(5);
+						this->guiReference->setToolWidth(5);
 				}
 		}
 }
@@ -213,7 +216,7 @@ void PaintingArea::moveActiveLayer(int idx){
 		}else if(idx==-1) {
 				this->selectLayerDown();
 		}
-		DummyGui->UpdateGui();
+		guiReference->UpdateGui();
         historyadd();
 }
 
@@ -305,12 +308,12 @@ void PaintingArea::mousePressEvent(QMouseEvent*event){
 		}
 		if(Tool == nullptr)
 				return;
-        int x = event->x() - layerBundle[static_cast<size_t>(activeLayer)].widthOffset;
-        int y = event->y() - layerBundle[static_cast<size_t>(activeLayer)].heightOffset;
+        int x = event->x() - layerBundle[static_cast<size_t>(activeLayer)].widthOffset-offsetXDimension;
+        int y = event->y() - layerBundle[static_cast<size_t>(activeLayer)].heightOffset-offsetYDimension;
 		if(event->button() == Qt::LeftButton) {
-				Tool->onMouseLeftPressed(x, y);
+                Tool->onMouseLeftPressed(x, y);
 		}else if(event->button() == Qt::RightButton) {
-				Tool->onMouseRightPressed(x, y);
+                Tool->onMouseRightPressed(x, y);
 		}
 		update();
 }
@@ -324,8 +327,8 @@ void PaintingArea::mouseMoveEvent(QMouseEvent*event){
 		}
 		if(Tool == nullptr)
 				return;
-        int x = event->x() - layerBundle[static_cast<size_t>(activeLayer)].widthOffset;
-        int y = event->y() - layerBundle[static_cast<size_t>(activeLayer)].heightOffset;
+        int x = event->x() - layerBundle[static_cast<size_t>(activeLayer)].widthOffset-offsetXDimension;
+        int y = event->y() - layerBundle[static_cast<size_t>(activeLayer)].heightOffset-offsetYDimension;
 		Tool->onMouseMoved(x, y);
 		update();
 }
@@ -336,8 +339,8 @@ void PaintingArea::mouseReleaseEvent(QMouseEvent*event){
 				return;
 		if(Tool == nullptr)
 				return;
-        int x = event->x() - layerBundle[static_cast<size_t>(activeLayer)].widthOffset;
-        int y = event->y() - layerBundle[static_cast<size_t>(activeLayer)].heightOffset;
+        int x = event->x() - layerBundle[static_cast<size_t>(activeLayer)].widthOffset-offsetXDimension;
+        int y = event->y() - layerBundle[static_cast<size_t>(activeLayer)].heightOffset-offsetYDimension;
 		if(event->button() == Qt::LeftButton) {
 				Tool->onMouseLeftReleased(x, y);
 		}else if(event->button() == Qt::RightButton) {
@@ -362,11 +365,17 @@ void PaintingArea::wheelEvent(QWheelEvent*event){
 // The QPaintEvent is sent to widgets that need to
 // update themselves
 void PaintingArea::paintEvent(QPaintEvent*event){
+        this->setFixedSize(QSize(maxWidth*2,maxHeight*2));
 		this->drawLayers();
 
-		QPainter painter(this);
-		QRect dirtyRec = event->rect();
-		painter.drawImage(dirtyRec, *Canvas, dirtyRec);
+        QPainter painter(this);
+
+        //insert zoom factor here
+        painter.scale(1,1);
+
+        //calulate image here for scroll
+        //Todo set offset in first to parameters and calulate them into mouse position
+        painter.drawImage(0, 0, *Canvas, -offsetXDimension, -offsetYDimension);
 		update();
 }
 

src/Layer/PaintingArea.h

@@ -7,6 +7,7 @@
 #include <QPoint>
 #include <QWidget>
 #include <QList>
+#include <QLabel>
 #include "Image/IntelliImage.h"
 #include "Image/IntelliRasterImage.h"
 #include "Image/IntelliShapedImage.h"
@@ -53,7 +54,7 @@ struct LayerObject {
 /*!
  * \brief The PaintingArea class manages the methods and stores information about the current painting area, which is the currently opened project
  */
-class PaintingArea : public QWidget
+class PaintingArea : public QLabel
 {
 friend UnitTest;
 // Declares our class as a QObject which is the base class
@@ -250,11 +251,16 @@ void wheelEvent(QWheelEvent*event) override;
 void paintEvent(QPaintEvent*event) override;
 
 private:
+//offset for the displayable
+int offsetXDimension;
+int offsetYDimension;
+
 void selectLayerUp();
 void selectLayerDown();
 IntelliTool* copyActiveTool();
 
 QImage* Canvas;
+QImage ScaledCanvas;
 int maxWidth;
 int maxHeight;
 
@@ -262,7 +268,7 @@ bool isSettingPolygon = false;
 
 IntelliRenderSettings renderSettings;
 IntelliTool* Tool;
-IntelliPhotoGui* DummyGui;
+IntelliPhotoGui* guiReference;
 
 std::vector<LayerObject> layerBundle;
 int activeLayer = -1;

src/Tool/IntelliTool.cpp

@@ -51,7 +51,7 @@ void IntelliTool::onMouseMoved(int x, int y){
 
 void IntelliTool::onWheelScrolled(int value){
 		//if needed for future general tasks implement in here
-		Area->DummyGui->setToolWidth(value + Toolsettings->getLineWidth());
+		Area->guiReference->setToolWidth(value + Toolsettings->getLineWidth());
 }
 
 bool IntelliTool::createToolLayer(){
@@ -89,7 +89,7 @@ void IntelliTool::mergeToolLayer(){
 		if(Canvas->image->getPolygonData().size() > 0) {
 				activeLayer->image->setPolygon(Canvas->image->getPolygonData());
 		}
-		Area->DummyGui->UpdateGui();
+		Area->guiReference->UpdateGui();
         Area->historyadd();
 }