From ea8580270f5e1cfb41d83b6df33e1de1e5018d21 Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Fri, 25 Oct 2013 09:53:14 -0400 Subject: [PATCH] fixed #120 --- CMakeLists.txt | 2 +- app/CMakeLists.txt | 2 +- app/OpenBR/CMakeLists.txt | 5 ----- app/OpenBR/OpenBR.cpp | 108 ------------------------------------------------------------------------------------------------------------ app/br-gui/CMakeLists.txt | 5 +++++ app/br-gui/br-gui.cpp | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 115 insertions(+), 115 deletions(-) delete mode 100644 app/OpenBR/CMakeLists.txt delete mode 100644 app/OpenBR/OpenBR.cpp create mode 100644 app/br-gui/CMakeLists.txt create mode 100644 app/br-gui/br-gui.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b6a00a..e66b2f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,7 +142,7 @@ if(CMAKE_HOST_WIN32) if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") endif() - set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\OpenBR.exe") + set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\br-gui.exe") elseif(CMAKE_HOST_APPLE) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/README.md" "README.txt" COPYONLY) set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt") diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index af4aa9b..7b198e4 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -5,4 +5,4 @@ add_subdirectory(br) add_subdirectory(examples) # Build OpenBR GUI application -add_subdirectory(OpenBR) +add_subdirectory(br-gui) diff --git a/app/OpenBR/CMakeLists.txt b/app/OpenBR/CMakeLists.txt deleted file mode 100644 index a9fe331..0000000 --- a/app/OpenBR/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -include_directories(${CMAKE_CURRENT_BINARY_DIR}) -add_executable(OpenBR WIN32 OpenBR.cpp ${BR_RESOURCES}) -qt5_use_modules(OpenBR ${QT_DEPENDENCIES}) -target_link_libraries(OpenBR openbr ${BR_THIRDPARTY_LIBS}) -install(TARGETS OpenBR RUNTIME DESTINATION bin) diff --git a/app/OpenBR/OpenBR.cpp b/app/OpenBR/OpenBR.cpp deleted file mode 100644 index 1de9dec..0000000 --- a/app/OpenBR/OpenBR.cpp +++ /dev/null @@ -1,108 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace br; - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit MainWindow(QWidget *parent = 0) - : QMainWindow(parent) - { - QGridLayout *gridLayout = new QGridLayout(); - TemplateViewer *target = new TemplateViewer(this); - TemplateViewer *query = new TemplateViewer(this); - target->setEditable(false); - query->setEditable(false); - TemplateMetadata *targetMetadata = new TemplateMetadata(this); - TemplateMetadata *queryMetadata = new TemplateMetadata(this); - targetMetadata->addClassifier("GenderClassification"); - targetMetadata->addClassifier("AgeRegression"); - queryMetadata->addClassifier("GenderClassification"); - queryMetadata->addClassifier("AgeRegression"); - Tail *tail = new Tail(this); - gridLayout->addWidget(target, 0, 1, 1, 1); - gridLayout->addWidget(query, 0, 0, 1, 1); - gridLayout->setRowStretch(0, 1); - gridLayout->addWidget(targetMetadata, 1, 1, 1, 1); - gridLayout->addWidget(queryMetadata, 1, 0, 1, 1); - gridLayout->setRowStretch(1, 0); - gridLayout->addWidget(tail, 2, 0, 1, 2); - gridLayout->setRowStretch(2, 0); - - QMenuBar *menuBar = new QMenuBar(); - QMenu *file = new QMenu("File"); - QAction *clear = new QAction("Clear", this); - clear->setShortcut(QKeySequence("Ctrl+C")); - connect(clear, SIGNAL(triggered()), tail, SLOT(clear())); - file->addAction(clear); - Algorithm *algorithm = new Algorithm(); - algorithm->addAlgorithm("FaceRecognition", "Face Recognition"); - algorithm->addAlgorithm("PP5", "PittPatt"); - QMenu *helpMenu = new QMenu("Help"); - QAction *aboutAction = new QAction("About", this); - QAction *contactAction = new QAction("Contact", this); - helpMenu->addAction(aboutAction); - helpMenu->addAction(contactAction); - connect(aboutAction, SIGNAL(triggered()), this, SLOT(about())); - connect(contactAction, SIGNAL(triggered()), this, SLOT(contact())); - menuBar->addMenu(file); - menuBar->addMenu(algorithm); - menuBar->addMenu(helpMenu); - - setGeometry(100, 100, 700, 500); - setMenuBar(menuBar); - setWindowIcon(QIcon(":/openbr.png")); - setWindowTitle("OpenBR"); - setCentralWidget(new QWidget(this)); - centralWidget()->setLayout(gridLayout); - setStatusBar(new Progress(this)); - - connect(target, SIGNAL(newInput(File)), tail, SLOT(setTargetGallery(File))); - connect(query, SIGNAL(newInput(File)), tail, SLOT(setQueryGallery(File))); - connect(tail, SIGNAL(newTargetFile(File)), target, SLOT(setFile(File))); - connect(tail, SIGNAL(newQueryFile(File)), query, SLOT(setFile(File))); - connect(tail, SIGNAL(newTargetFile(File)), targetMetadata, SLOT(setFile(File))); - connect(tail, SIGNAL(newQueryFile(File)), queryMetadata, SLOT(setFile(File))); - } - -private slots: - void about() - { - QMessageBox::about(this, "About", Context::about()); - } - - void contact() - { - QMessageBox::about(this, "Contact", "openbr-dev@googlegroups.com\n\nPlease reach out to us on our public mailing list!"); - } -}; - -int main(int argc, char *argv[]) -{ - QApplication application(argc, argv); - Context::initialize(argc, argv); - Globals->scoreNormalization = false; - - MainWindow mainWindow; - mainWindow.show(); - - const int result = application.exec(); - Context::finalize(); - return result; -} - -#include "OpenBR.moc" diff --git a/app/br-gui/CMakeLists.txt b/app/br-gui/CMakeLists.txt new file mode 100644 index 0000000..757bdd6 --- /dev/null +++ b/app/br-gui/CMakeLists.txt @@ -0,0 +1,5 @@ +include_directories(${CMAKE_CURRENT_BINARY_DIR}) +add_executable(br-gui WIN32 br-gui.cpp ${BR_RESOURCES}) +qt5_use_modules(br-gui ${QT_DEPENDENCIES}) +target_link_libraries(br-gui openbr ${BR_THIRDPARTY_LIBS}) +install(TARGETS br-gui RUNTIME DESTINATION bin) diff --git a/app/br-gui/br-gui.cpp b/app/br-gui/br-gui.cpp new file mode 100644 index 0000000..cfeb059 --- /dev/null +++ b/app/br-gui/br-gui.cpp @@ -0,0 +1,108 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace br; + +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit MainWindow(QWidget *parent = 0) + : QMainWindow(parent) + { + QGridLayout *gridLayout = new QGridLayout(); + TemplateViewer *target = new TemplateViewer(this); + TemplateViewer *query = new TemplateViewer(this); + target->setEditable(false); + query->setEditable(false); + TemplateMetadata *targetMetadata = new TemplateMetadata(this); + TemplateMetadata *queryMetadata = new TemplateMetadata(this); + targetMetadata->addClassifier("GenderClassification"); + targetMetadata->addClassifier("AgeRegression"); + queryMetadata->addClassifier("GenderClassification"); + queryMetadata->addClassifier("AgeRegression"); + Tail *tail = new Tail(this); + gridLayout->addWidget(target, 0, 1, 1, 1); + gridLayout->addWidget(query, 0, 0, 1, 1); + gridLayout->setRowStretch(0, 1); + gridLayout->addWidget(targetMetadata, 1, 1, 1, 1); + gridLayout->addWidget(queryMetadata, 1, 0, 1, 1); + gridLayout->setRowStretch(1, 0); + gridLayout->addWidget(tail, 2, 0, 1, 2); + gridLayout->setRowStretch(2, 0); + + QMenuBar *menuBar = new QMenuBar(); + QMenu *file = new QMenu("File"); + QAction *clear = new QAction("Clear", this); + clear->setShortcut(QKeySequence("Ctrl+C")); + connect(clear, SIGNAL(triggered()), tail, SLOT(clear())); + file->addAction(clear); + Algorithm *algorithm = new Algorithm(); + algorithm->addAlgorithm("FaceRecognition", "Face Recognition"); + algorithm->addAlgorithm("PP5", "PittPatt"); + QMenu *helpMenu = new QMenu("Help"); + QAction *aboutAction = new QAction("About", this); + QAction *contactAction = new QAction("Contact", this); + helpMenu->addAction(aboutAction); + helpMenu->addAction(contactAction); + connect(aboutAction, SIGNAL(triggered()), this, SLOT(about())); + connect(contactAction, SIGNAL(triggered()), this, SLOT(contact())); + menuBar->addMenu(file); + menuBar->addMenu(algorithm); + menuBar->addMenu(helpMenu); + + setGeometry(100, 100, 700, 500); + setMenuBar(menuBar); + setWindowIcon(QIcon(":/openbr.png")); + setWindowTitle("OpenBR"); + setCentralWidget(new QWidget(this)); + centralWidget()->setLayout(gridLayout); + setStatusBar(new Progress(this)); + + connect(target, SIGNAL(newInput(File)), tail, SLOT(setTargetGallery(File))); + connect(query, SIGNAL(newInput(File)), tail, SLOT(setQueryGallery(File))); + connect(tail, SIGNAL(newTargetFile(File)), target, SLOT(setFile(File))); + connect(tail, SIGNAL(newQueryFile(File)), query, SLOT(setFile(File))); + connect(tail, SIGNAL(newTargetFile(File)), targetMetadata, SLOT(setFile(File))); + connect(tail, SIGNAL(newQueryFile(File)), queryMetadata, SLOT(setFile(File))); + } + +private slots: + void about() + { + QMessageBox::about(this, "About", Context::about()); + } + + void contact() + { + QMessageBox::about(this, "Contact", "openbr-dev@googlegroups.com\n\nPlease reach out to us on our public mailing list!"); + } +}; + +int main(int argc, char *argv[]) +{ + QApplication application(argc, argv); + Context::initialize(argc, argv); + Globals->scoreNormalization = false; + + MainWindow mainWindow; + mainWindow.show(); + + const int result = application.exec(); + Context::finalize(); + return result; +} + +#include "br-gui.moc" -- libgit2 0.21.4