From c58e8fcb6fc1065ac05014d14c0ebb2e77898cf4 Mon Sep 17 00:00:00 2001
From: Sonaion <jonas.mucke@web.de>
Date: Thu, 12 Dec 2019 14:08:11 +0100
Subject: [PATCH] ui changes

---
 src/Painting/GUI/IntelliPhotoGui.cpp      | 2 +-
 src/Painting/Image/IntelliShapedImage.cpp | 2 +-
 src/Painting/Image/IntelliShapedImage.h   | 4 ++--
 src/Painting/Tool/IntelliToolLine.cpp     | 9 ++++++++-
 src/Painting/Tool/IntelliToolLine.h       | 3 ++-
 src/Painting/widget.ui                    | 4 ++--
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/Painting/GUI/IntelliPhotoGui.cpp b/src/Painting/GUI/IntelliPhotoGui.cpp
index 1535408..119bbfd 100644
--- a/src/Painting/GUI/IntelliPhotoGui.cpp
+++ b/src/Painting/GUI/IntelliPhotoGui.cpp
@@ -19,7 +19,7 @@ IntelliPhotoGui::IntelliPhotoGui()
     setIntelliStyle();
 
     // Size the app
-    resize(500, 500);
+    showMaximized();
 }
 
 
diff --git a/src/Painting/Image/IntelliShapedImage.cpp b/src/Painting/Image/IntelliShapedImage.cpp
index 67df534..0dbc807 100644
--- a/src/Painting/Image/IntelliShapedImage.cpp
+++ b/src/Painting/Image/IntelliShapedImage.cpp
@@ -5,7 +5,7 @@
 #include<QDebug>
 
 IntelliShapedImage::IntelliShapedImage(int weight, int height)
-    :IntelliImage(weight, height){
+    :IntelliRasterImage(weight, height){
 }
 
 IntelliShapedImage::~IntelliShapedImage(){
diff --git a/src/Painting/Image/IntelliShapedImage.h b/src/Painting/Image/IntelliShapedImage.h
index 2c8c3a3..0a3598e 100644
--- a/src/Painting/Image/IntelliShapedImage.h
+++ b/src/Painting/Image/IntelliShapedImage.h
@@ -1,9 +1,9 @@
 #ifndef INTELLISHAPE_H
 #define INTELLISHAPE_H
 
-#include"Image/IntelliImage.h"
+#include"Image/IntelliRasterImage.h"
 
-class IntelliShapedImage : public IntelliImage{
+class IntelliShapedImage : public IntelliRasterImage{
     friend IntelliTool;
 protected:
 
diff --git a/src/Painting/Tool/IntelliToolLine.cpp b/src/Painting/Tool/IntelliToolLine.cpp
index c1d571d..b3f1bf7 100644
--- a/src/Painting/Tool/IntelliToolLine.cpp
+++ b/src/Painting/Tool/IntelliToolLine.cpp
@@ -40,8 +40,15 @@ void IntelliToolLine::onMouseMoved(int x, int y){
         this->Canvas->image->drawPlain(Qt::transparent);
         QPoint next(x,y);
         switch(lineStyle){
-            case LineStyle::SOLID_LINE :
+            case LineStyle::SOLID_LINE:
                 this->Canvas->image->drawLine(start,next,colorPicker->getFirstColor(),lineWidth);
+                break;
+            case LineStyle::DOTTED_LINE:
+                QPoint p1 =start.x() <= next.x() ? start : next;
+                QPoint p2 =start.x() < next.x() ? next : start;
+                int m = (float)(p2.y()-p1.y())/(float)(p2.x()-p1.x())+0.5f;
+                int c = start.y()-start.x()*m;
+
                 break;
         }
     }
diff --git a/src/Painting/Tool/IntelliToolLine.h b/src/Painting/Tool/IntelliToolLine.h
index 2240dec..637eb73 100644
--- a/src/Painting/Tool/IntelliToolLine.h
+++ b/src/Painting/Tool/IntelliToolLine.h
@@ -6,7 +6,8 @@
 #include "QPoint"
 
 enum class LineStyle{
-    SOLID_LINE
+    SOLID_LINE,
+    DOTTED_LINE
 };
 
 class IntelliToolLine : public IntelliTool
diff --git a/src/Painting/widget.ui b/src/Painting/widget.ui
index b90248d..b1d4c7b 100644
--- a/src/Painting/widget.ui
+++ b/src/Painting/widget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>600</height>
+    <width>360</width>
+    <height>206</height>
    </rect>
   </property>
   <property name="windowTitle">