diff --git a/CV-Toolbox.pro b/CV-Toolbox.pro index dbf55b9..2ed8809 100644 --- 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 index a0afbab..2a2a90b 100644 --- a/pages/mainwindow.h +++ b/pages/mainwindow.h @@ -2,16 +2,16 @@ #define MAINWINDOW_H #include -#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 diff --git a/pages/filters_page.cpp b/pages/page1.cpp similarity index 99% rename from pages/filters_page.cpp rename to pages/page1.cpp index 4a177da..252b53e 100644 --- a/pages/filters_page.cpp +++ b/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 b/pages/page1.h similarity index 95% rename from pages/filters_page.h rename to pages/page1.h index 408abad..8527401 100644 --- a/pages/filters_page.h +++ b/pages/page1.h @@ -1,5 +1,5 @@ -#ifndef FILTERS_PAGE_H -#define FILTERS_PAGE_H +#ifndef PAGE1_H +#define PAGE1_H #include #include @@ -66,4 +66,4 @@ private slots: }; -#endif // FILTERS_PAGE_H +#endif // PAGE1_H diff --git a/pages/filters_page.ui b/pages/page1.ui similarity index 99% rename from pages/filters_page.ui rename to pages/page1.ui index 8fa4026..9ba77b7 100644 --- a/pages/filters_page.ui +++ b/pages/page1.ui @@ -432,7 +432,7 @@ - Uniform + Uniform222 diff --git a/pages/segmenation_page.cpp b/pages/page10.cpp similarity index 98% rename from pages/segmenation_page.cpp rename to pages/page10.cpp index 9d48307..d63cd90 100644 --- a/pages/segmenation_page.cpp +++ b/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 b/pages/page10.h similarity index 89% rename from pages/segmenation_page.h rename to pages/page10.h index 9f26950..f48aa0f 100644 --- a/pages/segmenation_page.h +++ b/pages/page10.h @@ -1,5 +1,5 @@ -#ifndef SEGMENATION_PAGE_H -#define SEGMENATION_PAGE_H +#ifndef PAGE10_H +#define PAGE10_H #include #include @@ -40,4 +40,4 @@ private slots: void updateImage(); }; -#endif // SEGMENATION_PAGE_H +#endif // PAGE10_H diff --git a/pages/segmenation_page.ui b/pages/page10.ui similarity index 100% rename from pages/segmenation_page.ui rename to pages/page10.ui diff --git a/pages/histogram_page.cpp b/pages/page2.cpp similarity index 99% rename from pages/histogram_page.cpp rename to pages/page2.cpp index 2e535ba..05c7052 100644 --- a/pages/histogram_page.cpp +++ b/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 b/pages/page2.h similarity index 93% rename from pages/histogram_page.h rename to pages/page2.h index 498575f..c818e7f 100644 --- a/pages/histogram_page.h +++ b/pages/page2.h @@ -1,5 +1,5 @@ -#ifndef HISTOGRAM_PAGE_H -#define HISTOGRAM_PAGE_H +#ifndef PAGE2_H +#define PAGE2_H #include #include @@ -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 b/pages/page2.ui similarity index 100% rename from pages/histogram_page.ui rename to pages/page2.ui diff --git a/pages/frequency_page.cpp b/pages/page3.cpp similarity index 99% rename from pages/frequency_page.cpp rename to pages/page3.cpp index fb98c4c..64a2b0e 100644 --- a/pages/frequency_page.cpp +++ b/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 b/pages/page3.h similarity index 90% rename from pages/frequency_page.h rename to pages/page3.h index 972dd40..7f10345 100644 --- a/pages/frequency_page.h +++ b/pages/page3.h @@ -1,5 +1,5 @@ -#ifndef FREQUENCY_PAGE_H -#define FREQUENCY_PAGE_H +#ifndef PAGE3_H +#define PAGE3_H #include #include #include @@ -42,4 +42,4 @@ private slots: cv::Mat high_img; }; -#endif // FREQUENCY_PAGE_H +#endif // PAGE3_H diff --git a/pages/frequency_page.ui b/pages/page3.ui similarity index 100% rename from pages/frequency_page.ui rename to pages/page3.ui diff --git a/pages/hough_page.cpp b/pages/page4.cpp similarity index 99% rename from pages/hough_page.cpp rename to pages/page4.cpp index 18d0285..9b53bf2 100644 --- a/pages/hough_page.cpp +++ b/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 b/pages/page4.h similarity index 91% rename from pages/hough_page.h rename to pages/page4.h index e6ba742..e3f02b1 100644 --- a/pages/hough_page.h +++ b/pages/page4.h @@ -1,5 +1,5 @@ -#ifndef HOUGH_PAGE_H -#define HOUGH_PAGE_H +#ifndef PAGE4_H +#define PAGE4_H #include #include @@ -41,4 +41,4 @@ private slots: Ui::page4 *ui; }; -#endif // HOUGH_PAGE_H +#endif // PAGE4_H diff --git a/pages/hough_page.ui b/pages/page4.ui similarity index 100% rename from pages/hough_page.ui rename to pages/page4.ui diff --git a/pages/contour_page.cpp b/pages/page5.cpp similarity index 98% rename from pages/contour_page.cpp rename to pages/page5.cpp index 7e4e2fe..66137fa 100644 --- a/pages/contour_page.cpp +++ b/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 b/pages/page5.h similarity index 90% rename from pages/contour_page.h rename to pages/page5.h index f8fd28b..589bb67 100644 --- a/pages/contour_page.h +++ b/pages/page5.h @@ -1,5 +1,5 @@ -#ifndef CONTOUR_PAGE_H -#define CONTOUR_PAGE_H +#ifndef PAGE5_H +#define PAGE5_H #include #include "utilities/scene.h" @@ -42,4 +42,4 @@ private slots: }; -#endif // CONTOUR_PAGE_H +#endif // PAGE5_H diff --git a/pages/contour_page.ui b/pages/page5.ui similarity index 100% rename from pages/contour_page.ui rename to pages/page5.ui diff --git a/pages/harris_page.cpp b/pages/page6.cpp similarity index 98% rename from pages/harris_page.cpp rename to pages/page6.cpp index 092cdef..21a1d22 100644 --- a/pages/harris_page.cpp +++ b/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 b/pages/page6.h similarity index 90% rename from pages/harris_page.h rename to pages/page6.h index c29f164..eedab06 100644 --- a/pages/harris_page.h +++ b/pages/page6.h @@ -1,5 +1,5 @@ -#ifndef HARRIS_PAGE_H -#define HARRIS_PAGE_H +#ifndef PAGE6_H +#define PAGE6_H #include #include @@ -41,4 +41,4 @@ private slots: }; -#endif // HARRIS_PAGE_H +#endif // PAGE6_H diff --git a/pages/harris_page.ui b/pages/page6.ui similarity index 100% rename from pages/harris_page.ui rename to pages/page6.ui diff --git a/pages/matching_page.cpp b/pages/page7.cpp similarity index 98% rename from pages/matching_page.cpp rename to pages/page7.cpp index 92eacd1..39901a6 100644 --- a/pages/matching_page.cpp +++ b/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 b/pages/page7.h similarity index 90% rename from pages/matching_page.h rename to pages/page7.h index 3c4b4b2..73ffcf5 100644 --- a/pages/matching_page.h +++ b/pages/page7.h @@ -1,5 +1,5 @@ -#ifndef MATCHING_PAGE_H -#define MATCHING_PAGE_H +#ifndef PAGE7_H +#define PAGE7_H #include #include @@ -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 b/pages/page7.ui similarity index 100% rename from pages/matching_page.ui rename to pages/page7.ui diff --git a/pages/SIFT_page.cpp b/pages/page8.cpp similarity index 99% rename from pages/SIFT_page.cpp rename to pages/page8.cpp index d0411b8..e581f71 100644 --- a/pages/SIFT_page.cpp +++ b/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 b/pages/page8.h similarity index 93% rename from pages/SIFT_page.h rename to pages/page8.h index 5540d21..ded5317 100644 --- a/pages/SIFT_page.h +++ b/pages/page8.h @@ -1,5 +1,5 @@ -#ifndef SIFT_PAGE_H -#define SIFT_PAGE_H +#ifndef PAGE8_H +#define PAGE8_H #include #include @@ -46,4 +46,4 @@ private slots: cv::Mat vectorToMat(const vector>& input); }; -#endif // SIFT_PAGE_H +#endif // PAGE8_H diff --git a/pages/SIFT_page.ui b/pages/page8.ui similarity index 100% rename from pages/SIFT_page.ui rename to pages/page8.ui diff --git a/pages/thresholding_page.cpp b/pages/page9.cpp similarity index 98% rename from pages/thresholding_page.cpp rename to pages/page9.cpp index d3a2c00..33a0e1e 100644 --- a/pages/thresholding_page.cpp +++ b/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 b/pages/page9.h similarity index 90% rename from pages/thresholding_page.h rename to pages/page9.h index b8b3f94..49b2fc4 100644 --- a/pages/thresholding_page.h +++ b/pages/page9.h @@ -1,5 +1,5 @@ -#ifndef THRESHOLDING_PAGE_H -#define THRESHOLDING_PAGE_H +#ifndef PAGE9_H +#define PAGE9_H #include #include @@ -45,4 +45,4 @@ private slots: void updateOutput(); }; -#endif // THRESHOLDING_PAGE_H +#endif // PAGE9_H diff --git a/pages/thresholding_page.ui b/pages/page9.ui similarity index 100% rename from pages/thresholding_page.ui rename to pages/page9.ui