diff --git a/Richard_photoList/Richard_photoList.pro.user b/Richard_photoList/Richard_photoList.pro.user index dffdd4b..1e971c7 100644 --- a/Richard_photoList/Richard_photoList.pro.user +++ b/Richard_photoList/Richard_photoList.pro.user @@ -1,267 +1,255 @@ - - - - - - EnvironmentId - {db3e1557-086a-4178-9b2c-c4af1acd9f93} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.3 clang 64bit - Desktop Qt 5.3 clang 64bit - qt.53.clang_64_kit - 0 - 0 - 0 - - /Users/richardyu/Dropbox/build-Richard_photoList-Desktop_Qt_5_3_clang_64bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /Users/richardyu/Dropbox/build-Richard_photoList-Desktop_Qt_5_3_clang_64bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Richard_photoList - Richard_photoList2 - Qt4ProjectManager.Qt4RunConfiguration:/Users/richardyu/Documents/groundstation/Richard_photoList/Richard_photoList.pro - - Richard_photoList.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 16 - - - Version - 16 - - + + + + + + EnvironmentId + {f0de3c19-7390-432f-8215-71267a77c807} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.3 MSVC2010 OpenGL 32bit + Desktop Qt 5.3 MSVC2010 OpenGL 32bit + qt.53.win32_msvc2010_opengl_kit + 0 + 0 + 0 + + C:/Jesse/groundstation/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Jesse/groundstation/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Richard_photoList + + Qt4ProjectManager.Qt4RunConfiguration:C:/Jesse/groundstation/Richard_photoList/Richard_photoList.pro + + Richard_photoList.pro + false + false + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 16 + + + Version + 16 + + diff --git a/Richard_photoList/mainwindow.cpp b/Richard_photoList/mainwindow.cpp index 89ed9d6..f5c87fc 100644 --- a/Richard_photoList/mainwindow.cpp +++ b/Richard_photoList/mainwindow.cpp @@ -66,7 +66,7 @@ MainWindow::MainWindow(QWidget *parent) : // fileinfo contains the path of every image QFileInfo fileinfo = fileInfoList->at(listCount); - auto int index = k*columns + j; + /*auto*/ int index = k*columns + j; imageLabel[index] = new Label(); imageName[index] = new Label(); imageMap[index] = new QPixmap(fileinfo.absoluteFilePath()); @@ -199,7 +199,7 @@ void MainWindow::addImage() { // fileinfo contains the path of every image QFileInfo fileinfo = fileInfoList->at(listCount); - auto int index = k*columns + j; + /*auto*/ int index = k*columns + j; imageLabel[index] = new Label(); imageName[index] = new Label(); imageMap[index] = new QPixmap(fileinfo.absoluteFilePath()); diff --git a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.exe b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.exe index e5ebf06..1c1b860 100644 Binary files a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.exe and b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.exe differ diff --git a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.exe.embed.manifest b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.exe.embed.manifest index 27087c6..85f7af8 100644 --- a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.exe.embed.manifest +++ b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.exe.embed.manifest @@ -1,15 +1,15 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.exe_manifest.rc b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.exe_manifest.rc index b7090f8..913dcd3 100644 --- a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.exe_manifest.rc +++ b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.exe_manifest.rc @@ -1 +1 @@ -1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ "debug\\Richard_photoList.exe.embed.manifest" +1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ "debug\\Richard_photoList.exe.embed.manifest" diff --git a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.ilk b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.ilk index c2f1a89..acbb388 100644 Binary files a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.ilk and b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/Richard_photoList.ilk differ diff --git a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/main.obj b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/main.obj index 8a0c7de..c352dd2 100644 Binary files a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/main.obj and b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/main.obj differ diff --git a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainwindow.obj b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainwindow.obj index 5f9ad41..e998b35 100644 Binary files a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainwindow.obj and b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainwindow.obj differ diff --git a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.cpp b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.cpp index 37d5e3d..f6a0ddc 100644 --- a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.cpp +++ b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.cpp @@ -1,114 +1,127 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'mainwindow.h' -** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.3.2) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "../../Richard_photoList/mainwindow.h" -#include -#include -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'mainwindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.3.2. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -struct qt_meta_stringdata_MainWindow_t { - QByteArrayData data[4]; - char stringdata[56]; -}; -#define QT_MOC_LITERAL(idx, ofs, len) \ - Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ - qptrdiff(offsetof(qt_meta_stringdata_MainWindow_t, stringdata) + ofs \ - - idx * sizeof(QByteArrayData)) \ - ) -static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = { - { -QT_MOC_LITERAL(0, 0, 10), -QT_MOC_LITERAL(1, 11, 21), -QT_MOC_LITERAL(2, 33, 0), -QT_MOC_LITERAL(3, 34, 21) - }, - "MainWindow\0on_hideImage_released\0\0" - "on_showImage_released" -}; -#undef QT_MOC_LITERAL - -static const uint qt_meta_data_MainWindow[] = { - - // content: - 7, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: name, argc, parameters, tag, flags - 1, 0, 24, 2, 0x08 /* Private */, - 3, 0, 25, 2, 0x08 /* Private */, - - // slots: parameters - QMetaType::Void, - QMetaType::Void, - - 0 // eod -}; - -void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - MainWindow *_t = static_cast(_o); - switch (_id) { - case 0: _t->on_hideImage_released(); break; - case 1: _t->on_showImage_released(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObject MainWindow::staticMetaObject = { - { &QMainWindow::staticMetaObject, qt_meta_stringdata_MainWindow.data, - qt_meta_data_MainWindow, qt_static_metacall, 0, 0} -}; - - -const QMetaObject *MainWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; -} - -void *MainWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_MainWindow.stringdata)) - return static_cast(const_cast< MainWindow*>(this)); - return QMainWindow::qt_metacast(_clname); -} - -int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QMainWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 2) - *reinterpret_cast(_a[0]) = -1; - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE +/**************************************************************************** +** Meta object code from reading C++ file 'mainwindow.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.3.2) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "../../Richard_photoList/mainwindow.h" +#include +#include +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'mainwindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.3.2. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +struct qt_meta_stringdata_MainWindow_t { + QByteArrayData data[7]; + char stringdata[94]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_MainWindow_t, stringdata) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = { + { +QT_MOC_LITERAL(0, 0, 10), +QT_MOC_LITERAL(1, 11, 21), +QT_MOC_LITERAL(2, 33, 0), +QT_MOC_LITERAL(3, 34, 21), +QT_MOC_LITERAL(4, 56, 17), +QT_MOC_LITERAL(5, 74, 9), +QT_MOC_LITERAL(6, 84, 9) + }, + "MainWindow\0on_hideImage_released\0\0" + "on_showImage_released\0on_hello_released\0" + "onAction2\0onAction1" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_MainWindow[] = { + + // content: + 7, // revision + 0, // classname + 0, 0, // classinfo + 5, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: name, argc, parameters, tag, flags + 1, 0, 39, 2, 0x08 /* Private */, + 3, 0, 40, 2, 0x08 /* Private */, + 4, 0, 41, 2, 0x08 /* Private */, + 5, 0, 42, 2, 0x08 /* Private */, + 6, 0, 43, 2, 0x08 /* Private */, + + // slots: parameters + QMetaType::Void, + QMetaType::Void, + QMetaType::Void, + QMetaType::Void, + QMetaType::Void, + + 0 // eod +}; + +void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + MainWindow *_t = static_cast(_o); + switch (_id) { + case 0: _t->on_hideImage_released(); break; + case 1: _t->on_showImage_released(); break; + case 2: _t->on_hello_released(); break; + case 3: _t->onAction2(); break; + case 4: _t->onAction1(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObject MainWindow::staticMetaObject = { + { &QMainWindow::staticMetaObject, qt_meta_stringdata_MainWindow.data, + qt_meta_data_MainWindow, qt_static_metacall, 0, 0} +}; + + +const QMetaObject *MainWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *MainWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_MainWindow.stringdata)) + return static_cast(const_cast< MainWindow*>(this)); + return QMainWindow::qt_metacast(_clname); +} + +int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QMainWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 5) + qt_static_metacall(this, _c, _id, _a); + _id -= 5; + } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { + if (_id < 5) + *reinterpret_cast(_a[0]) = -1; + _id -= 5; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.obj b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.obj index c393f8d..3df2343 100644 Binary files a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.obj and b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.obj differ diff --git a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/richard_photolist.pdb b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/richard_photolist.pdb index 34745f9..490d2ef 100644 Binary files a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/richard_photolist.pdb and b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/richard_photolist.pdb differ diff --git a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_mainwindow.h b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_mainwindow.h index fa77f3a..9310203 100644 --- a/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_mainwindow.h +++ b/build-Richard_photoList-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_mainwindow.h @@ -1,83 +1,100 @@ -/******************************************************************************** -** Form generated from reading UI file 'mainwindow.ui' -** -** Created by: Qt User Interface Compiler version 5.3.2 -** -** WARNING! All changes made in this file will be lost when recompiling UI file! -********************************************************************************/ - -#ifndef UI_MAINWINDOW_H -#define UI_MAINWINDOW_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Ui_MainWindow -{ -public: - QWidget *centralWidget; - QPushButton *hideImage; - QPushButton *showImage; - QMenuBar *menuBar; - QToolBar *mainToolBar; - QStatusBar *statusBar; - - void setupUi(QMainWindow *MainWindow) - { - if (MainWindow->objectName().isEmpty()) - MainWindow->setObjectName(QStringLiteral("MainWindow")); - MainWindow->resize(400, 300); - centralWidget = new QWidget(MainWindow); - centralWidget->setObjectName(QStringLiteral("centralWidget")); - hideImage = new QPushButton(centralWidget); - hideImage->setObjectName(QStringLiteral("hideImage")); - hideImage->setGeometry(QRect(20, 10, 113, 32)); - hideImage->setMaximumSize(QSize(300, 50)); - showImage = new QPushButton(centralWidget); - showImage->setObjectName(QStringLiteral("showImage")); - showImage->setGeometry(QRect(80, 50, 113, 32)); - showImage->setMaximumSize(QSize(300, 50)); - MainWindow->setCentralWidget(centralWidget); - menuBar = new QMenuBar(MainWindow); - menuBar->setObjectName(QStringLiteral("menuBar")); - menuBar->setGeometry(QRect(0, 0, 400, 22)); - MainWindow->setMenuBar(menuBar); - mainToolBar = new QToolBar(MainWindow); - mainToolBar->setObjectName(QStringLiteral("mainToolBar")); - MainWindow->addToolBar(Qt::TopToolBarArea, mainToolBar); - statusBar = new QStatusBar(MainWindow); - statusBar->setObjectName(QStringLiteral("statusBar")); - MainWindow->setStatusBar(statusBar); - - retranslateUi(MainWindow); - - QMetaObject::connectSlotsByName(MainWindow); - } // setupUi - - void retranslateUi(QMainWindow *MainWindow) - { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0)); - hideImage->setText(QApplication::translate("MainWindow", "Hide Image", 0)); - showImage->setText(QApplication::translate("MainWindow", "Show Image", 0)); - } // retranslateUi - -}; - -namespace Ui { - class MainWindow: public Ui_MainWindow {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_MAINWINDOW_H +/******************************************************************************** +** Form generated from reading UI file 'mainwindow.ui' +** +** Created by: Qt User Interface Compiler version 5.3.2 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_MAINWINDOW_H +#define UI_MAINWINDOW_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class Ui_MainWindow +{ +public: + QWidget *centralWidget; + QPushButton *hideImage; + QPushButton *showImage; + QPushButton *deleteImage; + QPushButton *renameImage; + QPushButton *hello; + QMenuBar *menuBar; + QToolBar *mainToolBar; + QStatusBar *statusBar; + + void setupUi(QMainWindow *MainWindow) + { + if (MainWindow->objectName().isEmpty()) + MainWindow->setObjectName(QStringLiteral("MainWindow")); + MainWindow->resize(400, 300); + centralWidget = new QWidget(MainWindow); + centralWidget->setObjectName(QStringLiteral("centralWidget")); + hideImage = new QPushButton(centralWidget); + hideImage->setObjectName(QStringLiteral("hideImage")); + hideImage->setGeometry(QRect(20, 20, 113, 32)); + hideImage->setMaximumSize(QSize(300, 50)); + showImage = new QPushButton(centralWidget); + showImage->setObjectName(QStringLiteral("showImage")); + showImage->setGeometry(QRect(140, 40, 113, 32)); + showImage->setMaximumSize(QSize(300, 50)); + deleteImage = new QPushButton(centralWidget); + deleteImage->setObjectName(QStringLiteral("deleteImage")); + deleteImage->setGeometry(QRect(260, 20, 113, 32)); + deleteImage->setMaximumSize(QSize(300, 50)); + renameImage = new QPushButton(centralWidget); + renameImage->setObjectName(QStringLiteral("renameImage")); + renameImage->setGeometry(QRect(120, 90, 113, 32)); + renameImage->setMaximumSize(QSize(300, 50)); + hello = new QPushButton(centralWidget); + hello->setObjectName(QStringLiteral("hello")); + hello->setGeometry(QRect(160, 150, 113, 32)); + MainWindow->setCentralWidget(centralWidget); + menuBar = new QMenuBar(MainWindow); + menuBar->setObjectName(QStringLiteral("menuBar")); + menuBar->setGeometry(QRect(0, 0, 400, 22)); + MainWindow->setMenuBar(menuBar); + mainToolBar = new QToolBar(MainWindow); + mainToolBar->setObjectName(QStringLiteral("mainToolBar")); + MainWindow->addToolBar(Qt::TopToolBarArea, mainToolBar); + statusBar = new QStatusBar(MainWindow); + statusBar->setObjectName(QStringLiteral("statusBar")); + MainWindow->setStatusBar(statusBar); + + retranslateUi(MainWindow); + + QMetaObject::connectSlotsByName(MainWindow); + } // setupUi + + void retranslateUi(QMainWindow *MainWindow) + { + MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0)); + hideImage->setText(QApplication::translate("MainWindow", "Hide Image", 0)); + showImage->setText(QApplication::translate("MainWindow", "Show Image", 0)); + deleteImage->setText(QApplication::translate("MainWindow", "Delete", 0)); + renameImage->setText(QApplication::translate("MainWindow", "Rename", 0)); + hello->setText(QApplication::translate("MainWindow", "Hello", 0)); + } // retranslateUi + +}; + +namespace Ui { + class MainWindow: public Ui_MainWindow {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_MAINWINDOW_H diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/Makefile.Debug b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/Makefile.Debug index ac5e47c..587df33 100644 --- a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/Makefile.Debug +++ b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/Makefile.Debug @@ -498,6 +498,11 @@ debug\moc_mainwindow.cpp: ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMai ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qtimezone.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qxmlstream.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qtcoreversion.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMenuBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenubar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenu.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ ..\groundstation\targetlist\targlistmainwindow.h \ ..\groundstation\targetlist\targetmaker.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QDialog \ @@ -506,8 +511,6 @@ debug\moc_mainwindow.cpp: ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMai ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QTableWidgetItem \ ..\groundstation\targetlist\ui_targlistmainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QAction \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QApplication \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qapplication.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qdesktopwidget.h \ @@ -522,6 +525,7 @@ debug\moc_mainwindow.cpp: ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMai ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QToolBar \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtoolbar.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QVBoxLayout \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QtAlgorithms \ ..\groundstation\mainwindow.h C:\Qt\5.3\msvc2010_opengl\bin\moc.exe $(DEFINES) -D_MSC_VER=1600 -D_WIN32 -IC:/Qt/5.3/msvc2010_opengl/mkspecs/win32-msvc2010 -IC:/Jesse/groundstation/groundstation -IC:/Jesse/groundstation/groundstation/targetlist -IC:/Qt/5.3/msvc2010_opengl/include -IC:/Qt/5.3/msvc2010_opengl/include/QtWidgets -IC:/Qt/5.3/msvc2010_opengl/include/QtGui -IC:/Qt/5.3/msvc2010_opengl/include/QtCore -I. ..\groundstation\mainwindow.h -o debug\moc_mainwindow.cpp @@ -1032,6 +1036,39 @@ debug\moc_targlistmainwindow.cpp: ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidg ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QLabel \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qlabel.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QWidget \ + ..\groundstation\targetlist\ui_targlistmainwindow.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QVariant \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QAction \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QApplication \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qapplication.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qcoreapplication.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qeventloop.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qdesktopwidget.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtGui\qguiapplication.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtGui\qinputmethod.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QButtonGroup \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qbuttongroup.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QCommandLinkButton \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qcommandlinkbutton.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qpushbutton.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qabstractbutton.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QHBoxLayout \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qboxlayout.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qlayout.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qlayoutitem.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qgridlayout.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QHeaderView \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qheaderview.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QStatusBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qstatusbar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QTableWidget \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QToolBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtoolbar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QVBoxLayout \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QtAlgorithms \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QDebug \ ..\groundstation\targetlist\targlistmainwindow.h C:\Qt\5.3\msvc2010_opengl\bin\moc.exe $(DEFINES) -D_MSC_VER=1600 -D_WIN32 -IC:/Qt/5.3/msvc2010_opengl/mkspecs/win32-msvc2010 -IC:/Jesse/groundstation/groundstation -IC:/Jesse/groundstation/groundstation/targetlist -IC:/Qt/5.3/msvc2010_opengl/include -IC:/Qt/5.3/msvc2010_opengl/include/QtWidgets -IC:/Qt/5.3/msvc2010_opengl/include/QtGui -IC:/Qt/5.3/msvc2010_opengl/include/QtCore -I. ..\groundstation\targetlist\targlistmainwindow.h -o debug\moc_targlistmainwindow.cpp @@ -1325,6 +1362,11 @@ debug\main.obj: ..\groundstation\main.cpp ..\groundstation\mainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qtimezone.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qxmlstream.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qtcoreversion.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMenuBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenubar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenu.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ ..\groundstation\targetlist\targlistmainwindow.h \ ..\groundstation\targetlist\targetmaker.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QDialog \ @@ -1333,8 +1375,6 @@ debug\main.obj: ..\groundstation\main.cpp ..\groundstation\mainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QTableWidgetItem \ ..\groundstation\targetlist\ui_targlistmainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QAction \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QApplication \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qapplication.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qdesktopwidget.h \ @@ -1348,7 +1388,8 @@ debug\main.obj: ..\groundstation\main.cpp ..\groundstation\mainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qstatusbar.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QToolBar \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtoolbar.h \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QVBoxLayout + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QVBoxLayout \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QtAlgorithms debug\mainwindow.obj: ..\groundstation\mainwindow.cpp ..\groundstation\mainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMainWindow \ @@ -1614,6 +1655,11 @@ debug\mainwindow.obj: ..\groundstation\mainwindow.cpp ..\groundstation\mainwindo ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qtimezone.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qxmlstream.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qtcoreversion.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMenuBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenubar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenu.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ ..\groundstation\targetlist\targlistmainwindow.h \ ..\groundstation\targetlist\targetmaker.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QDialog \ @@ -1622,8 +1668,6 @@ debug\mainwindow.obj: ..\groundstation\mainwindow.cpp ..\groundstation\mainwindo ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QTableWidgetItem \ ..\groundstation\targetlist\ui_targlistmainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QAction \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QApplication \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qapplication.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qdesktopwidget.h \ @@ -1638,10 +1682,8 @@ debug\mainwindow.obj: ..\groundstation\mainwindow.cpp ..\groundstation\mainwindo ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QToolBar \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtoolbar.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QVBoxLayout \ - ui_mainwindow.h \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMenuBar \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenubar.h \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenu.h + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QtAlgorithms \ + ui_mainwindow.h debug\mainpicdisplay.obj: ..\groundstation\mainpic\mainpicdisplay.cpp ..\groundstation\mainpic\MainPicDisplay.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QLabel \ @@ -2518,6 +2560,17 @@ debug\targetmaker.obj: ..\groundstation\targetlist\targetmaker.cpp ..\groundstat ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtablewidget.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtableview.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QWidget \ + ..\groundstation\targetlist\ui_targlistmainwindow.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QCommandLinkButton \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qcommandlinkbutton.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qpushbutton.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QStatusBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qstatusbar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QTableWidget \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QToolBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtoolbar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QtAlgorithms \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QDebug \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QFileDialog \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qfiledialog.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qdir.h \ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/Makefile.Release b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/Makefile.Release index 22596a2..a0c5794 100644 --- a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/Makefile.Release +++ b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/Makefile.Release @@ -486,6 +486,11 @@ release\moc_mainwindow.cpp: ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QM ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qtimezone.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qxmlstream.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qtcoreversion.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMenuBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenubar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenu.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ ..\groundstation\targetlist\targlistmainwindow.h \ ..\groundstation\targetlist\targetmaker.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QDialog \ @@ -494,8 +499,6 @@ release\moc_mainwindow.cpp: ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QM ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QTableWidgetItem \ ..\groundstation\targetlist\ui_targlistmainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QAction \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QApplication \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qapplication.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qdesktopwidget.h \ @@ -510,6 +513,7 @@ release\moc_mainwindow.cpp: ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QM ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QToolBar \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtoolbar.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QVBoxLayout \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QtAlgorithms \ ..\groundstation\mainwindow.h C:\Qt\5.3\msvc2010_opengl\bin\moc.exe $(DEFINES) -D_MSC_VER=1600 -D_WIN32 -IC:/Qt/5.3/msvc2010_opengl/mkspecs/win32-msvc2010 -IC:/Jesse/groundstation/groundstation -IC:/Jesse/groundstation/groundstation/targetlist -IC:/Qt/5.3/msvc2010_opengl/include -IC:/Qt/5.3/msvc2010_opengl/include/QtWidgets -IC:/Qt/5.3/msvc2010_opengl/include/QtGui -IC:/Qt/5.3/msvc2010_opengl/include/QtCore -I. ..\groundstation\mainwindow.h -o release\moc_mainwindow.cpp @@ -1020,6 +1024,39 @@ release\moc_targlistmainwindow.cpp: ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWi ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QLabel \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qlabel.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QWidget \ + ..\groundstation\targetlist\ui_targlistmainwindow.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QVariant \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QAction \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QApplication \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qapplication.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qcoreapplication.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qeventloop.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qdesktopwidget.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtGui\qguiapplication.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtGui\qinputmethod.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QButtonGroup \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qbuttongroup.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QCommandLinkButton \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qcommandlinkbutton.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qpushbutton.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qabstractbutton.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QHBoxLayout \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qboxlayout.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qlayout.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qlayoutitem.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qgridlayout.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QHeaderView \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qheaderview.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QStatusBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qstatusbar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QTableWidget \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QToolBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtoolbar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QVBoxLayout \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QtAlgorithms \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QDebug \ ..\groundstation\targetlist\targlistmainwindow.h C:\Qt\5.3\msvc2010_opengl\bin\moc.exe $(DEFINES) -D_MSC_VER=1600 -D_WIN32 -IC:/Qt/5.3/msvc2010_opengl/mkspecs/win32-msvc2010 -IC:/Jesse/groundstation/groundstation -IC:/Jesse/groundstation/groundstation/targetlist -IC:/Qt/5.3/msvc2010_opengl/include -IC:/Qt/5.3/msvc2010_opengl/include/QtWidgets -IC:/Qt/5.3/msvc2010_opengl/include/QtGui -IC:/Qt/5.3/msvc2010_opengl/include/QtCore -I. ..\groundstation\targetlist\targlistmainwindow.h -o release\moc_targlistmainwindow.cpp @@ -1313,6 +1350,11 @@ release\main.obj: ..\groundstation\main.cpp ..\groundstation\mainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qtimezone.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qxmlstream.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qtcoreversion.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMenuBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenubar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenu.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ ..\groundstation\targetlist\targlistmainwindow.h \ ..\groundstation\targetlist\targetmaker.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QDialog \ @@ -1321,8 +1363,6 @@ release\main.obj: ..\groundstation\main.cpp ..\groundstation\mainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QTableWidgetItem \ ..\groundstation\targetlist\ui_targlistmainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QAction \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QApplication \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qapplication.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qdesktopwidget.h \ @@ -1336,7 +1376,8 @@ release\main.obj: ..\groundstation\main.cpp ..\groundstation\mainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qstatusbar.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QToolBar \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtoolbar.h \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QVBoxLayout + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QVBoxLayout \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QtAlgorithms release\mainwindow.obj: ..\groundstation\mainwindow.cpp ..\groundstation\mainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMainWindow \ @@ -1602,6 +1643,11 @@ release\mainwindow.obj: ..\groundstation\mainwindow.cpp ..\groundstation\mainwin ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qtimezone.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qxmlstream.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qtcoreversion.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMenuBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenubar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenu.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ ..\groundstation\targetlist\targlistmainwindow.h \ ..\groundstation\targetlist\targetmaker.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QDialog \ @@ -1610,8 +1656,6 @@ release\mainwindow.obj: ..\groundstation\mainwindow.cpp ..\groundstation\mainwin ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QTableWidgetItem \ ..\groundstation\targetlist\ui_targlistmainwindow.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QAction \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qaction.h \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qactiongroup.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QApplication \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qapplication.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qdesktopwidget.h \ @@ -1626,10 +1670,8 @@ release\mainwindow.obj: ..\groundstation\mainwindow.cpp ..\groundstation\mainwin ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QToolBar \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtoolbar.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QVBoxLayout \ - ui_mainwindow.h \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QMenuBar \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenubar.h \ - ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qmenu.h + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QtAlgorithms \ + ui_mainwindow.h release\mainpicdisplay.obj: ..\groundstation\mainpic\mainpicdisplay.cpp ..\groundstation\mainpic\MainPicDisplay.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QLabel \ @@ -2506,6 +2548,17 @@ release\targetmaker.obj: ..\groundstation\targetlist\targetmaker.cpp ..\groundst ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtablewidget.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtableview.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QWidget \ + ..\groundstation\targetlist\ui_targlistmainwindow.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QCommandLinkButton \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qcommandlinkbutton.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qpushbutton.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QStatusBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qstatusbar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QTableWidget \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QToolBar \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qtoolbar.h \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QtAlgorithms \ + ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\QDebug \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\QFileDialog \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtWidgets\qfiledialog.h \ ..\..\..\Qt\5.3\msvc2010_opengl\include\QtCore\qdir.h \ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.exe b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.exe index 4e0374e..ed60fae 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.exe and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.exe differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.ilk b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.ilk index 49acf56..18d7279 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.ilk and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.ilk differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.pdb b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.pdb index ff344f8..1608c46 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.pdb and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.pdb differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/main.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/main.obj index 1b69ce6..716fe47 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/main.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/main.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainpicdisplay.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainpicdisplay.obj index a4fd75b..9876db4 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainpicdisplay.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainpicdisplay.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainpicwidget.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainpicwidget.obj index 6ac5e50..f84cb38 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainpicwidget.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainpicwidget.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainwindow.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainwindow.obj index b60c071..678a82c 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainwindow.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainwindow.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainpicdisplay.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainpicdisplay.obj index f69926c..421ca4b 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainpicdisplay.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainpicdisplay.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainpicwidget.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainpicwidget.obj index 35e63c4..9d8f932 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainpicwidget.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainpicwidget.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.obj index baa86c9..3d21718 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_targetmaker.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_targetmaker.obj index c66ad85..e85f08d 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_targetmaker.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_targetmaker.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_targlistmainwindow.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_targlistmainwindow.obj index 8a04b17..17cb98f 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_targlistmainwindow.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_targlistmainwindow.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/target.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/target.obj index b680c4f..8e4d052 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/target.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/target.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetfilehandler.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetfilehandler.obj index 621c04a..564d28b 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetfilehandler.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetfilehandler.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetlist.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetlist.obj index 7d4689e..e28f2ae 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetlist.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetlist.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetlistitem.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetlistitem.obj index 4f8db38..ad35a91 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetlistitem.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetlistitem.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetmaker.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetmaker.obj index bab0ae5..1625d1f 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetmaker.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targetmaker.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targlistmainwindow.obj b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targlistmainwindow.obj index a66de31..4a91dd0 100644 Binary files a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targlistmainwindow.obj and b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/targlistmainwindow.obj differ diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_mainwindow.h b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_mainwindow.h index 86e9f01..9e7da0f 100644 --- a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_mainwindow.h +++ b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_mainwindow.h @@ -15,9 +15,7 @@ #include #include #include -#include #include -#include #include QT_BEGIN_NAMESPACE @@ -27,8 +25,6 @@ class Ui_MainWindow public: QAction *actionOpen; QWidget *centralWidget; - QMenuBar *menuBar; - QToolBar *mainToolBar; QStatusBar *statusBar; void setupUi(QMainWindow *MainWindow) @@ -41,13 +37,6 @@ class Ui_MainWindow centralWidget = new QWidget(MainWindow); centralWidget->setObjectName(QStringLiteral("centralWidget")); MainWindow->setCentralWidget(centralWidget); - menuBar = new QMenuBar(MainWindow); - menuBar->setObjectName(QStringLiteral("menuBar")); - menuBar->setGeometry(QRect(0, 0, 683, 21)); - MainWindow->setMenuBar(menuBar); - mainToolBar = new QToolBar(MainWindow); - mainToolBar->setObjectName(QStringLiteral("mainToolBar")); - MainWindow->addToolBar(Qt::TopToolBarArea, mainToolBar); statusBar = new QStatusBar(MainWindow); statusBar->setObjectName(QStringLiteral("statusBar")); MainWindow->setStatusBar(statusBar); diff --git a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_targlistmainwindow.h b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_targlistmainwindow.h index 414f96c..ca4b9e8 100644 --- a/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_targlistmainwindow.h +++ b/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_targlistmainwindow.h @@ -32,6 +32,7 @@ class Ui_TargListMainWindow QWidget *centralWidget; QVBoxLayout *verticalLayout; QHBoxLayout *horizontalLayout; + QCommandLinkButton *commandLinkButton; QCommandLinkButton *newButton; QCommandLinkButton *editButton; QCommandLinkButton *deleteButton; @@ -58,13 +59,13 @@ class Ui_TargListMainWindow horizontalLayout = new QHBoxLayout(); horizontalLayout->setSpacing(0); horizontalLayout->setObjectName(QStringLiteral("horizontalLayout")); + commandLinkButton = new QCommandLinkButton(centralWidget); + commandLinkButton->setObjectName(QStringLiteral("commandLinkButton")); + + horizontalLayout->addWidget(commandLinkButton); + newButton = new QCommandLinkButton(centralWidget); newButton->setObjectName(QStringLiteral("newButton")); - QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(newButton->sizePolicy().hasHeightForWidth()); - newButton->setSizePolicy(sizePolicy); QIcon icon; icon.addFile(QStringLiteral(":/files/round75.png"), QSize(), QIcon::Normal, QIcon::Off); newButton->setIcon(icon); @@ -129,11 +130,11 @@ class Ui_TargListMainWindow __qtablewidgetitem3->setFont(font); targetListTable->setHorizontalHeaderItem(3, __qtablewidgetitem3); targetListTable->setObjectName(QStringLiteral("targetListTable")); - QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Expanding); - sizePolicy1.setHorizontalStretch(0); - sizePolicy1.setVerticalStretch(0); - sizePolicy1.setHeightForWidth(targetListTable->sizePolicy().hasHeightForWidth()); - targetListTable->setSizePolicy(sizePolicy1); + QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(targetListTable->sizePolicy().hasHeightForWidth()); + targetListTable->setSizePolicy(sizePolicy); QFont font1; font1.setPointSize(11); targetListTable->setFont(font1); @@ -167,6 +168,7 @@ class Ui_TargListMainWindow { TargListMainWindow->setWindowTitle(QApplication::translate("TargListMainWindow", "MainWindow", 0)); actionExport->setText(QApplication::translate("TargListMainWindow", "Export", 0)); + commandLinkButton->setText(QApplication::translate("TargListMainWindow", "PushButton", 0)); #ifndef QT_NO_TOOLTIP newButton->setToolTip(QApplication::translate("TargListMainWindow", "

Shortcut: ctrl+n

", 0)); #endif // QT_NO_TOOLTIP diff --git a/groundstation/580.jpg.targets b/groundstation/580.jpg.targets new file mode 100644 index 0000000..e69de29 diff --git a/groundstation/backend/backend_common.h b/groundstation/backend/backend_common.h new file mode 100644 index 0000000..d8ddedb --- /dev/null +++ b/groundstation/backend/backend_common.h @@ -0,0 +1,8 @@ +#ifndef BACKEND_COMMON_H +#define BACKEND_COMMON_H + +#include +#include "image.h" +#include "target.h" + +#endif // BACKEND_COMMON_H diff --git a/groundstation/backend/image.cpp b/groundstation/backend/image.cpp new file mode 100644 index 0000000..d0581db --- /dev/null +++ b/groundstation/backend/image.cpp @@ -0,0 +1,52 @@ +#include "image.h" + +Image::Image(QWidget *parent) : + QMap(parent) +{ +} + +Image::Image(QString path, double x, double y) +{ + this->path = path; + this->coords = make_pair(x, y); +} + +QString Image::getPath() +{ + return this->path; +} + +QString Image::getDesc() +{ + return this->description; +} + +QPair Image::getCoords() +{ + return this->coords; +} + +Target* Image::getTarget(QString name) +{ + return this->targets[name]; +} + +void setPath(QString path) +{ + this->path = path; +} + +void setDesc(QString desc) +{ + this->description = desc; +} + +void setCoords(double x, double y) +{ + this->coords = make_pair(x, y); +} + +void addTarget(Target* target) +{ + this->targets.insert(target); +} diff --git a/groundstation/backend/image.h b/groundstation/backend/image.h new file mode 100644 index 0000000..544407b --- /dev/null +++ b/groundstation/backend/image.h @@ -0,0 +1,50 @@ +#ifndef IMAGE_H +#define IMAGE_H + +#include +#include "target.h" + +/** + * @brief The image class is the target class for images. + */ + +class Image +{ + Q_OBJECT +private: + QString path; // Name of image... + QString description; // Description of image, if applicable + QPair coords; // GPS coords of image center + QMap targets; // List of targets in image + //QVector> targetcoords; // Image coords of each target + +public: + explicit Image(QWidget *parent = 0); + Image(QString path, double x, double y); + + QString getPath();// Gets name + QString getDesc(); // Gets description + QPair getCoords(); // Gets GPS coordinates + Target* getTarget(QString name); + + void setPath(QString path); + void setDesc(QString desc); + void setCoords(double x, double y); + void addTarget(Target& t); + +signals: + +public slots: + +}; + +#endif // IMAGE_H + +/** + * THINGS THAT ARE NEEDED HERE FOR STUFF TO WORK WELL + * + * * Using compvision or basic math: + * -> If a target is found on one image, it should also be located on 'nearby' images if present in field of view. + * + * * Need a way to store this more efficiently. Map? Set? Graph? If a graph could have many datatypes that'd be nice... + * **/ diff --git a/groundstation/backend/target.cpp b/groundstation/backend/target.cpp new file mode 100644 index 0000000..f73e86f --- /dev/null +++ b/groundstation/backend/target.cpp @@ -0,0 +1,6 @@ +#include "target.h" + +Target::Target(QWidget *parent) : + QMap(parent) +{ +} diff --git a/groundstation/backend/target.cpp.autosave b/groundstation/backend/target.cpp.autosave new file mode 100644 index 0000000..00ae6f1 --- /dev/null +++ b/groundstation/backend/target.cpp.autosave @@ -0,0 +1,33 @@ +#include "target.h" + +Target::Target(QWidget *parent) : + QMap(parent) +{ +} + QString name; + QString imgpath; + QString description; + QPair coords; + QMap images; + // No need for image coordinates since that's already in image +public: + explicit Target(QWidget *parent = 0); + Target(QString name, QString desc, double x, double y); + + QString getName(); + QString getImgPath(); + QString getDesc(); + QPair getCoords(); + + void setName(QString name); + void setImgPath(QString path); + void setDesc(QString desc); + void setCoords(double x, double y); + void addImage(Image& i); +signals: + +public slots: + +}; + +#endif // TARGET_H diff --git a/groundstation/backend/target.h b/groundstation/backend/target.h new file mode 100644 index 0000000..1d80393 --- /dev/null +++ b/groundstation/backend/target.h @@ -0,0 +1,41 @@ +#ifndef TARGET_H +#define TARGET_H + +#include +#include "image.h" + +/** + * @brief The target class acts as the actual information storage thing for targets. Well, ideally. + */ + +class Target +{ + Q_OBJECT +private: + QString name; + QString imgpath; + QString description; + QPair coords; + QMap images; + // No need for image coordinates since that's already in image +public: + explicit Target(QWidget *parent = 0); + Target(QString name, QString desc, double x, double y); + + QString getName(); + QString getImgPath(); + QString getDesc(); + QPair getCoords(); + + void setName(QString name); + void setImgPath(QString path); + void setDesc(QString desc); + void setCoords(double x, double y); + void addImage(Image& i); +signals: + +public slots: + +}; + +#endif // TARGET_H diff --git a/groundstation/groundstation.pro b/groundstation/groundstation.pro index f2842fd..a7fe4d9 100644 --- a/groundstation/groundstation.pro +++ b/groundstation/groundstation.pro @@ -11,8 +11,10 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = groundstation TEMPLATE = app -INCLUDEPATH += targetlist -DEPENDPATH += targetlist +INCLUDEPATH += targetlist \ + backend +DEPENDPATH += targetlist \ + backend SOURCES += main.cpp\ mainwindow.cpp \ @@ -24,6 +26,20 @@ SOURCES += main.cpp\ targetlist/targetlistitem.cpp \ targetlist/targetmaker.cpp \ targetlist/targlistmainwindow.cpp \ + # targetlist-old/build-targetlist-Desktop_Qt_5_3_MinGW_32bit-Debug/debug/moc_mainwindow.cpp \ + # targetlist-old/build-targetlist-Desktop_Qt_5_3_MinGW_32bit-Debug/debug/moc_targetmaker.cpp \ + # targetlist-old/build-targetlist-Desktop_Qt_5_3_MinGW_32bit-Debug/debug/qrc_Resources.cpp \ + # targetlist-old/build-targetlist-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_mainwindow.cpp \ + # targetlist-old/build-targetlist-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_targetmaker.cpp \ + # targetlist-old/build-targetlist-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/qrc_Resources.cpp \ + # targetlist-old/targetlist/main.cpp \ + # targetlist-old/targetlist/mainwindow.cpp \ + # targetlist-old/targetlist/target.cpp \ + # targetlist-old/targetlist/targetlist.cpp \ + # targetlist-old/targetlist/targetlistitem.cpp \ + # targetlist-old/targetlist/targetmaker.cpp \ + backend/target.cpp \ + backend/image.cpp HEADERS += mainwindow.h \ mainpic/mainpicdisplay.h \ @@ -36,6 +52,18 @@ HEADERS += mainwindow.h \ targetlist/targlistmainwindow.h \ targetlist/ui_targetmaker.h \ targetlist/ui_targlistmainwindow.h \ + # targetlist-old/build-targetlist-Desktop_Qt_5_3_MinGW_32bit-Debug/ui_mainwindow.h \ + # targetlist-old/build-targetlist-Desktop_Qt_5_3_MinGW_32bit-Debug/ui_targetmaker.h \ + # targetlist-old/build-targetlist-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_mainwindow.h \ + # targetlist-old/build-targetlist-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/ui_targetmaker.h \ + # targetlist-old/targetlist/mainwindow.h \ + # targetlist-old/targetlist/target.h \ + # targetlist-old/targetlist/targetlist.h \ + # targetlist-old/targetlist/targetlistitem.h \ + # targetlist-old/targetlist/targetmaker.h \ + backend/target.h \ + backend/image.h \ + backend/backend_common.h FORMS += mainwindow.ui \ targetlist/targetmaker.ui \ diff --git a/groundstation/groundstation.pro.user b/groundstation/groundstation.pro.user index 4d7e653..1107548 100644 --- a/groundstation/groundstation.pro.user +++ b/groundstation/groundstation.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/groundstation/main.cpp b/groundstation/main.cpp index d0e3555..e8be8d3 100644 --- a/groundstation/main.cpp +++ b/groundstation/main.cpp @@ -1,12 +1,12 @@ -#include "mainwindow.h" -#include - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - MainWindow w; - w.show(); - - - return a.exec(); -} +#include "mainwindow.h" +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + MainWindow w; + w.show(); + + + return a.exec(); +} diff --git a/groundstation/mainpic/mainpicdisplay.cpp b/groundstation/mainpic/mainpicdisplay.cpp index dbded0f..408d874 100644 --- a/groundstation/mainpic/mainpicdisplay.cpp +++ b/groundstation/mainpic/mainpicdisplay.cpp @@ -1,99 +1,100 @@ -#include "MainPicDisplay.h" -using namespace std; - -MainPicDisplay::MainPicDisplay(const QVector& itargets, QWidget *parent) : - QLabel(parent), TARGET_DRAW_SIZE(10), targets(itargets) -{ - setScaledContents(true); - - originalWidth = 0; - width = 0; - aspectRatio = 0; - maxWidth = 1000; - maxHeight = 1000; - setFixedWidth(0); - setFixedHeight(0); -} - -MainPicDisplay::~MainPicDisplay(){ -} - -int MainPicDisplay::getHeight(){ - return width * aspectRatio; -} - -double MainPicDisplay::getZoomFactor(){ - return (double) originalWidth / width; -} - -void MainPicDisplay::setMaxSize(const int& iwidth, const int& iheight){ - maxWidth = iwidth; - maxHeight = iheight; -} - -void MainPicDisplay::zoomIn(){ - if (width < 1000 && getHeight() < 1000){ - width = width * 1.2; - } - setFixedWidth(width); - setFixedHeight(width * aspectRatio); -} - -void MainPicDisplay::zoomOut(){ - if(width > maxWidth && getHeight() > maxHeight){ - width /= 1.2; - } else { - // Maxxed zoom out - if (maxHeight / maxWidth < aspectRatio){ - width = maxHeight / aspectRatio; - } else { - width = maxWidth; - } - } - setFixedWidth(width); - setFixedHeight(getHeight()); -} - - -void MainPicDisplay::zoomToFit(){ - if (maxHeight / maxWidth < aspectRatio){ - width = maxHeight / aspectRatio; - } else { - width = maxWidth; - } - setFixedWidth(width); - setFixedHeight(getHeight()); -} - -void MainPicDisplay::displayPicture(QString source){ - QImage image = QImage(source); - setPixmap(QPixmap::fromImage(image)); - aspectRatio = image.width() / image.height(); - originalWidth = image.width(); - zoomToFit(); -} - -void MainPicDisplay::mousePressEvent(QMouseEvent* event){ - // Convert the coordinates to unzoomed image coordinates before continuing - emit clicked(event->x() * getZoomFactor(), event->y() * getZoomFactor()); -} - -void MainPicDisplay::paintEvent(QPaintEvent *event){ - QLabel::paintEvent(event); - QPainter painter(this); - // Line - painter.setPen(Qt::blue); - // Fill - QRadialGradient gradient(TARGET_DRAW_SIZE/2, TARGET_DRAW_SIZE/2, TARGET_DRAW_SIZE/2); - gradient.setColorAt(0, QColor(0, 0, 255, 255)); - gradient.setColorAt(1, QColor(0, 0, 255, 0)); - painter.setBrush(QBrush(gradient)); - - // Draw all targets - foreach (Target t, targets){ - int x = t["x"].toInt() / getZoomFactor() - TARGET_DRAW_SIZE/2; - int y = t["y"].toInt() / getZoomFactor() - TARGET_DRAW_SIZE/2; - painter.setBrushOrigin(x, y); - painter.drawEllipse(x, y, TARGET_DRAW_SIZE, TARGET_DRAW_SIZE); - } -} +#include "MainPicDisplay.h" + +//using namespace std; + +MainPicDisplay::MainPicDisplay(const QVector& itargets, QWidget *parent) : + QLabel(parent), TARGET_DRAW_SIZE(10), targets(itargets) +{ + setScaledContents(true); + + originalWidth = 0; + width = 0; + aspectRatio = 0; + maxWidth = 1000; + maxHeight = 1000; + setFixedWidth(0); + setFixedHeight(0); +} + +MainPicDisplay::~MainPicDisplay(){ +} + +int MainPicDisplay::getHeight(){ + return width * aspectRatio; +} + +double MainPicDisplay::getZoomFactor(){ + return (double) originalWidth / width; +} + +void MainPicDisplay::setMaxSize(const int& iwidth, const int& iheight){ + maxWidth = iwidth; + maxHeight = iheight; +} + +void MainPicDisplay::zoomIn(){ + if (width < 1000 && getHeight() < 1000){ + width = width * 1.2; + } + setFixedWidth(width); + setFixedHeight(width * aspectRatio); +} + +void MainPicDisplay::zoomOut(){ + if(width > maxWidth && getHeight() > maxHeight){ + width /= 1.2; + } else { + // Maxxed zoom out + if (maxHeight / maxWidth < aspectRatio){ + width = maxHeight / aspectRatio; + } else { + width = maxWidth; + } + } + setFixedWidth(width); + setFixedHeight(getHeight()); +} + + +void MainPicDisplay::zoomToFit(){ + if (maxHeight / maxWidth < aspectRatio){ + width = maxHeight / aspectRatio; + } else { + width = maxWidth; + } + setFixedWidth(width); + setFixedHeight(getHeight()); +} + +void MainPicDisplay::displayPicture(QString source){ + QImage image = QImage(source); + setPixmap(QPixmap::fromImage(image)); + aspectRatio = image.width() / image.height(); + originalWidth = image.width(); + zoomToFit(); +} + +void MainPicDisplay::mousePressEvent(QMouseEvent* event){ + // Convert the coordinates to unzoomed image coordinates before continuing + emit clicked(event->x() * getZoomFactor(), event->y() * getZoomFactor()); +} + +void MainPicDisplay::paintEvent(QPaintEvent *event){ + QLabel::paintEvent(event); + QPainter painter(this); + // Line + painter.setPen(Qt::blue); + // Fill + QRadialGradient gradient(TARGET_DRAW_SIZE/2, TARGET_DRAW_SIZE/2, TARGET_DRAW_SIZE/2); + gradient.setColorAt(0, QColor(0, 0, 255, 255)); + gradient.setColorAt(1, QColor(0, 0, 255, 0)); + painter.setBrush(QBrush(gradient)); + + // Draw all targets + foreach (Target t, targets){ + int x = t["x"].toInt() / getZoomFactor() - TARGET_DRAW_SIZE/2; + int y = t["y"].toInt() / getZoomFactor() - TARGET_DRAW_SIZE/2; + painter.setBrushOrigin(x, y); + painter.drawEllipse(x, y, TARGET_DRAW_SIZE, TARGET_DRAW_SIZE); + } +} diff --git a/groundstation/mainpic/target.h b/groundstation/mainpic/target.h index 434d579..5f9cfb3 100644 --- a/groundstation/mainpic/target.h +++ b/groundstation/mainpic/target.h @@ -1,35 +1,37 @@ -#ifndef TARGET_H -#define TARGET_H - -#include -#include -#include -#include -#include - -using namespace std; - -class Target -{ -public: - static const QString SER_SEP; - static const QList FIELD_NAMES; - -private: - QMap fields; - -public: - Target(); - Target(const QMap& init); - Target(const QList& init); - virtual ~Target(); - - QVariant& operator[](const QString& fieldName); - const QVariant& operator[](const QString& fieldName) const; - -private: - friend QTextStream& operator<<(QTextStream&, const Target &); - friend QTextStream& operator>>(QTextStream&, Target &); -}; - -#endif // TARGET_H +#ifndef TARGET_H +#define TARGET_H + +#include +#include +#include +#include +#include + +// Might have to remove this + +using namespace std; + +class Target +{ +public: + static const QString SER_SEP; + static const QList FIELD_NAMES; + +private: + QMap fields; + +public: + Target(); + Target(const QMap& init); + Target(const QList& init); + virtual ~Target(); + + QVariant& operator[](const QString& fieldName); + const QVariant& operator[](const QString& fieldName) const; + +private: + friend QTextStream& operator<<(QTextStream&, const Target &); + friend QTextStream& operator>>(QTextStream&, Target &); +}; + +#endif // TARGET_H diff --git a/groundstation/mainwindow.cpp b/groundstation/mainwindow.cpp index 2da8426..4431702 100644 --- a/groundstation/mainwindow.cpp +++ b/groundstation/mainwindow.cpp @@ -1,7 +1,7 @@ #include "mainwindow.h" #include "ui_mainwindow.h" - #include + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) @@ -9,9 +9,9 @@ MainWindow::MainWindow(QWidget *parent) : ui->setupUi(this); tabWindow = new QTabWidget; + mainMenu = new QMenuBar; setCentralWidget(tabWindow); - - targetListMenu = new QMenuBar; + setMenuBar(mainMenu); mainPic = new MainPicWidget(); tabWindow->addTab(mainPic, "Mainpic"); @@ -19,7 +19,7 @@ MainWindow::MainWindow(QWidget *parent) : targetList = new TargListMainWindow(); // Have consistent naming later... tabWindow->addTab(targetList, "Targetlist"); - targetList->setMenuBar(targetListMenu); + mainPic->setPicture("../groundstation/580.jpg"); // Still temporary } diff --git a/groundstation/mainwindow.h b/groundstation/mainwindow.h index 25c07cf..c0da540 100644 --- a/groundstation/mainwindow.h +++ b/groundstation/mainwindow.h @@ -8,9 +8,13 @@ #include "mainpic/targetfilehandler.h" #include +#include #include "targlistmainwindow.h" #include "ui_targlistmainwindow.h" +#include "backend/image.h" +#include "backend/target.h" + using namespace std; namespace Ui { class MainWindow; @@ -31,12 +35,14 @@ public slots: private: Ui::MainWindow *ui; - QTabWidget* tabWindow; + QTabWidget* tabWindow; // To hold EVERYTHING MainPicWidget* mainPic; + TargListMainWindow* targetList; // Change naming? + QMenuBar* mainMenu; // Possibly not even necessary - TargListMainWindow* targetList; - QMenuBar* targetListMenu; + QMap imaglist; + QMap targlist; }; #endif // MAINWINDOW_H diff --git a/groundstation/mainwindow.ui b/groundstation/mainwindow.ui index 3049464..6c03f6f 100644 --- a/groundstation/mainwindow.ui +++ b/groundstation/mainwindow.ui @@ -1,45 +1,27 @@ - - - MainWindow - - - - 0 - 0 - 683 - 433 - - - - MainWindow - - - - - - 0 - 0 - 683 - 21 - - - - - - TopToolBarArea - - - false - - - - - - Open - - - - - - - + + + MainWindow + + + + 0 + 0 + 683 + 433 + + + + MainWindow + + + + + + Open + + + + + + + diff --git a/groundstation/targetlist/targetlist.cpp b/groundstation/targetlist/targetlist.cpp index 767ddc7..61ace8e 100644 --- a/groundstation/targetlist/targetlist.cpp +++ b/groundstation/targetlist/targetlist.cpp @@ -45,6 +45,9 @@ void TargetList::refreshTable() void TargetList::addNewRow(QString fileName, QString name, QString coordinates, QString description) { + Target newTarget(name, filename, coordinates, description); + targlist.insert(newTarget); + // Creates image preview item QTableWidgetItem *image = new QTableWidgetItem(); QBrush brush; diff --git a/groundstation/targetlist/targlistmainwindow.cpp b/groundstation/targetlist/targlistmainwindow.cpp index 8d57c23..01d8e6a 100644 --- a/groundstation/targetlist/targlistmainwindow.cpp +++ b/groundstation/targetlist/targlistmainwindow.cpp @@ -1,11 +1,4 @@ #include "targlistmainwindow.h" -#include "ui_targlistmainwindow.h" -#include "targetmaker.h" -#include "targetlist.h" -#include -#include -#include -#include TargListMainWindow::TargListMainWindow(QWidget *parent) : QMainWindow(parent), diff --git a/groundstation/targetlist/targlistmainwindow.h b/groundstation/targetlist/targlistmainwindow.h index 700f6d8..1a02486 100644 --- a/groundstation/targetlist/targlistmainwindow.h +++ b/groundstation/targetlist/targlistmainwindow.h @@ -5,6 +5,12 @@ #include "targetmaker.h" #include "targetlist.h" +#include "ui_targlistmainwindow.h" +#include +#include +#include +#include + namespace Ui { class TargListMainWindow; } diff --git a/groundstation/targetlist/targlistmainwindow.ui b/groundstation/targetlist/targlistmainwindow.ui index 1367007..701b780 100644 --- a/groundstation/targetlist/targlistmainwindow.ui +++ b/groundstation/targetlist/targlistmainwindow.ui @@ -24,13 +24,14 @@ 0 - - - - 0 - 0 - + + + PushButton + + + + <html><head/><body><p>Shortcut: <span style=" font-weight:600;">ctrl+n</span></p></body></html> @@ -38,7 +39,7 @@ New - + :/files/round75.png:/files/round75.png @@ -61,7 +62,7 @@ Edit - + :/files/clasic.png:/files/clasic.png @@ -84,7 +85,7 @@ Delete - + :/files/delete85.png:/files/delete85.png @@ -107,7 +108,7 @@ Up - + :/files/up.png:/files/up.png @@ -130,7 +131,7 @@ Down - + :/files/down.png:/files/down.png @@ -250,8 +251,6 @@ - - - +