diff --git a/docs/Report 1.pdf b/docs/Report 1.pdf new file mode 100644 index 0000000..406ad6f Binary files /dev/null and b/docs/Report 1.pdf differ diff --git a/docs/Report 2.pdf b/docs/Report 2.pdf new file mode 100644 index 0000000..18d4f59 Binary files /dev/null and b/docs/Report 2.pdf differ diff --git a/docs/Report 3.pdf b/docs/Report 3.pdf new file mode 100644 index 0000000..7f1e4f6 Binary files /dev/null and b/docs/Report 3.pdf differ diff --git a/docs/Report 4.pdf b/docs/Report 4.pdf new file mode 100644 index 0000000..5dd23d6 Binary files /dev/null and b/docs/Report 4.pdf differ diff --git a/pages/mainwindow.cpp b/pages/mainwindow.cpp index 1e3b663..318606e 100644 --- a/pages/mainwindow.cpp +++ b/pages/mainwindow.cpp @@ -27,7 +27,7 @@ MainWindow::MainWindow(QWidget *parent) this->setWindowTitle("CV ToolKit"); ui->stackedWidget->insertWidget(0,new page1()); -// ui->stackedWidget->insertWidget(1,new page2()); + ui->stackedWidget->insertWidget(1,new page2()); ui->stackedWidget->insertWidget(2,new page3()); ui->stackedWidget->insertWidget(3,new page4()); ui->stackedWidget->insertWidget(4,new page5()); @@ -42,9 +42,9 @@ MainWindow::MainWindow(QWidget *parent) connect(ui->pushButton, &QPushButton::clicked, ui->stackedWidget, [=]() { ui->stackedWidget->setCurrentIndex(0); }); -// connect(ui->pushButton_2, &QPushButton::clicked, ui->stackedWidget, [=]() { -// ui->stackedWidget->setCurrentIndex(1); -// }); + connect(ui->pushButton_2, &QPushButton::clicked, ui->stackedWidget, [=]() { + ui->stackedWidget->setCurrentIndex(1); + }); connect(ui->pushButton_3, &QPushButton::clicked, ui->stackedWidget, [=]() { ui->stackedWidget->setCurrentIndex(2); }); diff --git a/pages/mainwindow.h b/pages/mainwindow.h index 2a2a90b..ddf8825 100644 --- a/pages/mainwindow.h +++ b/pages/mainwindow.h @@ -3,7 +3,7 @@ #include #include "pages/page3.h" -//#include "pages/histogram_page.h" +#include "pages/page2.h" #include "pages/page1.h" #include "pages/page6.h" #include "pages/page4.h" diff --git a/pages/page1.ui b/pages/page1.ui index 9ba77b7..8fa4026 100644 --- a/pages/page1.ui +++ b/pages/page1.ui @@ -432,7 +432,7 @@ - Uniform222 + Uniform