jfjoch_viewer: Make directory structure a bit clearer

viewer/CMakeLists.txt

@@ -10,10 +10,10 @@ FIND_PACKAGE(Qt6 COMPONENTS Core Gui Widgets Charts DBus 3DCore 3DRender 3DInput
 ADD_EXECUTABLE(jfjoch_viewer jfjoch_viewer.cpp JFJochViewerWindow.cpp JFJochViewerWindow.h
         JFJochViewerMenu.cpp
         JFJochViewerMenu.h
-        widgets/JFJochDiffractionImage.cpp
-        widgets/JFJochDiffractionImage.h
-        widgets/JFJochSimpleImage.cpp
-        widgets/JFJochSimpleImage.h
+        image_viewer/JFJochDiffractionImage.cpp
+        image_viewer/JFJochDiffractionImage.h
+        image_viewer/JFJochSimpleImage.cpp
+        image_viewer/JFJochSimpleImage.h
         JFJochImageReadingWorker.cpp
         JFJochImageReadingWorker.h
         JFJochViewerDatasetInfo.cpp
@@ -22,12 +22,12 @@ ADD_EXECUTABLE(jfjoch_viewer jfjoch_viewer.cpp JFJochViewerWindow.cpp JFJochView
         JFJochViewerSidePanel.h
         widgets/TitleLabel.cpp
         widgets/TitleLabel.h
-        widgets/JFJochChartView.cpp
-        widgets/JFJochChartView.h
-        JFJochViewerImageStatistics.cpp
-        JFJochViewerImageStatistics.h
-        widgets/JFJochSimpleChartView.cpp
-        widgets/JFJochSimpleChartView.h
+        charts/JFJochChartView.cpp
+        charts/JFJochChartView.h
+        widgets/JFJochViewerImageStatistics.cpp
+        widgets/JFJochViewerImageStatistics.h
+        charts/JFJochSimpleChartView.cpp
+        charts/JFJochSimpleChartView.h
         JFJochViewerStatusBar.cpp
         JFJochViewerStatusBar.h
         windows/JFJochViewerImageListWindow.cpp
@@ -44,20 +44,20 @@ ADD_EXECUTABLE(jfjoch_viewer jfjoch_viewer.cpp JFJochViewerWindow.cpp JFJochView
         widgets/NumberLineEdit.h
         widgets/SliderPlusBox.cpp
         widgets/SliderPlusBox.h
-        JFJochViewerSidePanelChart.cpp
-        JFJochViewerSidePanelChart.h
+        widgets/JFJochViewerSidePanelChart.cpp
+        widgets/JFJochViewerSidePanelChart.h
         windows/JFJochViewerSpotListWindow.cpp
         windows/JFJochViewerSpotListWindow.h
-        widgets/JFJochAzIntImage.cpp
-        widgets/JFJochAzIntImage.h
+        image_viewer/JFJochAzIntImage.cpp
+        image_viewer/JFJochAzIntImage.h
         windows/JFJochViewerReflectionListWindow.cpp
         windows/JFJochViewerReflectionListWindow.h
-        JFJochViewerImageROIStatistics.cpp
-        JFJochViewerImageROIStatistics.h
-        JFJochViewerImageROIStatistics_Box.cpp
-        JFJochViewerImageROIStatistics_Box.h
-        JFJochViewerImageROIStatistics_Circle.cpp
-        JFJochViewerImageROIStatistics_Circle.h
+        widgets/JFJochViewerImageROIStatistics.cpp
+        widgets/JFJochViewerImageROIStatistics.h
+        widgets/JFJochViewerImageROIStatistics_Box.cpp
+        widgets/JFJochViewerImageROIStatistics_Box.h
+        widgets/JFJochViewerImageROIStatistics_Circle.cpp
+        widgets/JFJochViewerImageROIStatistics_Circle.h
         toolbar/JFJochViewerToolbarImage.cpp
         toolbar/JFJochViewerToolbarImage.h
         toolbar/JFJochViewerToolbarDisplay.cpp
@@ -67,14 +67,14 @@ ADD_EXECUTABLE(jfjoch_viewer jfjoch_viewer.cpp JFJochViewerWindow.cpp JFJochView
         windows/JFJochCalibrationWindow.h
         windows/JFJochHelperWindow.cpp
         windows/JFJochHelperWindow.h
-        widgets/JFJochImage.cpp
-        widgets/JFJochImage.h
+        image_viewer/JFJochImage.cpp
+        image_viewer/JFJochImage.h
         windows/JFJochAzIntWindow.cpp
         windows/JFJochAzIntWindow.h
         windows/JFJoch2DAzintImageWindow.cpp
         windows/JFJoch2DAzintImageWindow.h
-        JFJochViewerROIResult.cpp
-        JFJochViewerROIResult.h
+        widgets/JFJochViewerROIResult.cpp
+        widgets/JFJochViewerROIResult.h
         widgets/ResolutionRingWidget.cpp
         widgets/ResolutionRingWidget.h
 )

viewer/JFJochViewerDatasetInfo.h

@@ -5,7 +5,7 @@
 #define JFJOCH_JFJOCHVIEWERDATASETINFO_H
 
 #include <QComboBox>
-#include "widgets/JFJochChartView.h"
+#include "charts/JFJochChartView.h"
 
 #include "../reader/JFJochReader.h"
 

viewer/JFJochViewerSidePanel.cpp

@@ -11,9 +11,9 @@
 
 #include "JFJochViewerSidePanel.h"
 
-#include "JFJochViewerImageROIStatistics.h"
+#include "widgets/JFJochViewerImageROIStatistics.h"
 #include "widgets/TitleLabel.h"
-#include "JFJochViewerImageStatistics.h"
+#include "widgets/JFJochViewerImageStatistics.h"
 #include "../image_analysis/geom_refinement/AssignSpotsToRings.h"
 
 JFJochViewerSidePanel::JFJochViewerSidePanel(QWidget *parent) : QWidget(parent) {

viewer/JFJochViewerSidePanel.h

@@ -9,10 +9,10 @@
 #include <QLineEdit>
 #include <QCheckBox>
 
-#include "JFJochViewerImageROIStatistics.h"
+#include "widgets/JFJochViewerImageROIStatistics.h"
 #include "../reader/JFJochReader.h"
-#include "widgets/JFJochSimpleChartView.h"
-#include "JFJochViewerSidePanelChart.h"
+#include "charts/JFJochSimpleChartView.h"
+#include "widgets/JFJochViewerSidePanelChart.h"
 #include "widgets/ResolutionRingWidget.h"
 class JFJochViewerSidePanel : public QWidget {
     Q_OBJECT

viewer/JFJochViewerWindow.cpp

@@ -7,7 +7,7 @@
 #include <QThread>
 
 #include "JFJochImageReadingWorker.h"
-#include "widgets/JFJochDiffractionImage.h"
+#include "image_viewer/JFJochDiffractionImage.h"
 #include "JFJochViewerSidePanel.h"
 #include "JFJochViewerStatusBar.h"
 #include "../common/CUDAWrapper.h"

viewer/widgets/JFJochViewerImageROIStatistics.h

@@ -9,11 +9,11 @@
 #include <QRadioButton>
 #include <QButtonGroup>
 
-#include "JFJochImageReadingWorker.h"
+#include "../JFJochImageReadingWorker.h"
 #include "JFJochViewerImageROIStatistics_Box.h"
 #include "JFJochViewerImageROIStatistics_Circle.h"
 #include "JFJochViewerROIResult.h"
-#include "../reader/JFJochReaderImage.h"
+#include "../../reader/JFJochReaderImage.h"
 
 class JFJochViewerImageROIStatistics : public QWidget {
     Q_OBJECT

viewer/widgets/JFJochViewerImageROIStatistics_Box.h

@@ -6,7 +6,7 @@
 
 #include <QWidget>
 
-#include "widgets/NumberLineEdit.h"
+#include "NumberLineEdit.h"
 
 class JFJochViewerImageROIStatistics_Box : public QWidget {
     Q_OBJECT

viewer/widgets/JFJochViewerImageROIStatistics_Circle.h

@@ -6,7 +6,7 @@
 
 #include <QWidget>
 
-#include "widgets/NumberLineEdit.h"
+#include "NumberLineEdit.h"
 
 struct CircleSettings {
     double x, y, r;

viewer/widgets/JFJochViewerImageStatistics.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "JFJochViewerImageStatistics.h"
-#include "../common/time_utc.h"
+#include "../../common/time_utc.h"
 #include <QFormLayout>
 #include <QRegularExpression>
 

viewer/widgets/JFJochViewerImageStatistics.h

@@ -6,7 +6,7 @@
 
 #include <QWidget>
 #include <QLabel>
-#include "../reader/JFJochReader.h"
+#include "../../reader/JFJochReader.h"
 
 class JFJochViewerImageStatistics : public QWidget {
     Q_OBJECT

viewer/widgets/JFJochViewerROIResult.h

@@ -6,7 +6,7 @@
 
 #include <QWidget>
 #include <QLabel>
-#include "../common/JFJochMessages.h"
+#include "../../common/JFJochMessages.h"
 
 class JFJochViewerROIResult : public QWidget{
     Q_OBJECT

viewer/widgets/JFJochViewerSidePanelChart.h

@@ -8,9 +8,9 @@
 #include <QComboBox>
 #include <QStackedWidget>
 
-#include "../reader/JFJochReaderImage.h"
-#include "widgets/JFJochSimpleChartView.h"
-#include "widgets/JFJochAzIntImage.h"
+#include "../../reader/JFJochReaderImage.h"
+#include "../charts/JFJochSimpleChartView.h"
+#include "../image_viewer/JFJochAzIntImage.h"
 
 class JFJochViewerSidePanelChart : public QWidget {
     Q_OBJECT

viewer/widgets/ResolutionRingWidget.h

@@ -9,7 +9,7 @@
 #include <QRadioButton>
 #include <QLineEdit>
 
-#include "JFJochDiffractionImage.h"
+#include "../image_viewer/JFJochDiffractionImage.h"
 
 
 class ResolutionRingWidget : public QWidget {

viewer/windows/JFJoch2DAzintImageWindow.cpp

@@ -3,7 +3,7 @@
 
 #include <QStatusBar>
 #include "JFJoch2DAzintImageWindow.h"
-#include "../JFJochViewerROIResult.h"
+#include "../widgets/JFJochViewerROIResult.h"
 
 JFJoch2DAzintImageWindow::JFJoch2DAzintImageWindow(QWidget *parent) : JFJochHelperWindow(parent) {
     QWidget *centralWidget = new QWidget(this);

viewer/windows/JFJoch2DAzintImageWindow.h

@@ -8,7 +8,7 @@
 
 #include "../widgets/SliderPlusBox.h"
 #include "JFJochHelperWindow.h"
-#include "../widgets/JFJochAzIntImage.h"
+#include "../image_viewer/JFJochAzIntImage.h"
 
 class JFJoch2DAzintImageWindow : public JFJochHelperWindow {
     Q_OBJECT

viewer/windows/JFJochCalibrationWindow.cpp

@@ -7,7 +7,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 
-#include "../JFJochViewerROIResult.h"
+#include "../widgets/JFJochViewerROIResult.h"
 
 JFJochCalibrationWindow::JFJochCalibrationWindow(QWidget *parent) : JFJochHelperWindow(parent) {
     QWidget *centralWidget = new QWidget(this);

viewer/windows/JFJochCalibrationWindow.h

@@ -9,7 +9,7 @@
 #include <QStatusBar>
 
 #include "JFJochHelperWindow.h"
-#include "../widgets/JFJochSimpleImage.h"
+#include "../image_viewer/JFJochSimpleImage.h"
 #include "../../reader/JFJochReaderDataset.h"
 #include "../SimpleImage.h"
 #include "../widgets/SliderPlusBox.h"