From 026b74cb9b3e93e9243254558d1dfefd33706ac4 Mon Sep 17 00:00:00 2001 From: mingf2 <fm140905@gmail.com> Date: Sun, 23 May 2021 02:44:58 -0500 Subject: [PATCH] reorganize --- .DS_Store | Bin 8196 -> 0 bytes .gitignore | 4 + MainWindow.h => Headers/MainWindow.h | 0 qrootcanvas.h => Headers/qrootcanvas.h | 0 .../readerwriterqueue}/LICENSE.md | 0 .../readerwriterqueue}/README.md | 0 .../readerwriterqueue}/atomicops.h | 0 .../readerwritercircularbuffer.h | 0 .../readerwriterqueue}/readerwriterqueue.h | 0 reconstruction.h => Headers/reconstruction.h | 0 setup.h => Headers/setup.h | 0 worker.h => Headers/worker.h | 0 QtRoot.pro.user | 355 ------------------ README.md | 30 +- MainWindow.cpp => Sources/MainWindow.cpp | 2 +- main.cpp => Sources/main.cpp | 0 qrootcanvas.cpp => Sources/qrootcanvas.cpp | 0 .../reconstruction.cpp | 0 setup.cpp => Sources/setup.cpp | 0 worker.cpp => Sources/worker.cpp | 2 +- QtRoot.pro => imagerQt.pro | 38 +- 21 files changed, 43 insertions(+), 388 deletions(-) delete mode 100644 .DS_Store create mode 100644 .gitignore rename MainWindow.h => Headers/MainWindow.h (100%) rename qrootcanvas.h => Headers/qrootcanvas.h (100%) rename {readerwriterqueue => Headers/readerwriterqueue}/LICENSE.md (100%) rename {readerwriterqueue => Headers/readerwriterqueue}/README.md (100%) rename {readerwriterqueue => Headers/readerwriterqueue}/atomicops.h (100%) rename {readerwriterqueue => Headers/readerwriterqueue}/readerwritercircularbuffer.h (100%) rename {readerwriterqueue => Headers/readerwriterqueue}/readerwriterqueue.h (100%) rename reconstruction.h => Headers/reconstruction.h (100%) rename setup.h => Headers/setup.h (100%) rename worker.h => Headers/worker.h (100%) delete mode 100644 QtRoot.pro.user rename MainWindow.cpp => Sources/MainWindow.cpp (99%) rename main.cpp => Sources/main.cpp (100%) rename qrootcanvas.cpp => Sources/qrootcanvas.cpp (100%) rename reconstruction.cpp => Sources/reconstruction.cpp (100%) rename setup.cpp => Sources/setup.cpp (100%) rename worker.cpp => Sources/worker.cpp (96%) rename QtRoot.pro => imagerQt.pro (70%) diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index bc30e013150370403414cab2484901ad1e5524a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMyG{c!5F7(VctZh6c_mfEL!zNMP*PA(06#z;AdrCY3Uufi{()cM`}hEuwJo^w z#fd0*NUSA$9NV+rjL+w+1HkO`yK6uVK!sUwVVcE&B>j?0Y0S4Q5)Ju49UWZZYWKX? zDUH?!RX`O`1yli5Ko$543h>O9REeDXu2)M{Ko$6x3ds8*VHQk1W)AJEgM|$Nh!bqK ziFL*SmXml)J!TFql{Q`UU_90M5W_e+`x6;XOg&}}9UaEeVf@U-M<~Y5PF`Y%!=w(i zR0ULlvH}vjS8#zA&TyHJ-`nTCHv42dZ85LB*~A(!_c8v#vbyNuA;NtLxYc1?+GwGV zJKDQt?H<Q+laTX-)=VYm$xOuBX_05Dffq|L-Y5^mQo)1Sh^0Qx0w10NAC}|HQC=X_ zVIJ4Gp=v#9*P(Kk)UHJhbN4YrRICkWf7zRb5%wMfWnQVwb8b~<qx@i9<;g6p#&VoF z>RXgnb_)Ac^T4ZG=e-sc9^iR?XUq@caOOVO;utqYw%u3x?_C|vrkyrdw~ck?F4h8T zveUk1t%DP6(&8#Muu-&T<Y~=Yo1_v=Y@>laVx7-!H(<yf`(*H#PT0Wn+a2J<%zb8! zNzZ>PgBGg5uPHF@X0A#6-;Ce?|C)a~u_~Yne7^!_qH);R;XLkWE>9@2cEWtbEJ?;? m4lRX+43TyljuSurFl0UPeW}OHA$yqghk%tq3svAp6?g|Q%_tQB diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..20a9ab0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.DS_Store +*.pro.user +build +build/* diff --git a/MainWindow.h b/Headers/MainWindow.h similarity index 100% rename from MainWindow.h rename to Headers/MainWindow.h diff --git a/qrootcanvas.h b/Headers/qrootcanvas.h similarity index 100% rename from qrootcanvas.h rename to Headers/qrootcanvas.h diff --git a/readerwriterqueue/LICENSE.md b/Headers/readerwriterqueue/LICENSE.md similarity index 100% rename from readerwriterqueue/LICENSE.md rename to Headers/readerwriterqueue/LICENSE.md diff --git a/readerwriterqueue/README.md b/Headers/readerwriterqueue/README.md similarity index 100% rename from readerwriterqueue/README.md rename to Headers/readerwriterqueue/README.md diff --git a/readerwriterqueue/atomicops.h b/Headers/readerwriterqueue/atomicops.h similarity index 100% rename from readerwriterqueue/atomicops.h rename to Headers/readerwriterqueue/atomicops.h diff --git a/readerwriterqueue/readerwritercircularbuffer.h b/Headers/readerwriterqueue/readerwritercircularbuffer.h similarity index 100% rename from readerwriterqueue/readerwritercircularbuffer.h rename to Headers/readerwriterqueue/readerwritercircularbuffer.h diff --git a/readerwriterqueue/readerwriterqueue.h b/Headers/readerwriterqueue/readerwriterqueue.h similarity index 100% rename from readerwriterqueue/readerwriterqueue.h rename to Headers/readerwriterqueue/readerwriterqueue.h diff --git a/reconstruction.h b/Headers/reconstruction.h similarity index 100% rename from reconstruction.h rename to Headers/reconstruction.h diff --git a/setup.h b/Headers/setup.h similarity index 100% rename from setup.h rename to Headers/setup.h diff --git a/worker.h b/Headers/worker.h similarity index 100% rename from worker.h rename to Headers/worker.h diff --git a/QtRoot.pro.user b/QtRoot.pro.user deleted file mode 100644 index 2e68b0a..0000000 --- a/QtRoot.pro.user +++ /dev/null @@ -1,355 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE QtCreatorProject> -<!-- Written by QtCreator 4.13.1, 2021-05-22T16:19:08. --> -<qtcreator> - <data> - <variable>EnvironmentId</variable> - <value type="QByteArray">{cbed212d-cd7b-40ba-aa32-0cee8a73da99}</value> - </data> - <data> - <variable>ProjectExplorer.Project.ActiveTarget</variable> - <value type="int">0</value> - </data> - <data> - <variable>ProjectExplorer.Project.EditorSettings</variable> - <valuemap type="QVariantMap"> - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> - <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> - <value type="QString" key="language">Cpp</value> - <valuemap type="QVariantMap" key="value"> - <value type="QByteArray" key="CurrentPreferences">CppGlobal</value> - </valuemap> - </valuemap> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> - <value type="QString" key="language">QmlJS</value> - <valuemap type="QVariantMap" key="value"> - <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value> - </valuemap> - </valuemap> - <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> - <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> - <value type="int" key="EditorConfiguration.IndentSize">4</value> - <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> - <value type="int" key="EditorConfiguration.MarginColumn">80</value> - <value type="bool" key="EditorConfiguration.MouseHiding">true</value> - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> - <value type="int" key="EditorConfiguration.PaddingMode">1</value> - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> - <value type="bool" key="EditorConfiguration.ShowMargin">false</value> - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> - <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value> - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> - <value type="int" key="EditorConfiguration.TabSize">8</value> - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> - <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value> - <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> - <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.PluginSettings</variable> - <valuemap type="QVariantMap"> - <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks"> - <value type="bool" key="AutoTest.Framework.Boost">true</value> - <value type="bool" key="AutoTest.Framework.Catch">true</value> - <value type="bool" key="AutoTest.Framework.GTest">true</value> - <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value> - <value type="bool" key="AutoTest.Framework.QtTest">true</value> - </valuemap> - <valuemap type="QVariantMap" key="AutoTest.CheckStates"/> - <value type="int" key="AutoTest.RunAfterBuild">0</value> - <value type="bool" key="AutoTest.UseGlobal">true</value> - <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/> - <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value> - <value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.Questionable</value> - <valuemap type="QVariantMap" key="ClangTools"> - <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value> - <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value> - <value type="int" key="ClangTools.ParallelJobs">4</value> - <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/> - <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/> - <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/> - <value type="bool" key="ClangTools.UseGlobalSettings">true</value> - </valuemap> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.Target.0</variable> - <valuemap type="QVariantMap"> - <value type="QString" key="DeviceType">Desktop</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.10 GCC 64bit</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.10 GCC 64bit</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.51210.gcc_64_kit</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="bool">true</value> - <value type="int" key="EnableQmlDebugging">0</value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mingf2/projects/qtprojects/build-QtRoot-Desktop_Qt_5_12_10_GCC_64bit-Debug</value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/mingf2/projects/qtprojects/build-QtRoot-Desktop_Qt_5_12_10_GCC_64bit-Debug</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="int" key="QtQuickCompiler">2</value> - <value type="int" key="SeparateDebugInfo">2</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="bool">true</value> - <value type="int" key="EnableQmlDebugging">2</value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mingf2/projects/qtprojects/build-QtRoot-Desktop_Qt_5_12_10_GCC_64bit-Release</value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/mingf2/projects/qtprojects/build-QtRoot-Desktop_Qt_5_12_10_GCC_64bit-Release</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="int" key="QtQuickCompiler">0</value> - <value type="int" key="SeparateDebugInfo">2</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> - <value type="bool">true</value> - <value type="int" key="EnableQmlDebugging">0</value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mingf2/projects/qtprojects/build-QtRoot-Desktop_Qt_5_12_10_GCC_64bit-Profile</value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/mingf2/projects/qtprojects/build-QtRoot-Desktop_Qt_5_12_10_GCC_64bit-Profile</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="int" key="QtQuickCompiler">0</value> - <value type="int" key="SeparateDebugInfo">0</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/> - <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value> - <valuelist type="QVariantList" key="Analyzer.Perf.Events"> - <value type="QString">cpu-cycles</value> - </valuelist> - <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/> - <value type="int" key="Analyzer.Perf.Frequency">250</value> - <valuelist type="QVariantList" key="Analyzer.Perf.RecordArguments"> - <value type="QString">-e</value> - <value type="QString">cpu-cycles</value> - <value type="QString">--call-graph</value> - <value type="QString">dwarf,4096</value> - <value type="QString">-F</value> - <value type="QString">250</value> - </valuelist> - <value type="QString" key="Analyzer.Perf.SampleMode">-F</value> - <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value> - <value type="int" key="Analyzer.Perf.StackSize">4096</value> - <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value> - <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value> - <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value> - <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value> - <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value> - <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> - <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> - <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <valuelist type="QVariantList" key="CustomOutputParsers"/> - <value type="int" key="PE.EnvironmentAspect.Base">2</value> - <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/mingf2/projects/qtprojects/imagerQt/QtRoot.pro</value> - <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/mingf2/projects/qtprojects/imagerQt/QtRoot.pro</value> - <value type="QString" key="RunConfiguration.Arguments"></value> - <value type="bool" key="RunConfiguration.Arguments.multi">false</value> - <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value> - <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> - <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value> - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> - <value type="QString" key="RunConfiguration.WorkingDirectory"></value> - <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/mingf2/projects/qtprojects/build-QtRoot-Desktop_Qt_5_12_10_GCC_64bit-Debug</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.TargetCount</variable> - <value type="int">1</value> - </data> - <data> - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> - <value type="int">22</value> - </data> - <data> - <variable>Version</variable> - <value type="int">22</value> - </data> -</qtcreator> diff --git a/README.md b/README.md index 013239a..0ed0a9d 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -# QtRoot Project +# Simple GUI application for back projection image reconstruction -invoke root class in Qt Project. - -## Todo -### 2019-03-30 -- compile QRootCanvas lib -- write QRootCanvas widget. - -## Update -### 2019-03-30 -- Embedded TCanvas works well! (Linux Only. macOS not work. Windows not test.) -- [Single TCanvas Window](https://github.com/mission-young/QSingleTCanvas) works well on Linux,macOS. Windows not test. - -- TFile,TTree,Int_t(basic type),TString works well. -- class TRootEmbeddedCanvas is one the way. +## Use +- Install [ROOT](https://root.cern/install/) (v6.22 or above), `qmake` and `make`. +- Compile: + ```bash + mkdir -p build + cd build + qmake ../QtRoot.pro + make + ``` +- Run: +```bash + cd .. + build/QtRoot +``` diff --git a/MainWindow.cpp b/Sources/MainWindow.cpp similarity index 99% rename from MainWindow.cpp rename to Sources/MainWindow.cpp index 79809d9..3a0662c 100644 --- a/MainWindow.cpp +++ b/Sources/MainWindow.cpp @@ -284,7 +284,7 @@ void MainWindow::handleSaveAs() void MainWindow::handleClose() { - qDebug() << "Close clicked"; +// qDebug() << "Close clicked"; this->close(); } diff --git a/main.cpp b/Sources/main.cpp similarity index 100% rename from main.cpp rename to Sources/main.cpp diff --git a/qrootcanvas.cpp b/Sources/qrootcanvas.cpp similarity index 100% rename from qrootcanvas.cpp rename to Sources/qrootcanvas.cpp diff --git a/reconstruction.cpp b/Sources/reconstruction.cpp similarity index 100% rename from reconstruction.cpp rename to Sources/reconstruction.cpp diff --git a/setup.cpp b/Sources/setup.cpp similarity index 100% rename from setup.cpp rename to Sources/setup.cpp diff --git a/worker.cpp b/Sources/worker.cpp similarity index 96% rename from worker.cpp rename to Sources/worker.cpp index c240ac2..70c142b 100644 --- a/worker.cpp +++ b/Sources/worker.cpp @@ -40,7 +40,7 @@ void Worker::run() } } conefile.close(); - qDebug() << "Worker thread exited."; +// qDebug() << "Worker thread exited."; } void Worker::stopExecution() diff --git a/QtRoot.pro b/imagerQt.pro similarity index 70% rename from QtRoot.pro rename to imagerQt.pro index fcf4fb5..b43f37a 100644 --- a/QtRoot.pro +++ b/imagerQt.pro @@ -8,7 +8,7 @@ QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = QtRoot +TARGET = ImagerQt TEMPLATE = app # The following define makes your compiler emit warnings if you use @@ -22,25 +22,28 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +# No debug output +CONFIG(release, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT + CONFIG += c++11 SOURCES += \ - main.cpp \ - MainWindow.cpp \ - qrootcanvas.cpp \ - reconstruction.cpp \ - setup.cpp \ - worker.cpp + $$PWD/Sources/main.cpp \ + $$PWD/Sources/MainWindow.cpp \ + $$PWD/Sources/qrootcanvas.cpp \ + $$PWD/Sources/reconstruction.cpp \ + $$PWD/Sources/setup.cpp \ + $$PWD/Sources/worker.cpp HEADERS += \ - MainWindow.h \ - qrootcanvas.h \ - readerwriterqueue/atomicops.h \ - readerwriterqueue/readerwritercircularbuffer.h \ - readerwriterqueue/readerwriterqueue.h \ - reconstruction.h \ - setup.h \ - worker.h + $$PWD/Headers/MainWindow.h \ + $$PWD/Headers/qrootcanvas.h \ + $$PWD/Headers/readerwriterqueue/atomicops.h \ + $$PWD/Headers/readerwriterqueue/readerwritercircularbuffer.h \ + $$PWD/Headers/readerwriterqueue/readerwriterqueue.h \ + $$PWD/Headers/reconstruction.h \ + $$PWD/Headers/setup.h \ + $$PWD/Headers/worker.h FORMS += \ MainWindow.ui @@ -50,7 +53,9 @@ QMAKE_CXXFLAGS += -fopenmp LIBS += -fopenmp INCLUDEPATH += \ - $(ROOTSYS)/include + $(ROOTSYS)/include \ + $$PWD/Headers + LIBS += \ -L$(ROOTSYS)/lib -lCore -lImt -lRIO -lNet -lHist -lGraf \ -lGraf3d -lGpad -lTree -lTreePlayer -lRint -lPostscript -lMatrix \ @@ -64,6 +69,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target DISTFILES += \ + .gitignore \ README.md \ readerwriterqueue/LICENSE.md \ readerwriterqueue/README.md -- GitLab