fix: revert pages renaming

Romaisaa · Sep 18, 2023 · bc2d016 · bc2d016
1 parent 852b0a8
commit bc2d016
Show file tree

Hide file tree

Showing 32 changed files with 88 additions and 88 deletions.
diff --git a/CV-Toolbox.pro b/CV-Toolbox.pro
@@ -23,18 +23,18 @@ SOURCES += \
     Plot/plotter.cpp \
     CV/hough.cpp \
     CV/snake.cpp \
-    pages/SIFT_page.cpp \
-    pages/contour_page.cpp \
-    pages/filters_page.cpp \
-    pages/frequency_page.cpp \
-    pages/harris_page.cpp \
-    pages/histogram_page.cpp \
-    pages/hough_page.cpp \
-    pages/matching_page.cpp \
+    pages/page1.cpp \
+    pages/page10.cpp \
+    pages/page2.cpp \
+    pages/page3.cpp \
+    pages/page4.cpp \
+    pages/page5.cpp \
+    pages/page6.cpp \
+    pages/page7.cpp \
+    pages/page8.cpp \
+    pages/page9.cpp \
     utilities/qcustomplot.cpp \
     pages/page11.cpp \
-    pages/segmenation_page.cpp \
-    pages/thresholding_page.cpp \
     utilities/clickable.cpp \
     utilities/scene.cpp \
     main.cpp \
@@ -55,46 +55,46 @@ HEADERS += \
     Plot/plotter.h \
     CV/hough.h \
     CV/snake.h \
-    pages/SIFT_page.h \
-    pages/contour_page.h \
-    pages/filters_page.h \
-    pages/frequency_page.h \
-    pages/harris_page.h \
-    pages/histogram_page.h \
-    pages/hough_page.h \
-    pages/matching_page.h \
+    pages/page1.h \
+    pages/page10.h \
+    pages/page2.h \
+    pages/page3.h \
+    pages/page4.h \
+    pages/page5.h \
+    pages/page6.h \
+    pages/page7.h \
+    pages/page8.h \
+    pages/page9.h \
     utilities/qcustomplot.h \
     pages/page11.h \
-    pages/segmenation_page.h \
-    pages/thresholding_page.h \
     utilities/clickable.h \
     pages/mainwindow.h \
     utilities/scene.h
 
 FORMS += \
-    pages/SIFT_page.ui \
-    pages/contour_page.ui \
-    pages/filters_page.ui \
-    pages/frequency_page.ui \
-    pages/harris_page.ui \
-    pages/histogram_page.ui \
-    pages/hough_page.ui \
-    pages/matching_page.ui \
     pages/mainwindow.ui \
+    pages/page1.ui \
+    pages/page10.ui \
     pages/page11.ui \
-    pages/segmenation_page.ui \
-    pages/thresholding_page.ui
+    pages/page2.ui \
+    pages/page3.ui \
+    pages/page4.ui \
+    pages/page5.ui \
+    pages/page6.ui \
+    pages/page7.ui \
+    pages/page8.ui \
+    pages/page9.ui
 
 
-INCLUDEPATH += C:\Users\youss\Documents\libraries\opencv\build\include
+INCLUDEPATH += C:\opencv\build\include
 
-LIBS += C:\Users\youss\Documents\libraries\opencv\release\bin\libopencv_core470.dll
-LIBS += C:\Users\youss\Documents\libraries\opencv\release\bin\libopencv_highgui470.dll
-LIBS += C:\Users\youss\Documents\libraries\opencv\release\bin\libopencv_imgcodecs470.dll
-LIBS += C:\Users\youss\Documents\libraries\opencv\release\bin\libopencv_imgproc470.dll
-LIBS += C:\Users\youss\Documents\libraries\opencv\release\bin\libopencv_features2d470.dll
-LIBS += C:\Users\youss\Documents\libraries\opencv\release\bin\libopencv_calib3d470.dll
-LIBS += C:\Users\youss\Documents\libraries\opencv\release\bin\libopencv_objdetect470.dll
+LIBS += C:\opencv\release\bin\libopencv_core470.dll
+LIBS += C:\opencv\release\bin\libopencv_highgui470.dll
+LIBS += C:\opencv\release\bin\libopencv_imgcodecs470.dll
+LIBS += C:\opencv\release\bin\libopencv_imgproc470.dll
+LIBS += C:\opencv\release\bin\libopencv_features2d470.dll
+LIBS += C:\opencv\release\bin\libopencv_calib3d470.dll
+LIBS += C:\opencv\release\bin\libopencv_objdetect470.dll
 
 
 # Default rules for deployment.

diff --git a/pages/mainwindow.h b/pages/mainwindow.h
@@ -2,16 +2,16 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include "pages/frequency_page.h"
+#include "pages/page3.h"
 //#include "pages/histogram_page.h"
-#include "pages/filters_page.h"
-#include "pages/harris_page.h"
-#include "pages/hough_page.h"
-#include "pages/contour_page.h"
-#include "pages/matching_page.h"
-#include "pages/SIFT_page.h"
-#include "pages/thresholding_page.h"
-#include "pages/segmenation_page.h"
+#include "pages/page1.h"
+#include "pages/page6.h"
+#include "pages/page4.h"
+#include "pages/page5.h"
+#include "pages/page7.h"
+#include "pages/page8.h"
+#include "pages/page9.h"
+#include "pages/page10.h"
 #include "pages/page11.h"
 #include "utilities/clickable.h"
 #include <QFile>

diff --git a/pages/filters_page.cpp → pages/page1.cpp b/pages/filters_page.cpp → pages/page1.cpp
@@ -1,4 +1,4 @@
-#include "filters_page.h"
+#include "page1.h"
 #include "ui_page1.h"
 #include "CV/filters.h"
 

diff --git a/pages/filters_page.h → pages/page1.h b/pages/filters_page.h → pages/page1.h
@@ -1,5 +1,5 @@
-#ifndef FILTERS_PAGE_H
-#define FILTERS_PAGE_H
+#ifndef PAGE1_H
+#define PAGE1_H
 
 #include <QWidget>
 #include <QFileDialog>
@@ -66,4 +66,4 @@ private slots:
 
 };
 
-#endif // FILTERS_PAGE_H
+#endif // PAGE1_H
diff --git a/pages/filters_page.ui → pages/page1.ui b/pages/filters_page.ui → pages/page1.ui
@@ -432,7 +432,7 @@
         </property>
         <item>
          <property name="text">
-          <string>Uniform</string>
+          <string>Uniform222</string>
          </property>
         </item>
         <item>

diff --git a/pages/segmenation_page.cpp → pages/page10.cpp b/pages/segmenation_page.cpp → pages/page10.cpp
@@ -1,4 +1,4 @@
-#include "segmenation_page.h"
+#include "page10.h"
 #include "ui_page10.h"
 
 Page10::Page10(QWidget *parent) :

diff --git a/pages/segmenation_page.h → pages/page10.h b/pages/segmenation_page.h → pages/page10.h
@@ -1,5 +1,5 @@
-#ifndef SEGMENATION_PAGE_H
-#define SEGMENATION_PAGE_H
+#ifndef PAGE10_H
+#define PAGE10_H
 
 #include <QWidget>
 #include<CV/segmentation.h>
@@ -40,4 +40,4 @@ private slots:
     void updateImage();
 };
 
-#endif // SEGMENATION_PAGE_H
+#endif // PAGE10_H
diff --git a/pages/segmenation_page.ui → pages/page10.ui b/pages/segmenation_page.ui → pages/page10.ui
diff --git a/pages/histogram_page.cpp → pages/page2.cpp b/pages/histogram_page.cpp → pages/page2.cpp
@@ -1,4 +1,4 @@
-#include "histogram_page.h"
+#include "page2.h"
 #include "ui_page2.h"
 
 page2::page2(QWidget *parent) :

diff --git a/pages/histogram_page.h → pages/page2.h b/pages/histogram_page.h → pages/page2.h
@@ -1,5 +1,5 @@
-#ifndef HISTOGRAM_PAGE_H
-#define HISTOGRAM_PAGE_H
+#ifndef PAGE2_H
+#define PAGE2_H
 
 #include <QWidget>
 #include <QFileDialog>
@@ -60,4 +60,4 @@ private slots:
     void rescaleImg(QLabel* imgSlot, QPixmap& image);
 };
 
-#endif // HISTOGRAM_PAGE_H
+#endif // PAGE2_H
diff --git a/pages/histogram_page.ui → pages/page2.ui b/pages/histogram_page.ui → pages/page2.ui
diff --git a/pages/frequency_page.cpp → pages/page3.cpp b/pages/frequency_page.cpp → pages/page3.cpp
@@ -1,4 +1,4 @@
-#include "frequency_page.h"
+#include "page3.h"
 #include "ui_page3.h"
 
 

diff --git a/pages/frequency_page.h → pages/page3.h b/pages/frequency_page.h → pages/page3.h
@@ -1,5 +1,5 @@
-#ifndef FREQUENCY_PAGE_H
-#define FREQUENCY_PAGE_H
+#ifndef PAGE3_H
+#define PAGE3_H
 #include <CV/frequency.h>
 #include <QFileDialog>
 #include <QPixmap>
@@ -42,4 +42,4 @@ private slots:
     cv::Mat high_img;
 };
 
-#endif // FREQUENCY_PAGE_H
+#endif // PAGE3_H
diff --git a/pages/frequency_page.ui → pages/page3.ui b/pages/frequency_page.ui → pages/page3.ui
diff --git a/pages/hough_page.cpp → pages/page4.cpp b/pages/hough_page.cpp → pages/page4.cpp
@@ -1,4 +1,4 @@
-#include "hough_page.h"
+#include "page4.h"
 #include "ui_page4.h"
 
 page4::page4(QWidget *parent) :

diff --git a/pages/hough_page.h → pages/page4.h b/pages/hough_page.h → pages/page4.h
@@ -1,5 +1,5 @@
-#ifndef HOUGH_PAGE_H
-#define HOUGH_PAGE_H
+#ifndef PAGE4_H
+#define PAGE4_H
 
 #include <QWidget>
 #include <QFileDialog>
@@ -41,4 +41,4 @@ private slots:
     Ui::page4 *ui;
 };
 
-#endif // HOUGH_PAGE_H
+#endif // PAGE4_H
diff --git a/pages/hough_page.ui → pages/page4.ui b/pages/hough_page.ui → pages/page4.ui
diff --git a/pages/contour_page.cpp → pages/page5.cpp b/pages/contour_page.cpp → pages/page5.cpp
@@ -1,4 +1,4 @@
-#include "contour_page.h"
+#include "page5.h"
 #include "ui_page5.h"
 
 page5::page5(QWidget *parent) :

diff --git a/pages/contour_page.h → pages/page5.h b/pages/contour_page.h → pages/page5.h
@@ -1,5 +1,5 @@
-#ifndef CONTOUR_PAGE_H
-#define CONTOUR_PAGE_H
+#ifndef PAGE5_H
+#define PAGE5_H
 
 #include <QWidget>
 #include "utilities/scene.h"
@@ -42,4 +42,4 @@ private slots:
 
 };
 
-#endif // CONTOUR_PAGE_H
+#endif // PAGE5_H
diff --git a/pages/contour_page.ui → pages/page5.ui b/pages/contour_page.ui → pages/page5.ui
diff --git a/pages/harris_page.cpp → pages/page6.cpp b/pages/harris_page.cpp → pages/page6.cpp
@@ -1,4 +1,4 @@
-#include "pages/harris_page.h"
+#include "pages/page6.h"
 #include "ui_page6.h"
 
 Page6::Page6(QWidget *parent) :

diff --git a/pages/harris_page.h → pages/page6.h b/pages/harris_page.h → pages/page6.h
@@ -1,5 +1,5 @@
-#ifndef HARRIS_PAGE_H
-#define HARRIS_PAGE_H
+#ifndef PAGE6_H
+#define PAGE6_H
 
 #include <QWidget>
 #include <opencv2/core.hpp>
@@ -41,4 +41,4 @@ private slots:
 
 };
 
-#endif // HARRIS_PAGE_H
+#endif // PAGE6_H
diff --git a/pages/harris_page.ui → pages/page6.ui b/pages/harris_page.ui → pages/page6.ui
diff --git a/pages/matching_page.cpp → pages/page7.cpp b/pages/matching_page.cpp → pages/page7.cpp
@@ -1,4 +1,4 @@
-#include "matching_page.h"
+#include "page7.h"
 #include "ui_page7.h"
 
 page7::page7(QWidget *parent) :

diff --git a/pages/matching_page.h → pages/page7.h b/pages/matching_page.h → pages/page7.h
@@ -1,5 +1,5 @@
-#ifndef MATCHING_PAGE_H
-#define MATCHING_PAGE_H
+#ifndef PAGE7_H
+#define PAGE7_H
 
 #include <QWidget>
 #include <QFileDialog>
@@ -41,4 +41,4 @@ private slots:
     void uploadImg(cv::Mat img);
 };
 
-#endif // MATCHING_PAGE_H
+#endif // PAGE7_H
diff --git a/pages/matching_page.ui → pages/page7.ui b/pages/matching_page.ui → pages/page7.ui
diff --git a/pages/SIFT_page.cpp → pages/page8.cpp b/pages/SIFT_page.cpp → pages/page8.cpp
@@ -1,4 +1,4 @@
-#include "SIFT_page.h"
+#include "page8.h"
 #include "ui_page8.h"
 
 page8::page8(QWidget *parent) :

diff --git a/pages/SIFT_page.h → pages/page8.h b/pages/SIFT_page.h → pages/page8.h
@@ -1,5 +1,5 @@
-#ifndef SIFT_PAGE_H
-#define SIFT_PAGE_H
+#ifndef PAGE8_H
+#define PAGE8_H
 
 #include <QWidget>
 #include <QFileDialog>
@@ -46,4 +46,4 @@ private slots:
     cv::Mat vectorToMat(const vector<vector<float>>& input);
 };
 
-#endif // SIFT_PAGE_H
+#endif // PAGE8_H
diff --git a/pages/SIFT_page.ui → pages/page8.ui b/pages/SIFT_page.ui → pages/page8.ui
diff --git a/pages/thresholding_page.cpp → pages/page9.cpp b/pages/thresholding_page.cpp → pages/page9.cpp
@@ -1,4 +1,4 @@
-#include "thresholding_page.h"
+#include "page9.h"
 #include "ui_page9.h"
 
 page9::page9(QWidget *parent) :

diff --git a/pages/thresholding_page.h → pages/page9.h b/pages/thresholding_page.h → pages/page9.h
@@ -1,5 +1,5 @@
-#ifndef THRESHOLDING_PAGE_H
-#define THRESHOLDING_PAGE_H
+#ifndef PAGE9_H
+#define PAGE9_H
 
 #include <QWidget>
 #include <QFileDialog>
@@ -45,4 +45,4 @@ private slots:
     void updateOutput();
 };
 
-#endif // THRESHOLDING_PAGE_H
+#endif // PAGE9_H
diff --git a/pages/thresholding_page.ui → pages/page9.ui b/pages/thresholding_page.ui → pages/page9.ui