After 125 commit 👌

KamelMoohamed · Jan 12, 2022 · 0e9d439 · 0e9d439
1 parent 75115cc
commit 0e9d439
Show file tree

Hide file tree

Showing 32 changed files with 41 additions and 423 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,4 @@ build-Painter-Desktop_Qt_6_2_2_MinGW_64_bit-Debug/debug/commands.o
 build-Painter-Desktop_Qt_6_2_2_MinGW_64_bit-Debug/.qmake.stash
 PaintFigure.pro.user.9daa8a8
 PaintFigure.pro.user.fa82d14
+PaintFigure.pro.user.0d910db
diff --git a/PaintFigure.pro.user b/PaintFigure.pro.user
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 6.0.1, 2022-01-09T23:13:51. -->
+<!-- Written by QtCreator 6.0.1, 2022-01-11T17:13:56. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
-  <value type="QByteArray">{0d910db4-7bb8-48b8-8dc3-42bbd1411033}</value>
+  <value type="QByteArray">{c7d1764a-a256-486e-81e6-f150cd42ba37}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -79,7 +79,7 @@
     <value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
     <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
     <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
-    <value type="int" key="ClangTools.ParallelJobs">4</value>
+    <value type="int" key="ClangTools.ParallelJobs">6</value>
     <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
     <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
     <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
@@ -99,8 +99,8 @@
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\zizo\Downloads\MyGitHub\New folder\build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Debug</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/zizo/Downloads/MyGitHub/New folder/build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\youss\Downloads\paintfigure\build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/youss/Downloads/paintfigure/build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -136,11 +136,10 @@
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
-    <value type="int" key="RunSystemFunction">0</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\zizo\Downloads\MyGitHub\New folder\build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Release</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/zizo/Downloads/MyGitHub/New folder/build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\youss\Downloads\paintfigure\build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/youss/Downloads/paintfigure/build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -180,8 +179,8 @@
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\zizo\Downloads\MyGitHub\New folder\build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Profile</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/zizo/Downloads/MyGitHub/New folder/build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\youss\Downloads\paintfigure\build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/youss/Downloads/paintfigure/build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Profile</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -242,14 +241,14 @@
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">PaintFigure2</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/zizo/Downloads/MyGitHub/CMP2241_F21_Team01/PaintFigure.pro</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/zizo/Downloads/MyGitHub/CMP2241_F21_Team01/PaintFigure.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/CMP2241_F21_Team01/PaintFigure.pro</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">D:/CMP2241_F21_Team01/PaintFigure.pro</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/zizo/Downloads/MyGitHub/New folder/build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Debug</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/youss/Downloads/paintfigure/build-PaintFigure-Desktop_Qt_6_2_2_MinGW_64_bit-Debug</value>
    </valuemap>
    <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>

diff --git a/about.cpp b/about.cpp
@@ -1,6 +1,7 @@
 #include "about.h"
 #include "ui_about.h"
 
+
 about::about(QWidget *parent) :
     QDialog(parent, Qt::FramelessWindowHint | Qt::WindowSystemMenuHint),
     ui(new Ui::about)

diff --git a/about.h b/about.h
@@ -7,6 +7,7 @@ namespace Ui {
 class about;
 }
 
+
 class about : public QDialog
 {
     Q_OBJECT

diff --git a/circle.cpp b/circle.cpp
@@ -2,6 +2,7 @@
 #include <QPainter>
 #include <QtMath>
 
+
 Circle::Circle(QPointF point,QColor color,int LineWeight, QColor fillColor, QObject *parent) :
     Figure(point,parent)
 {

diff --git a/circle.h b/circle.h
@@ -5,6 +5,7 @@
 #include <QGraphicsItem>
 #include "figure.h"
 
+
 class Circle : public Figure
 {
     Q_OBJECT

diff --git a/commands.cpp b/commands.cpp
@@ -3,6 +3,7 @@
 #include "painttable.h"
 
 
+
 AddCommand::AddCommand(PaintScene *scene,Figure* item, QPointF LastPoint,QTableWidget* table,QUndoCommand *parent)
     : QUndoCommand(parent)
 {

diff --git a/commands.h b/commands.h
@@ -6,6 +6,7 @@
 #include "paintscene.h"
 #include <QTableWidget>
 
+
 class AddCommand : public QUndoCommand
 {
 public:

diff --git a/figure.cpp b/figure.cpp
@@ -1,6 +1,7 @@
 #include "figure.h"
 #include <QPainter>
 
+
 // Initializing the shapes counters to 1
 int Figure::rCount = 1;
 int Figure::cCount = 1;

diff --git a/figure.h b/figure.h
@@ -7,6 +7,7 @@
 
 
 
+
 class Figure : public QObject, public QGraphicsItem
 {
     Q_OBJECT

diff --git a/json_utilities.cpp b/json_utilities.cpp
@@ -7,6 +7,7 @@
 #include "painttable.h"
 #include "commands.h"
 
+
 /*
  * ----------------------Save Method----------------------
  * Take the path and the scene then save each figure in

diff --git a/json_utilities.h b/json_utilities.h
@@ -11,6 +11,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 
+
 class json_utilities
 {
 public:

diff --git a/line.cpp b/line.cpp
@@ -1,6 +1,7 @@
 #include "line.h"
 #include <QPainter>
 
+
 Line::Line(QPointF point,QColor color,int LineWeight, QObject *parent) :
     Figure(point,parent)
 {

diff --git a/line.h b/line.h
@@ -5,6 +5,8 @@
 #include <QGraphicsItem>
 #include "figure.h"
 
+
+
 class Line : public Figure
 {
     Q_OBJECT

diff --git a/main.cpp b/main.cpp
@@ -3,6 +3,7 @@
 #include "welcomewindow.h"
 #include "messagedialog.h"
 
+
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);

diff --git a/mainwindow.cpp b/mainwindow.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ namespace Ui { @@
     class about;
     }
     class about : public QDialog
     {
         Q_OBJECT
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,6 +7,7 @@




		class Figure : public QObject, public QGraphicsItem
		{
		Q_OBJECT
Expand Down