From 1b87f2329cf0ee938e2efae13939e62f7ad00873 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Wed, 19 Nov 2025 13:03:17 +0100 Subject: [PATCH] jfjoch_viewer: Make directory structure a bit clearer --- viewer/CMakeLists.txt | 48 +++++++++---------- viewer/JFJochViewerDatasetInfo.h | 2 +- viewer/JFJochViewerSidePanel.cpp | 4 +- viewer/JFJochViewerSidePanel.h | 6 +-- viewer/JFJochViewerWindow.cpp | 2 +- .../{widgets => charts}/JFJochChartView.cpp | 0 viewer/{widgets => charts}/JFJochChartView.h | 0 .../JFJochSimpleChartView.cpp | 0 .../JFJochSimpleChartView.h | 0 .../JFJochAzIntImage.cpp | 0 .../JFJochAzIntImage.h | 0 .../JFJochDiffractionImage.cpp | 0 .../JFJochDiffractionImage.h | 0 .../{widgets => image_viewer}/JFJochImage.cpp | 0 .../{widgets => image_viewer}/JFJochImage.h | 0 .../JFJochSimpleImage.cpp | 0 .../JFJochSimpleImage.h | 0 .../JFJochViewerImageROIStatistics.cpp | 0 .../JFJochViewerImageROIStatistics.h | 4 +- .../JFJochViewerImageROIStatistics_Box.cpp | 0 .../JFJochViewerImageROIStatistics_Box.h | 2 +- .../JFJochViewerImageROIStatistics_Circle.cpp | 0 .../JFJochViewerImageROIStatistics_Circle.h | 2 +- .../JFJochViewerImageStatistics.cpp | 2 +- .../JFJochViewerImageStatistics.h | 2 +- .../{ => widgets}/JFJochViewerROIResult.cpp | 0 viewer/{ => widgets}/JFJochViewerROIResult.h | 2 +- .../JFJochViewerSidePanelChart.cpp | 0 .../JFJochViewerSidePanelChart.h | 6 +-- viewer/widgets/ResolutionRingWidget.h | 2 +- viewer/windows/JFJoch2DAzintImageWindow.cpp | 2 +- viewer/windows/JFJoch2DAzintImageWindow.h | 2 +- viewer/windows/JFJochCalibrationWindow.cpp | 2 +- viewer/windows/JFJochCalibrationWindow.h | 2 +- 34 files changed, 46 insertions(+), 46 deletions(-) rename viewer/{widgets => charts}/JFJochChartView.cpp (100%) rename viewer/{widgets => charts}/JFJochChartView.h (100%) rename viewer/{widgets => charts}/JFJochSimpleChartView.cpp (100%) rename viewer/{widgets => charts}/JFJochSimpleChartView.h (100%) rename viewer/{widgets => image_viewer}/JFJochAzIntImage.cpp (100%) rename viewer/{widgets => image_viewer}/JFJochAzIntImage.h (100%) rename viewer/{widgets => image_viewer}/JFJochDiffractionImage.cpp (100%) rename viewer/{widgets => image_viewer}/JFJochDiffractionImage.h (100%) rename viewer/{widgets => image_viewer}/JFJochImage.cpp (100%) rename viewer/{widgets => image_viewer}/JFJochImage.h (100%) rename viewer/{widgets => image_viewer}/JFJochSimpleImage.cpp (100%) rename viewer/{widgets => image_viewer}/JFJochSimpleImage.h (100%) rename viewer/{ => widgets}/JFJochViewerImageROIStatistics.cpp (100%) rename viewer/{ => widgets}/JFJochViewerImageROIStatistics.h (94%) rename viewer/{ => widgets}/JFJochViewerImageROIStatistics_Box.cpp (100%) rename viewer/{ => widgets}/JFJochViewerImageROIStatistics_Box.h (95%) rename viewer/{ => widgets}/JFJochViewerImageROIStatistics_Circle.cpp (100%) rename viewer/{ => widgets}/JFJochViewerImageROIStatistics_Circle.h (95%) rename viewer/{ => widgets}/JFJochViewerImageStatistics.cpp (99%) rename viewer/{ => widgets}/JFJochViewerImageStatistics.h (95%) rename viewer/{ => widgets}/JFJochViewerROIResult.cpp (100%) rename viewer/{ => widgets}/JFJochViewerROIResult.h (94%) rename viewer/{ => widgets}/JFJochViewerSidePanelChart.cpp (100%) rename viewer/{ => widgets}/JFJochViewerSidePanelChart.h (86%) diff --git a/viewer/CMakeLists.txt b/viewer/CMakeLists.txt index 8e049dbf..be620495 100644 --- a/viewer/CMakeLists.txt +++ b/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 ) diff --git a/viewer/JFJochViewerDatasetInfo.h b/viewer/JFJochViewerDatasetInfo.h index 7d632f36..ca1ed0d3 100644 --- a/viewer/JFJochViewerDatasetInfo.h +++ b/viewer/JFJochViewerDatasetInfo.h @@ -5,7 +5,7 @@ #define JFJOCH_JFJOCHVIEWERDATASETINFO_H #include -#include "widgets/JFJochChartView.h" +#include "charts/JFJochChartView.h" #include "../reader/JFJochReader.h" diff --git a/viewer/JFJochViewerSidePanel.cpp b/viewer/JFJochViewerSidePanel.cpp index f999dd54..e007d55d 100644 --- a/viewer/JFJochViewerSidePanel.cpp +++ b/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) { diff --git a/viewer/JFJochViewerSidePanel.h b/viewer/JFJochViewerSidePanel.h index 49c610c5..f34c1346 100644 --- a/viewer/JFJochViewerSidePanel.h +++ b/viewer/JFJochViewerSidePanel.h @@ -9,10 +9,10 @@ #include #include -#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 diff --git a/viewer/JFJochViewerWindow.cpp b/viewer/JFJochViewerWindow.cpp index d1f7805d..8dcc18a5 100644 --- a/viewer/JFJochViewerWindow.cpp +++ b/viewer/JFJochViewerWindow.cpp @@ -7,7 +7,7 @@ #include #include "JFJochImageReadingWorker.h" -#include "widgets/JFJochDiffractionImage.h" +#include "image_viewer/JFJochDiffractionImage.h" #include "JFJochViewerSidePanel.h" #include "JFJochViewerStatusBar.h" #include "../common/CUDAWrapper.h" diff --git a/viewer/widgets/JFJochChartView.cpp b/viewer/charts/JFJochChartView.cpp similarity index 100% rename from viewer/widgets/JFJochChartView.cpp rename to viewer/charts/JFJochChartView.cpp diff --git a/viewer/widgets/JFJochChartView.h b/viewer/charts/JFJochChartView.h similarity index 100% rename from viewer/widgets/JFJochChartView.h rename to viewer/charts/JFJochChartView.h diff --git a/viewer/widgets/JFJochSimpleChartView.cpp b/viewer/charts/JFJochSimpleChartView.cpp similarity index 100% rename from viewer/widgets/JFJochSimpleChartView.cpp rename to viewer/charts/JFJochSimpleChartView.cpp diff --git a/viewer/widgets/JFJochSimpleChartView.h b/viewer/charts/JFJochSimpleChartView.h similarity index 100% rename from viewer/widgets/JFJochSimpleChartView.h rename to viewer/charts/JFJochSimpleChartView.h diff --git a/viewer/widgets/JFJochAzIntImage.cpp b/viewer/image_viewer/JFJochAzIntImage.cpp similarity index 100% rename from viewer/widgets/JFJochAzIntImage.cpp rename to viewer/image_viewer/JFJochAzIntImage.cpp diff --git a/viewer/widgets/JFJochAzIntImage.h b/viewer/image_viewer/JFJochAzIntImage.h similarity index 100% rename from viewer/widgets/JFJochAzIntImage.h rename to viewer/image_viewer/JFJochAzIntImage.h diff --git a/viewer/widgets/JFJochDiffractionImage.cpp b/viewer/image_viewer/JFJochDiffractionImage.cpp similarity index 100% rename from viewer/widgets/JFJochDiffractionImage.cpp rename to viewer/image_viewer/JFJochDiffractionImage.cpp diff --git a/viewer/widgets/JFJochDiffractionImage.h b/viewer/image_viewer/JFJochDiffractionImage.h similarity index 100% rename from viewer/widgets/JFJochDiffractionImage.h rename to viewer/image_viewer/JFJochDiffractionImage.h diff --git a/viewer/widgets/JFJochImage.cpp b/viewer/image_viewer/JFJochImage.cpp similarity index 100% rename from viewer/widgets/JFJochImage.cpp rename to viewer/image_viewer/JFJochImage.cpp diff --git a/viewer/widgets/JFJochImage.h b/viewer/image_viewer/JFJochImage.h similarity index 100% rename from viewer/widgets/JFJochImage.h rename to viewer/image_viewer/JFJochImage.h diff --git a/viewer/widgets/JFJochSimpleImage.cpp b/viewer/image_viewer/JFJochSimpleImage.cpp similarity index 100% rename from viewer/widgets/JFJochSimpleImage.cpp rename to viewer/image_viewer/JFJochSimpleImage.cpp diff --git a/viewer/widgets/JFJochSimpleImage.h b/viewer/image_viewer/JFJochSimpleImage.h similarity index 100% rename from viewer/widgets/JFJochSimpleImage.h rename to viewer/image_viewer/JFJochSimpleImage.h diff --git a/viewer/JFJochViewerImageROIStatistics.cpp b/viewer/widgets/JFJochViewerImageROIStatistics.cpp similarity index 100% rename from viewer/JFJochViewerImageROIStatistics.cpp rename to viewer/widgets/JFJochViewerImageROIStatistics.cpp diff --git a/viewer/JFJochViewerImageROIStatistics.h b/viewer/widgets/JFJochViewerImageROIStatistics.h similarity index 94% rename from viewer/JFJochViewerImageROIStatistics.h rename to viewer/widgets/JFJochViewerImageROIStatistics.h index f20fe5c0..57c375e3 100644 --- a/viewer/JFJochViewerImageROIStatistics.h +++ b/viewer/widgets/JFJochViewerImageROIStatistics.h @@ -9,11 +9,11 @@ #include #include -#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 diff --git a/viewer/JFJochViewerImageROIStatistics_Box.cpp b/viewer/widgets/JFJochViewerImageROIStatistics_Box.cpp similarity index 100% rename from viewer/JFJochViewerImageROIStatistics_Box.cpp rename to viewer/widgets/JFJochViewerImageROIStatistics_Box.cpp diff --git a/viewer/JFJochViewerImageROIStatistics_Box.h b/viewer/widgets/JFJochViewerImageROIStatistics_Box.h similarity index 95% rename from viewer/JFJochViewerImageROIStatistics_Box.h rename to viewer/widgets/JFJochViewerImageROIStatistics_Box.h index da88b577..7ec88ebe 100644 --- a/viewer/JFJochViewerImageROIStatistics_Box.h +++ b/viewer/widgets/JFJochViewerImageROIStatistics_Box.h @@ -6,7 +6,7 @@ #include -#include "widgets/NumberLineEdit.h" +#include "NumberLineEdit.h" class JFJochViewerImageROIStatistics_Box : public QWidget { Q_OBJECT diff --git a/viewer/JFJochViewerImageROIStatistics_Circle.cpp b/viewer/widgets/JFJochViewerImageROIStatistics_Circle.cpp similarity index 100% rename from viewer/JFJochViewerImageROIStatistics_Circle.cpp rename to viewer/widgets/JFJochViewerImageROIStatistics_Circle.cpp diff --git a/viewer/JFJochViewerImageROIStatistics_Circle.h b/viewer/widgets/JFJochViewerImageROIStatistics_Circle.h similarity index 95% rename from viewer/JFJochViewerImageROIStatistics_Circle.h rename to viewer/widgets/JFJochViewerImageROIStatistics_Circle.h index ca35aff3..c88f0faf 100644 --- a/viewer/JFJochViewerImageROIStatistics_Circle.h +++ b/viewer/widgets/JFJochViewerImageROIStatistics_Circle.h @@ -6,7 +6,7 @@ #include -#include "widgets/NumberLineEdit.h" +#include "NumberLineEdit.h" struct CircleSettings { double x, y, r; diff --git a/viewer/JFJochViewerImageStatistics.cpp b/viewer/widgets/JFJochViewerImageStatistics.cpp similarity index 99% rename from viewer/JFJochViewerImageStatistics.cpp rename to viewer/widgets/JFJochViewerImageStatistics.cpp index 5ea4d178..bde745d7 100644 --- a/viewer/JFJochViewerImageStatistics.cpp +++ b/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 #include diff --git a/viewer/JFJochViewerImageStatistics.h b/viewer/widgets/JFJochViewerImageStatistics.h similarity index 95% rename from viewer/JFJochViewerImageStatistics.h rename to viewer/widgets/JFJochViewerImageStatistics.h index c7d47d98..dede97d8 100644 --- a/viewer/JFJochViewerImageStatistics.h +++ b/viewer/widgets/JFJochViewerImageStatistics.h @@ -6,7 +6,7 @@ #include #include -#include "../reader/JFJochReader.h" +#include "../../reader/JFJochReader.h" class JFJochViewerImageStatistics : public QWidget { Q_OBJECT diff --git a/viewer/JFJochViewerROIResult.cpp b/viewer/widgets/JFJochViewerROIResult.cpp similarity index 100% rename from viewer/JFJochViewerROIResult.cpp rename to viewer/widgets/JFJochViewerROIResult.cpp diff --git a/viewer/JFJochViewerROIResult.h b/viewer/widgets/JFJochViewerROIResult.h similarity index 94% rename from viewer/JFJochViewerROIResult.h rename to viewer/widgets/JFJochViewerROIResult.h index e8e6663b..154b386c 100644 --- a/viewer/JFJochViewerROIResult.h +++ b/viewer/widgets/JFJochViewerROIResult.h @@ -6,7 +6,7 @@ #include #include -#include "../common/JFJochMessages.h" +#include "../../common/JFJochMessages.h" class JFJochViewerROIResult : public QWidget{ Q_OBJECT diff --git a/viewer/JFJochViewerSidePanelChart.cpp b/viewer/widgets/JFJochViewerSidePanelChart.cpp similarity index 100% rename from viewer/JFJochViewerSidePanelChart.cpp rename to viewer/widgets/JFJochViewerSidePanelChart.cpp diff --git a/viewer/JFJochViewerSidePanelChart.h b/viewer/widgets/JFJochViewerSidePanelChart.h similarity index 86% rename from viewer/JFJochViewerSidePanelChart.h rename to viewer/widgets/JFJochViewerSidePanelChart.h index 7963a705..b7e63dbc 100644 --- a/viewer/JFJochViewerSidePanelChart.h +++ b/viewer/widgets/JFJochViewerSidePanelChart.h @@ -8,9 +8,9 @@ #include #include -#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 diff --git a/viewer/widgets/ResolutionRingWidget.h b/viewer/widgets/ResolutionRingWidget.h index 1792f5ee..d4322049 100644 --- a/viewer/widgets/ResolutionRingWidget.h +++ b/viewer/widgets/ResolutionRingWidget.h @@ -9,7 +9,7 @@ #include #include -#include "JFJochDiffractionImage.h" +#include "../image_viewer/JFJochDiffractionImage.h" class ResolutionRingWidget : public QWidget { diff --git a/viewer/windows/JFJoch2DAzintImageWindow.cpp b/viewer/windows/JFJoch2DAzintImageWindow.cpp index 0a205a78..062328a1 100644 --- a/viewer/windows/JFJoch2DAzintImageWindow.cpp +++ b/viewer/windows/JFJoch2DAzintImageWindow.cpp @@ -3,7 +3,7 @@ #include #include "JFJoch2DAzintImageWindow.h" -#include "../JFJochViewerROIResult.h" +#include "../widgets/JFJochViewerROIResult.h" JFJoch2DAzintImageWindow::JFJoch2DAzintImageWindow(QWidget *parent) : JFJochHelperWindow(parent) { QWidget *centralWidget = new QWidget(this); diff --git a/viewer/windows/JFJoch2DAzintImageWindow.h b/viewer/windows/JFJoch2DAzintImageWindow.h index 2c11ba1c..5a291a7a 100644 --- a/viewer/windows/JFJoch2DAzintImageWindow.h +++ b/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 diff --git a/viewer/windows/JFJochCalibrationWindow.cpp b/viewer/windows/JFJochCalibrationWindow.cpp index 04cca5e2..c824dbdb 100644 --- a/viewer/windows/JFJochCalibrationWindow.cpp +++ b/viewer/windows/JFJochCalibrationWindow.cpp @@ -7,7 +7,7 @@ #include #include -#include "../JFJochViewerROIResult.h" +#include "../widgets/JFJochViewerROIResult.h" JFJochCalibrationWindow::JFJochCalibrationWindow(QWidget *parent) : JFJochHelperWindow(parent) { QWidget *centralWidget = new QWidget(this); diff --git a/viewer/windows/JFJochCalibrationWindow.h b/viewer/windows/JFJochCalibrationWindow.h index ed975b2f..0a39f677 100644 --- a/viewer/windows/JFJochCalibrationWindow.h +++ b/viewer/windows/JFJochCalibrationWindow.h @@ -9,7 +9,7 @@ #include #include "JFJochHelperWindow.h" -#include "../widgets/JFJochSimpleImage.h" +#include "../image_viewer/JFJochSimpleImage.h" #include "../../reader/JFJochReaderDataset.h" #include "../SimpleImage.h" #include "../widgets/SliderPlusBox.h"