From 9ce6ab26bb95e20fed597fb2d1ae9d7ba59aac6b Mon Sep 17 00:00:00 2001 From: Utat Uav Date: Tue, 13 Jan 2015 17:34:09 -0500 Subject: [PATCH] Still figuring this out. Lots of random commits coming --- groundstation/groundstation.pro.user | 1250 ++++++++--------- gui1/gui1.pro.user => gui/gui.pro.user | 1245 ++++++++-------- gui1/gui1.pro | 3 - gui1/main.cpp | 16 - gui1/module/targetlist/Resources.qrc | 10 - gui1/module/targetlist/Untitled.png | Bin 2357 -> 0 bytes gui1/module/targetlist/clasic.png | Bin 4027 -> 0 bytes gui1/module/targetlist/delete85.png | Bin 4009 -> 0 bytes gui1/module/targetlist/down.png | Bin 3497 -> 0 bytes gui1/module/targetlist/main.cpp | 16 - gui1/module/targetlist/mainwindow.cpp | 154 -- gui1/module/targetlist/mainwindow.h | 41 - gui1/module/targetlist/mainwindow.ui | 245 ---- gui1/module/targetlist/round75.png | Bin 7647 -> 0 bytes gui1/module/targetlist/target.cpp | 6 - gui1/module/targetlist/target.h | 13 - gui1/module/targetlist/targetlist.cpp | 159 --- gui1/module/targetlist/targetlist.h | 22 - gui1/module/targetlist/targetlist.pro | 30 - gui1/module/targetlist/targetlist.pro.user | 255 ---- .../targetlist/targetlist.pro.user.875b11c | 255 ---- gui1/module/targetlist/targetlistitem.cpp | 19 - gui1/module/targetlist/targetlistitem.h | 19 - gui1/module/targetlist/targetmaker.cpp | 77 - gui1/module/targetlist/targetmaker.h | 39 - gui1/module/targetlist/targetmaker.ui | 198 --- gui1/module/targetlist/up.png | Bin 4050 -> 0 bytes 27 files changed, 1247 insertions(+), 2825 deletions(-) rename gui1/gui1.pro.user => gui/gui.pro.user (96%) delete mode 100644 gui1/gui1.pro delete mode 100644 gui1/main.cpp delete mode 100644 gui1/module/targetlist/Resources.qrc delete mode 100644 gui1/module/targetlist/Untitled.png delete mode 100644 gui1/module/targetlist/clasic.png delete mode 100644 gui1/module/targetlist/delete85.png delete mode 100644 gui1/module/targetlist/down.png delete mode 100644 gui1/module/targetlist/main.cpp delete mode 100644 gui1/module/targetlist/mainwindow.cpp delete mode 100644 gui1/module/targetlist/mainwindow.h delete mode 100644 gui1/module/targetlist/mainwindow.ui delete mode 100644 gui1/module/targetlist/round75.png delete mode 100644 gui1/module/targetlist/target.cpp delete mode 100644 gui1/module/targetlist/target.h delete mode 100644 gui1/module/targetlist/targetlist.cpp delete mode 100644 gui1/module/targetlist/targetlist.h delete mode 100644 gui1/module/targetlist/targetlist.pro delete mode 100644 gui1/module/targetlist/targetlist.pro.user delete mode 100644 gui1/module/targetlist/targetlist.pro.user.875b11c delete mode 100644 gui1/module/targetlist/targetlistitem.cpp delete mode 100644 gui1/module/targetlist/targetlistitem.h delete mode 100644 gui1/module/targetlist/targetmaker.cpp delete mode 100644 gui1/module/targetlist/targetmaker.h delete mode 100644 gui1/module/targetlist/targetmaker.ui delete mode 100644 gui1/module/targetlist/up.png diff --git a/groundstation/groundstation.pro.user b/groundstation/groundstation.pro.user index f2715df..858ef55 100644 --- a/groundstation/groundstation.pro.user +++ b/groundstation/groundstation.pro.user @@ -1,625 +1,625 @@ - - - - - - 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-groundstation-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-groundstation-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 - - groundstation - - Qt4ProjectManager.Qt4RunConfiguration:C:/Jesse/groundstation/groundstation/groundstation.pro - - groundstation.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop Qt 5.3 MSVC2012 OpenGL 32bit - Desktop Qt 5.3 MSVC2012 OpenGL 32bit - qt.53.win32_msvc2012_opengl_kit - 0 - 0 - 0 - - C:/Jesse/groundstation/build-groundstation-Desktop_Qt_5_3_MSVC2012_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-groundstation-Desktop_Qt_5_3_MSVC2012_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 - - groundstation - - Qt4ProjectManager.Qt4RunConfiguration:C:/Jesse/groundstation/groundstation/groundstation.pro - - groundstation.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.2 - - Desktop Qt 5.3 MSVC2013 64bit - Desktop Qt 5.3 MSVC2013 64bit - qt.53.win64_msvc2013_64_kit - 0 - 0 - 0 - - C:/Jesse/groundstation/build-groundstation-Desktop_Qt_5_3_MSVC2013_64bit-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-groundstation-Desktop_Qt_5_3_MSVC2013_64bit-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 - - groundstation - - Qt4ProjectManager.Qt4RunConfiguration:C:/Jesse/groundstation/groundstation/groundstation.pro - - groundstation.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 3 - - - 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-groundstation-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-groundstation-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 + + groundstation + + Qt4ProjectManager.Qt4RunConfiguration:C:/Jesse/groundstation/groundstation/groundstation.pro + + groundstation.pro + false + false + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.3 MSVC2012 OpenGL 32bit + Desktop Qt 5.3 MSVC2012 OpenGL 32bit + qt.53.win32_msvc2012_opengl_kit + 0 + 0 + 0 + + C:/Jesse/groundstation/build-groundstation-Desktop_Qt_5_3_MSVC2012_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-groundstation-Desktop_Qt_5_3_MSVC2012_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 + + groundstation + + Qt4ProjectManager.Qt4RunConfiguration:C:/Jesse/groundstation/groundstation/groundstation.pro + + groundstation.pro + false + false + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.2 + + Desktop Qt 5.3 MSVC2013 64bit + Desktop Qt 5.3 MSVC2013 64bit + qt.53.win64_msvc2013_64_kit + 0 + 0 + 0 + + C:/Jesse/groundstation/build-groundstation-Desktop_Qt_5_3_MSVC2013_64bit-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-groundstation-Desktop_Qt_5_3_MSVC2013_64bit-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 + + groundstation + + Qt4ProjectManager.Qt4RunConfiguration:C:/Jesse/groundstation/groundstation/groundstation.pro + + groundstation.pro + false + false + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 3 + + + ProjectExplorer.Project.Updater.FileVersion + 16 + + + Version + 16 + + diff --git a/gui1/gui1.pro.user b/gui/gui.pro.user similarity index 96% rename from gui1/gui1.pro.user rename to gui/gui.pro.user index 8287eee..4237359 100644 --- a/gui1/gui1.pro.user +++ b/gui/gui.pro.user @@ -1,623 +1,622 @@ - - - - - - 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-gui1-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-gui1-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 - - targetlist - - Qt4ProjectManager.Qt4RunConfiguration:C:/jesse/groundstation/gui1/module/targetlist/targetlist.pro - - module/targetlist/targetlist.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop Qt 5.3 MSVC2012 OpenGL 32bit - Desktop Qt 5.3 MSVC2012 OpenGL 32bit - qt.53.win32_msvc2012_opengl_kit - 0 - 0 - 0 - - C:/jesse/groundstation/build-gui1-Desktop_Qt_5_3_MSVC2012_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-gui1-Desktop_Qt_5_3_MSVC2012_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 - - -1 - - - - false - %{buildDir} - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.2 - - Desktop Qt 5.3 MSVC2013 64bit - Desktop Qt 5.3 MSVC2013 64bit - qt.53.win64_msvc2013_64_kit - 0 - 0 - 0 - - C:/jesse/groundstation/build-gui1-Desktop_Qt_5_3_MSVC2013_64bit-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-gui1-Desktop_Qt_5_3_MSVC2013_64bit-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 - - -1 - - - - false - %{buildDir} - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 3 - - - 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-gui-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-gui-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 + + -1 + + + + false + %{buildDir} + Custom Executable + + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.3 MSVC2012 OpenGL 32bit + Desktop Qt 5.3 MSVC2012 OpenGL 32bit + qt.53.win32_msvc2012_opengl_kit + 0 + 0 + 0 + + C:/jesse/groundstation/build-gui-Desktop_Qt_5_3_MSVC2012_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-gui-Desktop_Qt_5_3_MSVC2012_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 + + -1 + + + + false + %{buildDir} + Custom Executable + + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.2 + + Desktop Qt 5.3 MSVC2013 64bit + Desktop Qt 5.3 MSVC2013 64bit + qt.53.win64_msvc2013_64_kit + 0 + 0 + 0 + + C:/jesse/groundstation/build-gui-Desktop_Qt_5_3_MSVC2013_64bit-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-gui-Desktop_Qt_5_3_MSVC2013_64bit-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 + + -1 + + + + false + %{buildDir} + Custom Executable + + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 3 + + + ProjectExplorer.Project.Updater.FileVersion + 16 + + + Version + 16 + + diff --git a/gui1/gui1.pro b/gui1/gui1.pro deleted file mode 100644 index 57a1cca..0000000 --- a/gui1/gui1.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS = module/targetlist/targetlist.pro diff --git a/gui1/main.cpp b/gui1/main.cpp deleted file mode 100644 index a21b98d..0000000 --- a/gui1/main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "mainwindow.h" -#include -#include - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - - MainWindow w; - w.resize(200, 500); - w.show(); - w.setWindowTitle( - QApplication::translate("toplevel", "Target List")); - - return a.exec(); -} diff --git a/gui1/module/targetlist/Resources.qrc b/gui1/module/targetlist/Resources.qrc deleted file mode 100644 index b239dd7..0000000 --- a/gui1/module/targetlist/Resources.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - Untitled.png - down.png - up.png - clasic.png - delete85.png - round75.png - - diff --git a/gui1/module/targetlist/Untitled.png b/gui1/module/targetlist/Untitled.png deleted file mode 100644 index a4bfa7ec1bbee184904bec1844da301d5ddf8cf9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2357 zcmb_e`#aN*7vE%BZ;iRUBO@b)pu@5$vsVHQcEtC?zYKfX#in-rQ zbIT<}J{cOZZr|iXDj79=*Y`j8KF{}g&g)#C^UFD}=Q$^p=xmPw)Bp$sf^c*oxJhh< z1WdS;L?4HdoFoPs?PiaMRJ>H5l?2jc+;JQPQhifa><^Q~TOu92q9G8u&OdG`~CZc2{IEYaG1KNY5;!ZGED`uegQzW0$m+B8H4{YlN+L96HMLiHPi zXBAD&4zphhH@=WCMOl3r>*fh9WK;3?yBTJsQm+52h)Wlj2Ko0RVwN_$sas(A+0f!Qx+_sj=*#c_rO^2jmE>CW`` z*o9?OPb$za@SW4Wma?g8KoD{>h z7MBm+@S8ACYyTO%C6Ouh$K5Q@5KvTIrYW;#>cU!2I>MFId#?~JjIhHk`WSTSp*9b> z+O)}2mtkQ{*RA=5^hgU!2p_QRJ8a)R_Zf21VCycCI`d;*1@;M}zJplNVF75BgDe{O z(iQH{HO?-Jyn%;@G2<(G|6BNeajAluo7vXAmRE@E@Yd4QS2h)XA7%)H=!hT;83CUg3MYxC|;`B?2+w80c!5<6?%*|V;l zI*}rvVJ6LgX$z{4@49T`Mk)bP+CN_^R9$NY;4Mf}fBWV2bHeev#MrOr@TE$5WwQWi+h zmL=jSdbdCtIdjoAH%mtqUD{z$Acd#saqyq;uM}1H*I76&u!-l^k2lk zf>V!W@?QYE&2tn#IH#UbZ*s$>Sp7I?d zD|4V=PRy?p^^ayNkMCB<0Rb?fd zaSNnF&rAG4`nd5K+oavt>pU?9gYIHUd#L6sUIGnrKY2i^puCa6W&1UY9RZzp`iI!w z9O4nS>K%g@3qcgU)_Z=D6W;24RLdY8s6jP zjow0a>(siXI$#Xij!hU4x>;ZJp*lrUu{G6G4-o#I4v#%;63}NB>nd|Kx(JHt|;%msO5`7s|^6LJ%aha7tj2C>YrFd9MWAUAt-3X z1KL{`5E6q|nQD|>Vk4CLf!@RnzlI-(2+MI%GZw9hPM@6%%%}tWI_2hW3aCsR~4=UF-35qe0Lcb}cAfSvI;e~)Me!$6!&D>X#Med4hB zbSsi>u&oBhK`kRpymdK7mBFpGKl627eQc?IVU`G;5!q{{-V9v$JU73*d23dEs1}x> zj;?By(4_hYzf!S~`dLN#iSGNocRc+=Nyrc5Al?f1>fOur>Ca}e@fVQAzsM@Zn@*Qg z{ce96+Pj*AYQ{cD?vmBD$jdhcZMs>DH<*W|P8gdo)H~0mu8*;_A%ZR+!v>f6qY=${ z8b?-=nVl~C^HwbG&bmXDYqUf??e+w<(K7CzB}Weh1$4|eMfwBh_ra;Yfz)pQ77w_B(KdnR;wtMAs=!cPT>eHTE{w485u3j7^%WQX znxP6;d>Sk{q*DY#XKCnO!cD#)%%r7dILdb*!Z9dxr=h=K0HeJIuWw qT+8N>Zzo}p%>SEYn4RXWYo0Vxg58a%FOs}E5Jx*_LIvLM%6|Y(kSM$W diff --git a/gui1/module/targetlist/clasic.png b/gui1/module/targetlist/clasic.png deleted file mode 100644 index 3db54a216433eb34135e7536bc033a79bacab4a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4027 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 diff --git a/gui1/module/targetlist/main.cpp b/gui1/module/targetlist/main.cpp deleted file mode 100644 index a21b98d..0000000 --- a/gui1/module/targetlist/main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "mainwindow.h" -#include -#include - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - - MainWindow w; - w.resize(200, 500); - w.show(); - w.setWindowTitle( - QApplication::translate("toplevel", "Target List")); - - return a.exec(); -} diff --git a/gui1/module/targetlist/mainwindow.cpp b/gui1/module/targetlist/mainwindow.cpp deleted file mode 100644 index 4ad5eb8..0000000 --- a/gui1/module/targetlist/mainwindow.cpp +++ /dev/null @@ -1,154 +0,0 @@ -#include "mainwindow.h" -#include "ui_mainwindow.h" -#include "targetmaker.h" -#include "targetlist.h" -#include -#include -#include -#include - -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindow) -{ - colCount = 5; - ui->setupUi(this); - targetList = new TargetList(ui->targetListTable); - connect(ui->targetListTable->horizontalHeader(), SIGNAL(sectionClicked(int)), - this, SLOT(sort(int))); - - // Set row size - ui->targetListTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed); - ui->targetListTable->horizontalHeader()->setDefaultSectionSize(150); - ui->targetListTable->horizontalHeader()->setMinimumSectionSize(100); - ui->targetListTable->verticalHeader()->setDefaultSectionSize(100); - //ui->targetListTable->setStyleSheet("QTableWidget {selection-background-color: #00000000; selection-color: white}"); -} - -MainWindow::~MainWindow() -{ - delete ui; -} - -void MainWindow::on_newItem_clicked() -{ - targetMaker = new TargetMaker(this); - targetMaker->setModal(true); - targetMaker->setWindowTitle("Create New Target"); - targetMaker->exec(); - if (targetMaker->accepted) { - targetList->addNewRow(targetMaker->getImageFilePath(), targetMaker->getName(), targetMaker->getCoord(), targetMaker->getDesc()); - } -} - -void MainWindow::on_deleteButton_clicked() -{ - QItemSelectionModel *select = ui->targetListTable->selectionModel(); - QModelIndexList selectedRows = select->selectedRows(); - QList deletionOrder; - - if (select->hasSelection()) { - // Makes sure everything is deleted in the correct order - for (QList::iterator i = selectedRows.begin(); i != selectedRows.end(); i++) { - deletionOrder.append(i->row()); - } - qSort(deletionOrder.begin(), deletionOrder.end()); - - for (int i = 0, decrement = 0; i < deletionOrder.length(); i++, decrement++) { - targetList->deleteRow(deletionOrder[i] - decrement); - } - ui->targetListTable->selectionModel()->clearSelection(); // Deselects all rows - } -} - -void MainWindow::on_edit_clicked() -{ - QItemSelectionModel *select = ui->targetListTable->selectionModel(); - QModelIndexList selectedRows = select->selectedRows(); - - if (select->hasSelection() && selectedRows.length() == 1) { // only 1 item can be selected - QList::iterator i = selectedRows.begin(); - int selectedRow = i->row(); // gets the selected row number - - // Creates edit window - targetEditor = new TargetMaker(this); - targetEditor->setModal(true); - targetEditor->setWindowTitle("Edit Target"); - - // Sets default values - targetEditor->defaultFileInput = targetList->rows->at(selectedRow)->imageFilePath; - targetEditor->defaultNameInput = targetList->rows->at(selectedRow)->name->text(); - targetEditor->defaultCoordInput = targetList->rows->at(selectedRow)->coord->text(); - targetEditor->defaultDescInput = targetList->rows->at(selectedRow)->desc->text(); - targetEditor->setDefaultInputs(); - - // Opens edit window - targetEditor->exec(); - - if (targetEditor->accepted) { - targetList->editRow(selectedRow, targetEditor->getImageFilePath(), targetEditor->getName(), targetEditor->getCoord(), targetEditor->getDesc()); - } - } -} - -void MainWindow::on_upButton_clicked() -{ - QItemSelectionModel *select = ui->targetListTable->selectionModel(); - QModelIndexList selectedRows = select->selectedRows(); - QList moveOrder; - - if (select->hasSelection()) { - // Makes sure everything is moved in the correct order - for (QList::iterator i = selectedRows.begin(); i != selectedRows.end(); i++) { - moveOrder.append(i->row()); - } - qSort(moveOrder.begin(), moveOrder.end()); - - ui->targetListTable->selectionModel()->clearSelection(); // Deselects all rows - QItemSelection selectedItems = ui->targetListTable->selectionModel()->selection(); - if (moveOrder[0] != 0) { - for (int i = 0; i < moveOrder.length(); i++) { - ui->targetListTable->selectRow(moveOrder[i]-1); - selectedItems.merge(ui->targetListTable->selectionModel()->selection(), QItemSelectionModel::Select); - - targetList->moveUp(moveOrder[i]); - } - ui->targetListTable->selectionModel()->select(selectedItems, QItemSelectionModel::Select); // Reselects new rows - } - } -} - -void MainWindow::on_downButton_clicked() -{ - QItemSelectionModel *select = ui->targetListTable->selectionModel(); - QModelIndexList selectedRows = select->selectedRows(); - QList moveOrder; - - if (select->hasSelection()) { - // Makes sure everything is moved in the correct order - for (QList::iterator i = selectedRows.begin(); i != selectedRows.end(); i++) { - moveOrder.append(i->row()); - } - qSort(moveOrder.begin(), moveOrder.end(), qGreater()); - - ui->targetListTable->selectionModel()->clearSelection(); // Deselects all rows - QItemSelection selectedItems = ui->targetListTable->selectionModel()->selection(); - if (moveOrder[0] != targetList->rows->length()-1) { - for (int i = 0; i < moveOrder.length(); i++) { - ui->targetListTable->selectRow(moveOrder[i]+1); - selectedItems.merge(ui->targetListTable->selectionModel()->selection(), QItemSelectionModel::Select); - - targetList->moveDown(moveOrder[i]); - } - ui->targetListTable->selectionModel()->select(selectedItems, QItemSelectionModel::Select); // Reselects new rows - } - } -} - -void MainWindow::sort(int col) -{ - if (col == 1) { - targetList->sortName(0, targetList->rows->length()-1); - targetList->refreshTable(); - } -} diff --git a/gui1/module/targetlist/mainwindow.h b/gui1/module/targetlist/mainwindow.h deleted file mode 100644 index 642f764..0000000 --- a/gui1/module/targetlist/mainwindow.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include -#include "targetmaker.h" -#include "targetlist.h" - -namespace Ui { -class MainWindow; -} - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit MainWindow(QWidget *parent = 0); - Ui::MainWindow *ui; - TargetList *targetList; - int colCount; - ~MainWindow(); - -private slots: - void on_newItem_clicked(); - - void on_deleteButton_clicked(); - - void on_edit_clicked(); - - void on_upButton_clicked(); - - void on_downButton_clicked(); - - void sort(int col); - -private: - TargetMaker *targetMaker; - TargetMaker *targetEditor; -}; - -#endif // MAINWINDOW_H diff --git a/gui1/module/targetlist/mainwindow.ui b/gui1/module/targetlist/mainwindow.ui deleted file mode 100644 index ba1fa1b..0000000 --- a/gui1/module/targetlist/mainwindow.ui +++ /dev/null @@ -1,245 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 880 - 500 - - - - MainWindow - - - false - - - - - - - 0 - - - - - <html><head/><body><p>Shortcut: <span style=" font-weight:600;">ctrl+n</span></p></body></html> - - - New Item - - - - :/files/round75.png:/files/round75.png - - - - 30 - 30 - - - - Ctrl+N - - - - - - - <html><head/><body><p>Shortcut: <span style=" font-weight:600;">ctrl+e</span></p></body></html> - - - Edit - - - - :/files/clasic.png:/files/clasic.png - - - - 30 - 40 - - - - Ctrl+E - - - - - - - <html><head/><body><p>Shortcut: <span style=" font-weight:600;">del</span></p></body></html> - - - Delete - - - - :/files/delete85.png:/files/delete85.png - - - - 30 - 30 - - - - Del - - - - - - - <html><head/><body><p>Shortcut: <span style=" font-weight:600;">Up Key</span></p></body></html> - - - Up - - - - :/files/up.png:/files/up.png - - - - 30 - 30 - - - - Up - - - - - - - <html><head/><body><p>Shortcut: <span style=" font-weight:600;">Down Key</span></p></body></html> - - - Down - - - - :/files/down.png:/files/down.png - - - - 30 - 30 - - - - Down - - - - - - - - - - 11 - - - - false - - - QAbstractItemView::ExtendedSelection - - - QAbstractItemView::SelectRows - - - - 0 - 0 - - - - false - - - false - - - false - - - true - - - false - - - false - - - - - - - - - Name - - - - Segoe UI - 11 - - - - - - Coordinates - - - - Segoe UI - 11 - - - - - - Description - - - - Segoe UI - 11 - - - - - - - - - - TopToolBarArea - - - false - - - - - - Export - - - - - - - - - diff --git a/gui1/module/targetlist/round75.png b/gui1/module/targetlist/round75.png deleted file mode 100644 index 9f1762484b3a15b1e55af762806e19d3b71da07a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7647 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 RFv{O*CI$%jbA6ZS{{o|x(s2L) diff --git a/gui1/module/targetlist/target.cpp b/gui1/module/targetlist/target.cpp deleted file mode 100644 index 698821b..0000000 --- a/gui1/module/targetlist/target.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "target.h" - -Target::Target() -{ - -} diff --git a/gui1/module/targetlist/target.h b/gui1/module/targetlist/target.h deleted file mode 100644 index 6f1a2df..0000000 --- a/gui1/module/targetlist/target.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef TARGET_H -#define TARGET_H - -class Target -{ -public: - Target(); - QString name; - QString description; - QString coordinates; -}; - -#endif // TARGET_H diff --git a/gui1/module/targetlist/targetlist.cpp b/gui1/module/targetlist/targetlist.cpp deleted file mode 100644 index 76ad888..0000000 --- a/gui1/module/targetlist/targetlist.cpp +++ /dev/null @@ -1,159 +0,0 @@ -#include "targetlist.h" -#include "targetlistitem.h" -#include -#include -#include -#include - -TargetList::TargetList(QTableWidget *targetListTable) -{ - table = targetListTable; - - rows = new QList; - defaultImagePath = ":/files/Untitled.png"; -} - - -void TargetList::refreshTable() -{ - // Empty the table first - for (int row = 0; row < table->rowCount(); row++) { - table->takeItem(row, 0); - table->takeItem(row, 1); - table->takeItem(row, 2); - table->takeItem(row, 3); - } - - int rowCount = rows->length(); - table->setRowCount(rowCount); - - // Insert table items - for (int row = 0; row < rowCount; row++) { - // Preview Image - table->setItem(row, 0, rows->at(row)->image); - - // Name - table->setItem(row, 1, rows->at(row)->name); - - // Coordinates - table->setItem(row, 2, rows->at(row)->coord); - - // Description - table->setItem(row, 3, rows->at(row)->desc); - } -} - -void TargetList::addNewRow(QString fileName, QString name, QString coordinates, QString description) -{ - // Creates image preview item - QTableWidgetItem *image = new QTableWidgetItem(); - QBrush brush; - QImage brushImage; - if (fileName == "") - brushImage.load(defaultImagePath); - else - brushImage.load(fileName); - // Resize image - int width = 150; - int height = 100; - QImage scaledBrushImage = brushImage.scaled(width, height, Qt::IgnoreAspectRatio); - // Apply resized image - brush.setTextureImage(scaledBrushImage); - image->setBackground(brush); - - // Creates name item - QFont font("Segoe UI", 11, QFont::Bold); - QTableWidgetItem *nameItem = new QTableWidgetItem(); - nameItem->setText(name); - nameItem->setFont(font); - - // Creates coordinate item - QTableWidgetItem *coordItem = new QTableWidgetItem(); - coordItem->setText(coordinates); - - // Creates description item - QTableWidgetItem *descItem = new QTableWidgetItem(); - descItem->setText(description); - - // Places item in a TargetListItem and adds it to the target list - TargetListItem *newItem = new TargetListItem(image, nameItem, coordItem, descItem); - newItem->imageFilePath = fileName; - rows->prepend(newItem); - - refreshTable(); -} - -void TargetList::editRow(int row, QString fileName, QString name, QString coordinates, QString description) -{ - // Creates image preview item - QBrush brush; - QImage brushImage; - if (fileName == "") - brushImage.load(defaultImagePath); - else - brushImage.load(fileName); - // Resize image - int width = 150; - int height = 100; - QImage scaledBrushImage = brushImage.scaled(width, height, Qt::IgnoreAspectRatio); - // Apply resized image - brush.setTextureImage(scaledBrushImage); - - rows->at(row)->image->setBackground(brush); - rows->at(row)->name->setText(name); - rows->at(row)->coord->setText(coordinates); - rows->at(row)->desc->setText(description); - - refreshTable(); -} - -void TargetList::deleteRow(int row) -{ - rows->removeAt(row); - - refreshTable(); -} - -void TargetList::moveUp(int row) -{ - if (row-1 >= 0) { - rows->move(row, row-1); - - refreshTable(); - } -} - -void TargetList::moveDown(int row) -{ - if (row+1 <= rows->length()-1) { - rows->swap(row, row+1); - - refreshTable(); - } -} - -void TargetList::sortName(int low, int high) -{ - const int MOVING_LEFT = 0; - const int MOVING_RIGHT = 1; - if (low < high) { - int left = low, right = high, currentDirection = MOVING_LEFT; - QString pivot = rows->at(low)->name->text(); - while (left < right) { - if (currentDirection == MOVING_LEFT) { - while (QString::compare(rows->at(right)->name->text(), pivot, Qt::CaseInsensitive) >= 0 && left < right) - right--; - rows->swap(left, right); - currentDirection = MOVING_RIGHT; - } - if (currentDirection == MOVING_RIGHT) { - while (QString::compare(rows->at(left)->name->text(), pivot, Qt::CaseInsensitive) <= 0 && left < right) - left++; - rows->swap(right, left); - currentDirection = MOVING_LEFT; - } - } - sortName(low, left-1); - sortName(right+1, high); - } -} diff --git a/gui1/module/targetlist/targetlist.h b/gui1/module/targetlist/targetlist.h deleted file mode 100644 index 91043b9..0000000 --- a/gui1/module/targetlist/targetlist.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef TARGETLIST_H -#define TARGETLIST_H -#include "targetlistitem.h" - -class TargetList -{ -public: - TargetList(QTableWidget *targetListTable = 0); - ~TargetList(); - QList *rows; //= new QList; - QTableWidget *table; - QString defaultImagePath; // = ":/files/Untitled.png"; - void addNewRow(QString fileName, QString name, QString coordinates, QString description); - void refreshTable(); - void editRow(int row, QString fileName, QString name, QString coordinates, QString description); - void deleteRow(int row); - void moveUp(int row); - void moveDown(int row); - void sortName(int low, int high); -}; - -#endif // TARGETLIST_H diff --git a/gui1/module/targetlist/targetlist.pro b/gui1/module/targetlist/targetlist.pro deleted file mode 100644 index 59ce410..0000000 --- a/gui1/module/targetlist/targetlist.pro +++ /dev/null @@ -1,30 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2014-11-05T19:15:33 -# -#------------------------------------------------- - -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = targetlist -TEMPLATE = app - - -SOURCES +=\ - mainwindow.cpp \ - targetmaker.cpp \ - targetlist.cpp \ - targetlistitem.cpp - -HEADERS += mainwindow.h \ - targetmaker.h \ - targetlist.h \ - targetlistitem.h - -FORMS += mainwindow.ui \ - targetmaker.ui - -RESOURCES += \ - Resources.qrc diff --git a/gui1/module/targetlist/targetlist.pro.user b/gui1/module/targetlist/targetlist.pro.user deleted file mode 100644 index d438146..0000000 --- a/gui1/module/targetlist/targetlist.pro.user +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - 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/groundstation/targetlist/build-targetlist-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/groundstation/targetlist/build-targetlist-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 - - targetlist - - Qt4ProjectManager.Qt4RunConfiguration:C:/Jesse/groundstation/groundstation/targetlist/targetlist/targetlist.pro - - targetlist.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 16 - - - Version - 16 - - diff --git a/gui1/module/targetlist/targetlist.pro.user.875b11c b/gui1/module/targetlist/targetlist.pro.user.875b11c deleted file mode 100644 index 45d20f5..0000000 --- a/gui1/module/targetlist/targetlist.pro.user.875b11c +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - EnvironmentId - {875b11cd-4554-4733-a8ee-880bfa91e377} - - - 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 MinGW 32bit - Desktop Qt 5.3 MinGW 32bit - qt.53.win32_mingw482_kit - 0 - 0 - 0 - - C:/Users/Davis/Desktop/UAV/groundstation/groundstation/targetlist/build-targetlist-Desktop_Qt_5_3_MinGW_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:/Users/Davis/Desktop/UAV/groundstation/groundstation/targetlist/build-targetlist-Desktop_Qt_5_3_MinGW_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 - - targetlist - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Davis/Desktop/UAV/groundstation/groundstation/targetlist/targetlist/targetlist.pro - - targetlist.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 16 - - - Version - 16 - - diff --git a/gui1/module/targetlist/targetlistitem.cpp b/gui1/module/targetlist/targetlistitem.cpp deleted file mode 100644 index a7a09ee..0000000 --- a/gui1/module/targetlist/targetlistitem.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "targetlistitem.h" - -TargetListItem::TargetListItem(QTableWidgetItem *i, QTableWidgetItem *n, QTableWidgetItem *c, QTableWidgetItem *d) -{ - image = i; - name = n; - coord = c; - desc = d; - - imageFilePath = ""; -} - -TargetListItem::~TargetListItem() -{ - delete image; - delete name; - delete coord; - delete desc; -} diff --git a/gui1/module/targetlist/targetlistitem.h b/gui1/module/targetlist/targetlistitem.h deleted file mode 100644 index e26cdb1..0000000 --- a/gui1/module/targetlist/targetlistitem.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef TARGETLISTITEM_H -#define TARGETLISTITEM_H -#include -#include -#include - -class TargetListItem -{ -public: - TargetListItem(QTableWidgetItem *i, QTableWidgetItem *n, QTableWidgetItem *c, QTableWidgetItem *d); - QString imageFilePath; //= ""; - QTableWidgetItem *image; - QTableWidgetItem *name; - QTableWidgetItem *coord; - QTableWidgetItem *desc; - ~TargetListItem(); -}; - -#endif // TARGETLISTITEM_H diff --git a/gui1/module/targetlist/targetmaker.cpp b/gui1/module/targetlist/targetmaker.cpp deleted file mode 100644 index 0e26b4b..0000000 --- a/gui1/module/targetlist/targetmaker.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include "targetmaker.h" -#include "ui_targetmaker.h" -#include "mainwindow.h" -#include -#include - -TargetMaker::TargetMaker(QWidget *parent) : - QDialog(parent), - ui(new Ui::TargetMaker) -{ - ui->setupUi(this); - - accepted = false; - defaultNameInput = ""; - defaultCoordInput = ""; - defaultDescInput = ""; - defaultFileInput = ""; -} - -TargetMaker::~TargetMaker() -{ - delete ui; -} - -void TargetMaker::on_buttonBox_accepted() -{ - accepted = true; -} - -QString TargetMaker::getImageFilePath() -{ - return ui->fileInput->text(); -} - -QString TargetMaker::getName() -{ - return ui->nameInput->text(); -} - -QString TargetMaker::getDesc() -{ - return ui->descriptionInput->toPlainText(); -} - -QString TargetMaker::getCoord() -{ - return ui->coordinateInput->text(); -} - - -void TargetMaker::on_buttonBox_rejected() -{ - accepted = false; -} - -void TargetMaker::setDefaultInputs() -{ - ui->fileInput->setText(defaultFileInput); - ui->nameInput->setText(defaultNameInput); - ui->coordinateInput->setText(defaultCoordInput); - ui->descriptionInput->setText(defaultDescInput); -} - -void TargetMaker::on_toolButton_clicked() -{ - // Creates file selection dialog - QFileDialog fileDialog(NULL, tr("Select Preview Image")); - fileDialog.setNameFilter(tr("Images (*.png *.bmp *.jpg)")); - fileDialog.setModal(true); - QString fileName = ""; - fileDialog.exec(); - - // Sets text - if (fileDialog.selectedFiles().length() > 0) - fileName = fileDialog.selectedFiles().at(0); - ui->fileInput->setText(fileName); -} diff --git a/gui1/module/targetlist/targetmaker.h b/gui1/module/targetlist/targetmaker.h deleted file mode 100644 index b710071..0000000 --- a/gui1/module/targetlist/targetmaker.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef TARGETMAKER_H -#define TARGETMAKER_H - -#include - -namespace Ui { -class TargetMaker; -} - -class TargetMaker : public QDialog -{ - Q_OBJECT - -public: - explicit TargetMaker(QWidget *parent = 0); - ~TargetMaker(); - bool accepted; // = false; - QString defaultNameInput; // = ""; - QString defaultCoordInput; // = ""; - QString defaultDescInput; // = ""; - QString defaultFileInput; // = ""; - QString getName(); - QString getDesc(); - QString getCoord(); - QString getImageFilePath(); - void setDefaultInputs(); - -private slots: - void on_buttonBox_accepted(); - - void on_buttonBox_rejected(); - - void on_toolButton_clicked(); - -private: - Ui::TargetMaker *ui; -}; - -#endif // TARGETMAKER_H diff --git a/gui1/module/targetlist/targetmaker.ui b/gui1/module/targetlist/targetmaker.ui deleted file mode 100644 index 1859a3e..0000000 --- a/gui1/module/targetlist/targetmaker.ui +++ /dev/null @@ -1,198 +0,0 @@ - - - TargetMaker - - - - 0 - 0 - 400 - 250 - - - - Dialog - - - - - - - - - 85 - 0 - - - - - 75 - true - - - - Preview Image - - - - - - - - - - Browse - - - - - - - - - - - - 85 - 0 - - - - - 75 - true - - - - Name - - - - - - - - - - - - - - - 85 - 0 - - - - - 75 - true - - - - Coordinates - - - - - - - - - - - - - - - 85 - 0 - - - - - 75 - true - - - - Description - - - - - - - - - - - - - - - 85 - 0 - - - - - 75 - true - - - - Category - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - TargetMaker - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - TargetMaker - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/gui1/module/targetlist/up.png b/gui1/module/targetlist/up.png deleted file mode 100644 index 2ce6abe8445259079b087faa96ed0427fc7e6b30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4050 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