From cabbc74b74e30c10dc7391e61e7129806bfa4317 Mon Sep 17 00:00:00 2001 From: MRtrixBot Date: Wed, 16 Oct 2024 18:19:16 +0100 Subject: [PATCH] Remove #include "gui/..." prefix --- cpp/cmd/mrview.cpp | 14 +++--- cpp/cmd/shview.cpp | 6 +-- cpp/lib/gui/CMakeLists.txt | 2 +- cpp/lib/gui/color_button.cpp | 2 +- cpp/lib/gui/color_button.h | 2 +- cpp/lib/gui/crosshair.cpp | 4 +- cpp/lib/gui/crosshair.h | 4 +- cpp/lib/gui/cursor.cpp | 2 +- cpp/lib/gui/cursor.h | 2 +- cpp/lib/gui/dialog/dialog.cpp | 10 ++-- cpp/lib/gui/dialog/dicom.cpp | 6 +-- cpp/lib/gui/dialog/dicom.h | 2 +- cpp/lib/gui/dialog/file.cpp | 4 +- cpp/lib/gui/dialog/file.h | 2 +- cpp/lib/gui/dialog/image_properties.cpp | 6 +-- cpp/lib/gui/dialog/image_properties.h | 2 +- cpp/lib/gui/dialog/list.cpp | 2 +- cpp/lib/gui/dialog/list.h | 4 +- cpp/lib/gui/dialog/opengl.cpp | 6 +-- cpp/lib/gui/dialog/opengl.h | 2 +- cpp/lib/gui/dialog/progress.cpp | 4 +- cpp/lib/gui/dialog/progress.h | 2 +- cpp/lib/gui/dialog/report_exception.cpp | 4 +- cpp/lib/gui/dialog/report_exception.h | 2 +- cpp/lib/gui/dwi/render_frame.cpp | 2 +- cpp/lib/gui/dwi/render_frame.h | 12 ++--- cpp/lib/gui/dwi/renderer.cpp | 8 ++-- cpp/lib/gui/dwi/renderer.h | 8 ++-- cpp/lib/gui/gui.cpp | 4 +- cpp/lib/gui/gui.h | 2 +- cpp/lib/gui/gui_pch.h | 2 +- cpp/lib/gui/lighting_dock.cpp | 6 +-- cpp/lib/gui/lighting_dock.h | 2 +- cpp/lib/gui/mrview/adjust_button.cpp | 2 +- cpp/lib/gui/mrview/adjust_button.h | 2 +- cpp/lib/gui/mrview/colourbars.cpp | 8 ++-- cpp/lib/gui/mrview/colourbars.h | 4 +- cpp/lib/gui/mrview/colourmap_button.cpp | 4 +- cpp/lib/gui/mrview/colourmap_button.h | 2 +- cpp/lib/gui/mrview/combo_box_error.cpp | 2 +- cpp/lib/gui/mrview/combo_box_error.h | 2 +- cpp/lib/gui/mrview/displayable.cpp | 2 +- cpp/lib/gui/mrview/displayable.h | 6 +-- cpp/lib/gui/mrview/gui_image.cpp | 6 +-- cpp/lib/gui/mrview/gui_image.h | 4 +- cpp/lib/gui/mrview/mode/base.cpp | 4 +- cpp/lib/gui/mrview/mode/base.h | 10 ++-- cpp/lib/gui/mrview/mode/lightbox.cpp | 2 +- cpp/lib/gui/mrview/mode/lightbox.h | 2 +- cpp/lib/gui/mrview/mode/lightbox_gui.h | 2 +- cpp/lib/gui/mrview/mode/list.h | 8 ++-- cpp/lib/gui/mrview/mode/ortho.cpp | 4 +- cpp/lib/gui/mrview/mode/ortho.h | 2 +- cpp/lib/gui/mrview/mode/slice.cpp | 4 +- cpp/lib/gui/mrview/mode/slice.h | 2 +- cpp/lib/gui/mrview/mode/volume.cpp | 10 ++-- cpp/lib/gui/mrview/mode/volume.h | 4 +- cpp/lib/gui/mrview/qthelpers.cpp | 2 +- cpp/lib/gui/mrview/spin_box.h | 2 +- cpp/lib/gui/mrview/sync/client.cpp | 2 +- .../mrview/sync/interprocesscommunicator.cpp | 6 +-- .../mrview/sync/interprocesscommunicator.h | 4 +- cpp/lib/gui/mrview/sync/localsocketreader.cpp | 2 +- cpp/lib/gui/mrview/sync/processlock.cpp | 2 +- cpp/lib/gui/mrview/sync/syncmanager.cpp | 4 +- cpp/lib/gui/mrview/sync/syncmanager.h | 4 +- cpp/lib/gui/mrview/tool/base.cpp | 2 +- cpp/lib/gui/mrview/tool/base.h | 4 +- .../tool/connectome/colourmap_observers.cpp | 4 +- .../tool/connectome/colourmap_observers.h | 4 +- .../gui/mrview/tool/connectome/connectome.cpp | 4 +- .../gui/mrview/tool/connectome/connectome.h | 48 +++++++++---------- cpp/lib/gui/mrview/tool/connectome/edge.cpp | 4 +- cpp/lib/gui/mrview/tool/connectome/edge.h | 2 +- .../tool/connectome/file_data_vector.cpp | 2 +- .../mrview/tool/connectome/file_data_vector.h | 2 +- .../mrview/tool/connectome/matrix_list.cpp | 4 +- .../gui/mrview/tool/connectome/matrix_list.h | 2 +- cpp/lib/gui/mrview/tool/connectome/node.cpp | 6 +-- cpp/lib/gui/mrview/tool/connectome/node.h | 2 +- .../gui/mrview/tool/connectome/node_list.cpp | 6 +-- .../gui/mrview/tool/connectome/node_list.h | 4 +- .../mrview/tool/connectome/node_overlay.cpp | 2 +- .../gui/mrview/tool/connectome/node_overlay.h | 4 +- .../gui/mrview/tool/connectome/selection.cpp | 4 +- .../gui/mrview/tool/connectome/selection.h | 4 +- .../gui/mrview/tool/connectome/shaders.cpp | 6 +-- cpp/lib/gui/mrview/tool/connectome/shaders.h | 4 +- cpp/lib/gui/mrview/tool/fixel/base_fixel.cpp | 2 +- cpp/lib/gui/mrview/tool/fixel/base_fixel.h | 6 +-- cpp/lib/gui/mrview/tool/fixel/directory.cpp | 2 +- cpp/lib/gui/mrview/tool/fixel/directory.h | 2 +- cpp/lib/gui/mrview/tool/fixel/fixel.cpp | 20 ++++---- cpp/lib/gui/mrview/tool/fixel/fixel.h | 10 ++-- cpp/lib/gui/mrview/tool/fixel/image4D.cpp | 2 +- cpp/lib/gui/mrview/tool/fixel/image4D.h | 2 +- cpp/lib/gui/mrview/tool/fixel/legacy.cpp | 2 +- cpp/lib/gui/mrview/tool/fixel/legacy.h | 2 +- cpp/lib/gui/mrview/tool/list.h | 18 +++---- cpp/lib/gui/mrview/tool/list_model_base.h | 2 +- cpp/lib/gui/mrview/tool/odf/item.cpp | 2 +- cpp/lib/gui/mrview/tool/odf/item.h | 6 +-- cpp/lib/gui/mrview/tool/odf/model.cpp | 2 +- cpp/lib/gui/mrview/tool/odf/model.h | 4 +- cpp/lib/gui/mrview/tool/odf/odf.cpp | 18 +++---- cpp/lib/gui/mrview/tool/odf/odf.h | 10 ++-- cpp/lib/gui/mrview/tool/odf/preview.cpp | 10 ++-- cpp/lib/gui/mrview/tool/odf/preview.h | 8 ++-- cpp/lib/gui/mrview/tool/odf/type.h | 2 +- cpp/lib/gui/mrview/tool/overlay.cpp | 16 +++---- cpp/lib/gui/mrview/tool/overlay.h | 10 ++-- cpp/lib/gui/mrview/tool/roi_editor/item.cpp | 6 +-- cpp/lib/gui/mrview/tool/roi_editor/item.h | 4 +- cpp/lib/gui/mrview/tool/roi_editor/model.cpp | 4 +- cpp/lib/gui/mrview/tool/roi_editor/model.h | 4 +- cpp/lib/gui/mrview/tool/roi_editor/roi.cpp | 10 ++-- cpp/lib/gui/mrview/tool/roi_editor/roi.h | 18 +++---- .../gui/mrview/tool/roi_editor/undoentry.cpp | 6 +-- .../gui/mrview/tool/roi_editor/undoentry.h | 4 +- cpp/lib/gui/mrview/tool/screen_capture.cpp | 10 ++-- cpp/lib/gui/mrview/tool/screen_capture.h | 6 +-- .../tool/tractography/track_scalar_file.cpp | 6 +-- .../tool/tractography/track_scalar_file.h | 10 ++-- .../mrview/tool/tractography/tractogram.cpp | 10 ++-- .../gui/mrview/tool/tractography/tractogram.h | 4 +- .../mrview/tool/tractography/tractography.cpp | 18 +++---- .../mrview/tool/tractography/tractography.h | 12 ++--- cpp/lib/gui/mrview/tool/transform.cpp | 2 +- cpp/lib/gui/mrview/tool/transform.h | 4 +- cpp/lib/gui/mrview/tool/view.cpp | 16 +++---- cpp/lib/gui/mrview/tool/view.h | 8 ++-- cpp/lib/gui/mrview/volume.cpp | 4 +- cpp/lib/gui/mrview/volume.h | 4 +- cpp/lib/gui/mrview/window.cpp | 32 ++++++------- cpp/lib/gui/mrview/window.h | 12 ++--- cpp/lib/gui/opengl/font.cpp | 2 +- cpp/lib/gui/opengl/font.h | 2 +- cpp/lib/gui/opengl/gl.cpp | 2 +- cpp/lib/gui/opengl/gl.h | 2 +- cpp/lib/gui/opengl/gl_core_3_3.cpp | 2 +- cpp/lib/gui/opengl/lighting.cpp | 2 +- cpp/lib/gui/opengl/lighting.h | 2 +- cpp/lib/gui/opengl/shader.cpp | 2 +- cpp/lib/gui/opengl/shader.h | 2 +- cpp/lib/gui/opengl/transformation.h | 2 +- cpp/lib/gui/projection.cpp | 2 +- cpp/lib/gui/projection.h | 10 ++-- cpp/lib/gui/shapes/cube.cpp | 2 +- cpp/lib/gui/shapes/cube.h | 4 +- cpp/lib/gui/shapes/cylinder.cpp | 2 +- cpp/lib/gui/shapes/cylinder.h | 4 +- cpp/lib/gui/shapes/halfsphere.cpp | 2 +- cpp/lib/gui/shapes/halfsphere.h | 4 +- cpp/lib/gui/shapes/sphere.cpp | 2 +- cpp/lib/gui/shapes/sphere.h | 4 +- cpp/lib/gui/shview/render_window.cpp | 10 ++-- cpp/lib/gui/shview/render_window.h | 4 +- 157 files changed, 417 insertions(+), 417 deletions(-) diff --git a/cpp/cmd/mrview.cpp b/cpp/cmd/mrview.cpp index d45aef8a60..62cf5f4a54 100644 --- a/cpp/cmd/mrview.cpp +++ b/cpp/cmd/mrview.cpp @@ -15,16 +15,16 @@ */ // clang-format off -#include "gui/gui.h" +#include "gui.h" #include "command.h" // clang-format on -#include "gui/mrview/icons.h" -#include "gui/mrview/mode/list.h" -#include "gui/mrview/sync/syncmanager.h" -#include "gui/mrview/tool/list.h" -#include "gui/mrview/window.h" #include "memory.h" +#include "mrview/icons.h" +#include "mrview/mode/list.h" +#include "mrview/sync/syncmanager.h" +#include "mrview/tool/list.h" +#include "mrview/window.h" #include "progressbar.h" using namespace MR; @@ -75,7 +75,7 @@ void usage() { MR::GUI::MRView::Tool::classname::add_commandline_options(OPTIONS); { using namespace MR::GUI::MRView::Tool; -#include "gui/mrview/tool/list.h" +#include "mrview/tool/list.h" } REQUIRES_AT_LEAST_ONE_ARGUMENT = false; diff --git a/cpp/cmd/shview.cpp b/cpp/cmd/shview.cpp index ffa21c2098..91c427130a 100644 --- a/cpp/cmd/shview.cpp +++ b/cpp/cmd/shview.cpp @@ -15,15 +15,15 @@ */ // clang-format off -#include "gui/gui.h" +#include "gui.h" #include "command.h" // clang-format on #include "file/path.h" -#include "gui/shview/icons.h" -#include "gui/shview/render_window.h" #include "math/SH.h" #include "progressbar.h" +#include "shview/icons.h" +#include "shview/render_window.h" using namespace MR; using namespace App; diff --git a/cpp/lib/gui/CMakeLists.txt b/cpp/lib/gui/CMakeLists.txt index 416bae1c11..f613d23f8a 100644 --- a/cpp/lib/gui/CMakeLists.txt +++ b/cpp/lib/gui/CMakeLists.txt @@ -23,7 +23,7 @@ set_target_properties(mrtrix-gui PROPERTIES ) if(MRTRIX_USE_PCH) - target_precompile_headers(mrtrix-gui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/gui/gui_pch.h) + target_precompile_headers(mrtrix-gui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/gui_pch.h) endif() target_include_directories(mrtrix-gui PUBLIC diff --git a/cpp/lib/gui/color_button.cpp b/cpp/lib/gui/color_button.cpp index b47d9e19ba..20d4a08614 100644 --- a/cpp/lib/gui/color_button.cpp +++ b/cpp/lib/gui/color_button.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/color_button.h" +#include "color_button.h" QColorButton::QColorButton(QWidget *parent, const char *name) : QPushButton(name, parent) { connect(this, SIGNAL(clicked()), this, SLOT(chooseColor())); diff --git a/cpp/lib/gui/color_button.h b/cpp/lib/gui/color_button.h index c51ed4cb8c..714ece7b78 100644 --- a/cpp/lib/gui/color_button.h +++ b/cpp/lib/gui/color_button.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/opengl/gl.h" +#include "opengl/gl.h" class QColorButton : public QPushButton { Q_OBJECT diff --git a/cpp/lib/gui/crosshair.cpp b/cpp/lib/gui/crosshair.cpp index fb0f6b00a7..4019a81e6f 100644 --- a/cpp/lib/gui/crosshair.cpp +++ b/cpp/lib/gui/crosshair.cpp @@ -14,9 +14,9 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/crosshair.h" +#include "crosshair.h" -#include "gui/projection.h" +#include "projection.h" namespace MR::GUI { diff --git a/cpp/lib/gui/crosshair.h b/cpp/lib/gui/crosshair.h index 6c3582e487..82a9572ff5 100644 --- a/cpp/lib/gui/crosshair.h +++ b/cpp/lib/gui/crosshair.h @@ -18,8 +18,8 @@ #include "types.h" -#include "gui/opengl/gl.h" -#include "gui/opengl/shader.h" +#include "opengl/gl.h" +#include "opengl/shader.h" namespace MR::GUI { diff --git a/cpp/lib/gui/cursor.cpp b/cpp/lib/gui/cursor.cpp index 45b7fa0dd3..ee3e4b9b16 100644 --- a/cpp/lib/gui/cursor.cpp +++ b/cpp/lib/gui/cursor.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/cursor.h" +#include "cursor.h" namespace MR::GUI { diff --git a/cpp/lib/gui/cursor.h b/cpp/lib/gui/cursor.h index 897ff8e91c..488ad88ffb 100644 --- a/cpp/lib/gui/cursor.h +++ b/cpp/lib/gui/cursor.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/opengl/gl.h" +#include "opengl/gl.h" namespace MR::GUI { class Cursor { diff --git a/cpp/lib/gui/dialog/dialog.cpp b/cpp/lib/gui/dialog/dialog.cpp index cc4b21b773..5874caed88 100644 --- a/cpp/lib/gui/dialog/dialog.cpp +++ b/cpp/lib/gui/dialog/dialog.cpp @@ -14,17 +14,17 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/dialog/dialog.h" +#include "dialog/dialog.h" #include "app.h" #include "exception.h" #include "file/dicom/tree.h" #include "progressbar.h" -#include "gui/dialog/dicom.h" -#include "gui/dialog/file.h" -#include "gui/dialog/progress.h" -#include "gui/dialog/report_exception.h" +#include "dialog/dicom.h" +#include "dialog/file.h" +#include "dialog/progress.h" +#include "dialog/report_exception.h" namespace MR::GUI::Dialog { diff --git a/cpp/lib/gui/dialog/dicom.cpp b/cpp/lib/gui/dialog/dicom.cpp index 083ef2ca5d..55272c8425 100644 --- a/cpp/lib/gui/dialog/dicom.cpp +++ b/cpp/lib/gui/dialog/dicom.cpp @@ -14,10 +14,10 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/dialog/dicom.h" +#include "dialog/dicom.h" +#include "dialog/list.h" #include "file/dicom/tree.h" -#include "gui/dialog/list.h" -#include "gui/gui.h" +#include "gui.h" namespace MR::GUI::Dialog { diff --git a/cpp/lib/gui/dialog/dicom.h b/cpp/lib/gui/dialog/dicom.h index 1a4e762cf2..8f60abacc0 100644 --- a/cpp/lib/gui/dialog/dicom.h +++ b/cpp/lib/gui/dialog/dicom.h @@ -17,7 +17,7 @@ #pragma once #include "file/dicom/tree.h" -#include "gui/opengl/gl.h" +#include "opengl/gl.h" namespace MR::GUI::Dialog { diff --git a/cpp/lib/gui/dialog/file.cpp b/cpp/lib/gui/dialog/file.cpp index fa4572c2a3..628a1ea97f 100644 --- a/cpp/lib/gui/dialog/file.cpp +++ b/cpp/lib/gui/dialog/file.cpp @@ -17,9 +17,9 @@ #include #include "app.h" +#include "dialog/file.h" #include "formats/list.h" -#include "gui/dialog/file.h" -#include "gui/gui.h" +#include "gui.h" #ifdef MRTRIX_MACOSX #define FILE_DIALOG_OPTIONS QFileDialog::DontUseNativeDialog diff --git a/cpp/lib/gui/dialog/file.h b/cpp/lib/gui/dialog/file.h index d26862699f..f3b2412cde 100644 --- a/cpp/lib/gui/dialog/file.h +++ b/cpp/lib/gui/dialog/file.h @@ -17,7 +17,7 @@ #pragma once #include "file/path.h" -#include "gui/opengl/gl.h" +#include "opengl/gl.h" namespace MR::GUI::Dialog::File { diff --git a/cpp/lib/gui/dialog/image_properties.cpp b/cpp/lib/gui/dialog/image_properties.cpp index 1f6634ec62..60905f938c 100644 --- a/cpp/lib/gui/dialog/image_properties.cpp +++ b/cpp/lib/gui/dialog/image_properties.cpp @@ -14,11 +14,11 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/dialog/image_properties.h" +#include "dialog/image_properties.h" +#include "dialog/file.h" +#include "dialog/list.h" #include "dwi/gradient.h" #include "file/matrix.h" -#include "gui/dialog/file.h" -#include "gui/dialog/list.h" #include "header.h" #include "stride.h" diff --git a/cpp/lib/gui/dialog/image_properties.h b/cpp/lib/gui/dialog/image_properties.h index ef9cfb59f0..7558690da2 100644 --- a/cpp/lib/gui/dialog/image_properties.h +++ b/cpp/lib/gui/dialog/image_properties.h @@ -16,8 +16,8 @@ #pragma once -#include "gui/opengl/gl.h" #include "header.h" +#include "opengl/gl.h" namespace MR { class Header; diff --git a/cpp/lib/gui/dialog/list.cpp b/cpp/lib/gui/dialog/list.cpp index 4044b1b1b0..8f56dbfd84 100644 --- a/cpp/lib/gui/dialog/list.cpp +++ b/cpp/lib/gui/dialog/list.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/dialog/list.h" +#include "dialog/list.h" namespace MR::GUI::Dialog { diff --git a/cpp/lib/gui/dialog/list.h b/cpp/lib/gui/dialog/list.h index 03da171263..f7668e7dbf 100644 --- a/cpp/lib/gui/dialog/list.h +++ b/cpp/lib/gui/dialog/list.h @@ -16,8 +16,8 @@ #pragma once -#include "gui/gui.h" -#include "gui/opengl/gl.h" +#include "gui.h" +#include "opengl/gl.h" namespace MR::GUI::Dialog { diff --git a/cpp/lib/gui/dialog/opengl.cpp b/cpp/lib/gui/dialog/opengl.cpp index 2175040e23..6a8f325acb 100644 --- a/cpp/lib/gui/dialog/opengl.cpp +++ b/cpp/lib/gui/dialog/opengl.cpp @@ -14,9 +14,9 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/dialog/opengl.h" -#include "gui/dialog/list.h" -#include "gui/opengl/gl.h" +#include "dialog/opengl.h" +#include "dialog/list.h" +#include "opengl/gl.h" namespace MR::GUI::Dialog { diff --git a/cpp/lib/gui/dialog/opengl.h b/cpp/lib/gui/dialog/opengl.h index 4280825193..7d17421eab 100644 --- a/cpp/lib/gui/dialog/opengl.h +++ b/cpp/lib/gui/dialog/opengl.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/opengl/gl.h" +#include "opengl/gl.h" namespace MR::GUI::Dialog { diff --git a/cpp/lib/gui/dialog/progress.cpp b/cpp/lib/gui/dialog/progress.cpp index 4ae877aae4..d967cbca92 100644 --- a/cpp/lib/gui/dialog/progress.cpp +++ b/cpp/lib/gui/dialog/progress.cpp @@ -14,8 +14,8 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/dialog/progress.h" -#include "gui/gui.h" +#include "dialog/progress.h" +#include "gui.h" #include namespace MR::GUI::Dialog::ProgressBar { diff --git a/cpp/lib/gui/dialog/progress.h b/cpp/lib/gui/dialog/progress.h index 84c04ebd9d..2d61dff650 100644 --- a/cpp/lib/gui/dialog/progress.h +++ b/cpp/lib/gui/dialog/progress.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/opengl/gl.h" +#include "opengl/gl.h" #include "progressbar.h" namespace MR::GUI::Dialog::ProgressBar { diff --git a/cpp/lib/gui/dialog/report_exception.cpp b/cpp/lib/gui/dialog/report_exception.cpp index e69f7b500c..d215781115 100644 --- a/cpp/lib/gui/dialog/report_exception.cpp +++ b/cpp/lib/gui/dialog/report_exception.cpp @@ -14,8 +14,8 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/dialog/report_exception.h" -#include "gui/gui.h" +#include "dialog/report_exception.h" +#include "gui.h" namespace MR::GUI::Dialog { diff --git a/cpp/lib/gui/dialog/report_exception.h b/cpp/lib/gui/dialog/report_exception.h index 896fe314bf..c9bc981869 100644 --- a/cpp/lib/gui/dialog/report_exception.h +++ b/cpp/lib/gui/dialog/report_exception.h @@ -17,7 +17,7 @@ #pragma once #include "exception.h" -#include "gui/opengl/gl.h" +#include "opengl/gl.h" namespace MR::GUI::Dialog { diff --git a/cpp/lib/gui/dwi/render_frame.cpp b/cpp/lib/gui/dwi/render_frame.cpp index 1e5cde3fc5..ecc4bcf761 100644 --- a/cpp/lib/gui/dwi/render_frame.cpp +++ b/cpp/lib/gui/dwi/render_frame.cpp @@ -19,7 +19,7 @@ #include #include "app.h" -#include "gui/dwi/render_frame.h" +#include "dwi/render_frame.h" namespace MR::GUI::DWI { diff --git a/cpp/lib/gui/dwi/render_frame.h b/cpp/lib/gui/dwi/render_frame.h index 523548de60..7940b427a3 100644 --- a/cpp/lib/gui/dwi/render_frame.h +++ b/cpp/lib/gui/dwi/render_frame.h @@ -17,13 +17,13 @@ #pragma once #include "dwi/directions/set.h" -#include "gui/dwi/renderer.h" -#include "gui/opengl/font.h" -#include "gui/opengl/gl.h" -#include "gui/opengl/lighting.h" -#include "gui/opengl/transformation.h" -#include "gui/projection.h" +#include "dwi/renderer.h" #include "memory.h" +#include "opengl/font.h" +#include "opengl/gl.h" +#include "opengl/lighting.h" +#include "opengl/transformation.h" +#include "projection.h" #include "types.h" #define MAX_LOD 8 diff --git a/cpp/lib/gui/dwi/renderer.cpp b/cpp/lib/gui/dwi/renderer.cpp index 725d1c8f85..2df422925e 100644 --- a/cpp/lib/gui/dwi/renderer.cpp +++ b/cpp/lib/gui/dwi/renderer.cpp @@ -16,11 +16,11 @@ #include -#include "gui/dwi/renderer.h" -#include "gui/gui.h" -#include "gui/opengl/lighting.h" -#include "gui/projection.h" +#include "dwi/renderer.h" +#include "gui.h" #include "math/legendre.h" +#include "opengl/lighting.h" +#include "projection.h" namespace MR::GUI::DWI { diff --git a/cpp/lib/gui/dwi/renderer.h b/cpp/lib/gui/dwi/renderer.h index 9fb1fe4abd..3cfdc9fe0a 100644 --- a/cpp/lib/gui/dwi/renderer.h +++ b/cpp/lib/gui/dwi/renderer.h @@ -20,11 +20,11 @@ #include #include "dwi/directions/set.h" -#include "gui/gui.h" -#include "gui/opengl/gl.h" -#include "gui/opengl/shader.h" -#include "gui/shapes/halfsphere.h" +#include "gui.h" #include "math/SH.h" +#include "opengl/gl.h" +#include "opengl/shader.h" +#include "shapes/halfsphere.h" namespace MR::GUI { diff --git a/cpp/lib/gui/gui.cpp b/cpp/lib/gui/gui.cpp index 68185fc72f..13624cb930 100644 --- a/cpp/lib/gui/gui.cpp +++ b/cpp/lib/gui/gui.cpp @@ -14,8 +14,8 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/gui.h" -#include "gui/opengl/gl.h" +#include "gui.h" +#include "opengl/gl.h" #include #include diff --git a/cpp/lib/gui/gui.h b/cpp/lib/gui/gui.h index 63dc5928cd..b67ffd0177 100644 --- a/cpp/lib/gui/gui.h +++ b/cpp/lib/gui/gui.h @@ -24,7 +24,7 @@ #include "app.h" #include "file/config.h" -#include "gui/opengl/gl.h" +#include "opengl/gl.h" #include diff --git a/cpp/lib/gui/gui_pch.h b/cpp/lib/gui/gui_pch.h index 7227f6795f..7dcf0be2fd 100644 --- a/cpp/lib/gui/gui_pch.h +++ b/cpp/lib/gui/gui_pch.h @@ -16,4 +16,4 @@ #ifdef __APPLE__ #define GL_SILENCE_DEPRECATION #endif -#include "gui/opengl/gl.h" +#include "opengl/gl.h" diff --git a/cpp/lib/gui/lighting_dock.cpp b/cpp/lib/gui/lighting_dock.cpp index 05380efd56..e285f9da51 100644 --- a/cpp/lib/gui/lighting_dock.cpp +++ b/cpp/lib/gui/lighting_dock.cpp @@ -14,10 +14,10 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/lighting_dock.h" +#include "lighting_dock.h" +#include "color_button.h" #include "file/config.h" -#include "gui/color_button.h" -#include "gui/gui.h" +#include "gui.h" #include "math/math.h" namespace MR::GUI { diff --git a/cpp/lib/gui/lighting_dock.h b/cpp/lib/gui/lighting_dock.h index 3d06a5b297..a13f830e2a 100644 --- a/cpp/lib/gui/lighting_dock.h +++ b/cpp/lib/gui/lighting_dock.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/opengl/lighting.h" +#include "opengl/lighting.h" namespace MR::GUI { class LightingSettings : public QFrame { diff --git a/cpp/lib/gui/mrview/adjust_button.cpp b/cpp/lib/gui/mrview/adjust_button.cpp index 208c90ecef..71dac9cd1b 100644 --- a/cpp/lib/gui/mrview/adjust_button.cpp +++ b/cpp/lib/gui/mrview/adjust_button.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/adjust_button.h" +#include "mrview/adjust_button.h" #include "math/math.h" namespace MR::GUI::MRView { diff --git a/cpp/lib/gui/mrview/adjust_button.h b/cpp/lib/gui/mrview/adjust_button.h index b8ecc4c6a2..5ca004b2d9 100644 --- a/cpp/lib/gui/mrview/adjust_button.h +++ b/cpp/lib/gui/mrview/adjust_button.h @@ -16,8 +16,8 @@ #pragma once -#include "gui/opengl/gl.h" #include "mrtrix.h" +#include "opengl/gl.h" #define ADJUST_BUTTON_DEADZONE_SIZE 8 diff --git a/cpp/lib/gui/mrview/colourbars.cpp b/cpp/lib/gui/mrview/colourbars.cpp index c73a0614be..f3d9f43125 100644 --- a/cpp/lib/gui/mrview/colourbars.cpp +++ b/cpp/lib/gui/mrview/colourbars.cpp @@ -14,11 +14,11 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/colourbars.h" +#include "mrview/colourbars.h" #include "file/config.h" -#include "gui/mrview/displayable.h" -#include "gui/opengl/font.h" -#include "gui/projection.h" +#include "mrview/displayable.h" +#include "opengl/font.h" +#include "projection.h" namespace MR::GUI::MRView { // CONF option: MRViewMaxNumColourBarRows diff --git a/cpp/lib/gui/mrview/colourbars.h b/cpp/lib/gui/mrview/colourbars.h index 2194a81ce3..5340105e8d 100644 --- a/cpp/lib/gui/mrview/colourbars.h +++ b/cpp/lib/gui/mrview/colourbars.h @@ -17,8 +17,8 @@ #pragma once #include "colourmap.h" -#include "gui/opengl/gl.h" -#include "gui/opengl/shader.h" +#include "opengl/gl.h" +#include "opengl/shader.h" namespace MR::GUI { class Projection; diff --git a/cpp/lib/gui/mrview/colourmap_button.cpp b/cpp/lib/gui/mrview/colourmap_button.cpp index b6d331c349..3c21f05285 100644 --- a/cpp/lib/gui/mrview/colourmap_button.cpp +++ b/cpp/lib/gui/mrview/colourmap_button.cpp @@ -14,8 +14,8 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/colourmap_button.h" -#include "gui/gui.h" +#include "mrview/colourmap_button.h" +#include "gui.h" #include "math/rng.h" namespace MR::GUI::MRView { diff --git a/cpp/lib/gui/mrview/colourmap_button.h b/cpp/lib/gui/mrview/colourmap_button.h index 66087d7fc9..84bf9b5264 100644 --- a/cpp/lib/gui/mrview/colourmap_button.h +++ b/cpp/lib/gui/mrview/colourmap_button.h @@ -19,7 +19,7 @@ #include "mrtrix.h" #include "colourmap.h" -#include "gui/opengl/gl.h" +#include "opengl/gl.h" namespace MR::GUI::MRView { diff --git a/cpp/lib/gui/mrview/combo_box_error.cpp b/cpp/lib/gui/mrview/combo_box_error.cpp index f2666b2278..1b89f76463 100644 --- a/cpp/lib/gui/mrview/combo_box_error.cpp +++ b/cpp/lib/gui/mrview/combo_box_error.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/combo_box_error.h" +#include "mrview/combo_box_error.h" #include "math/math.h" namespace MR::GUI::MRView { diff --git a/cpp/lib/gui/mrview/combo_box_error.h b/cpp/lib/gui/mrview/combo_box_error.h index ffdb8c09d4..40dfac3385 100644 --- a/cpp/lib/gui/mrview/combo_box_error.h +++ b/cpp/lib/gui/mrview/combo_box_error.h @@ -16,8 +16,8 @@ #pragma once -#include "gui/opengl/gl.h" #include "mrtrix.h" +#include "opengl/gl.h" namespace MR::GUI::MRView { diff --git a/cpp/lib/gui/mrview/displayable.cpp b/cpp/lib/gui/mrview/displayable.cpp index f6f4edadf0..a5d7d2d078 100644 --- a/cpp/lib/gui/mrview/displayable.cpp +++ b/cpp/lib/gui/mrview/displayable.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/displayable.h" +#include "mrview/displayable.h" namespace MR::GUI::MRView { diff --git a/cpp/lib/gui/mrview/displayable.h b/cpp/lib/gui/mrview/displayable.h index 35ad64ba3a..04d04d0aac 100644 --- a/cpp/lib/gui/mrview/displayable.h +++ b/cpp/lib/gui/mrview/displayable.h @@ -19,9 +19,9 @@ #include "math/math.h" #include "colourmap.h" -#include "gui/opengl/gl.h" -#include "gui/opengl/shader.h" -#include "gui/projection.h" +#include "opengl/gl.h" +#include "opengl/shader.h" +#include "projection.h" namespace MR { class ProgressBar; diff --git a/cpp/lib/gui/mrview/gui_image.cpp b/cpp/lib/gui/mrview/gui_image.cpp index 4673c3953f..a5a99f7a32 100644 --- a/cpp/lib/gui/mrview/gui_image.cpp +++ b/cpp/lib/gui/mrview/gui_image.cpp @@ -14,12 +14,12 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/gui_image.h" +#include "mrview/gui_image.h" -#include "gui/mrview/window.h" -#include "gui/projection.h" #include "header.h" +#include "mrview/window.h" #include "progressbar.h" +#include "projection.h" namespace MR::GUI::MRView { diff --git a/cpp/lib/gui/mrview/gui_image.h b/cpp/lib/gui/mrview/gui_image.h index 2f9b2df0ba..4afebcfa66 100644 --- a/cpp/lib/gui/mrview/gui_image.h +++ b/cpp/lib/gui/mrview/gui_image.h @@ -16,11 +16,11 @@ #pragma once -#include "gui/mrview/volume.h" -#include "gui/opengl/gl.h" #include "image.h" #include "interp/linear.h" #include "interp/nearest.h" +#include "mrview/volume.h" +#include "opengl/gl.h" #include "types.h" #include diff --git a/cpp/lib/gui/mrview/mode/base.cpp b/cpp/lib/gui/mrview/mode/base.cpp index ef0a3eecf1..1d3a1b339f 100644 --- a/cpp/lib/gui/mrview/mode/base.cpp +++ b/cpp/lib/gui/mrview/mode/base.cpp @@ -14,9 +14,9 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/mode/base.h" +#include "mrview/mode/base.h" #include "file/config.h" -#include "gui/opengl/gl.h" +#include "opengl/gl.h" namespace MR::GUI::MRView::Mode { diff --git a/cpp/lib/gui/mrview/mode/base.h b/cpp/lib/gui/mrview/mode/base.h index 9fff55f35f..60de746d3f 100644 --- a/cpp/lib/gui/mrview/mode/base.h +++ b/cpp/lib/gui/mrview/mode/base.h @@ -16,11 +16,11 @@ #pragma once -#include "gui/mrview/tool/base.h" -#include "gui/mrview/window.h" -#include "gui/opengl/gl.h" -#include "gui/opengl/transformation.h" -#include "gui/projection.h" +#include "mrview/tool/base.h" +#include "mrview/window.h" +#include "opengl/gl.h" +#include "opengl/transformation.h" +#include "projection.h" #define ROTATION_INC 0.002 #define MOVE_IN_OUT_FOV_MULTIPLIER 1.0e-3f diff --git a/cpp/lib/gui/mrview/mode/lightbox.cpp b/cpp/lib/gui/mrview/mode/lightbox.cpp index ac53cb6088..08622067a7 100644 --- a/cpp/lib/gui/mrview/mode/lightbox.cpp +++ b/cpp/lib/gui/mrview/mode/lightbox.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/mode/lightbox.h" +#include "mrview/mode/lightbox.h" namespace MR::GUI::MRView::Mode { diff --git a/cpp/lib/gui/mrview/mode/lightbox.h b/cpp/lib/gui/mrview/mode/lightbox.h index 11a996b41b..c37e6147df 100644 --- a/cpp/lib/gui/mrview/mode/lightbox.h +++ b/cpp/lib/gui/mrview/mode/lightbox.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/mrview/mode/slice.h" +#include "mrview/mode/slice.h" namespace MR::GUI::MRView::Mode { class LightBox : public Slice { diff --git a/cpp/lib/gui/mrview/mode/lightbox_gui.h b/cpp/lib/gui/mrview/mode/lightbox_gui.h index d81a04e9c1..aff1317931 100644 --- a/cpp/lib/gui/mrview/mode/lightbox_gui.h +++ b/cpp/lib/gui/mrview/mode/lightbox_gui.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/mrview/spin_box.h" +#include "mrview/spin_box.h" namespace MR::GUI::MRView::Mode::LightBoxViewControls { class LightBoxEditButton : public SpinBox { diff --git a/cpp/lib/gui/mrview/mode/list.h b/cpp/lib/gui/mrview/mode/list.h index 272e783837..e947a798a5 100644 --- a/cpp/lib/gui/mrview/mode/list.h +++ b/cpp/lib/gui/mrview/mode/list.h @@ -17,10 +17,10 @@ #ifndef MODE // place #include files in here: -#include "gui/mrview/mode/lightbox.h" -#include "gui/mrview/mode/ortho.h" -#include "gui/mrview/mode/slice.h" -#include "gui/mrview/mode/volume.h" +#include "mrview/mode/lightbox.h" +#include "mrview/mode/ortho.h" +#include "mrview/mode/slice.h" +#include "mrview/mode/volume.h" #else diff --git a/cpp/lib/gui/mrview/mode/ortho.cpp b/cpp/lib/gui/mrview/mode/ortho.cpp index de4583756d..67d095a1de 100644 --- a/cpp/lib/gui/mrview/mode/ortho.cpp +++ b/cpp/lib/gui/mrview/mode/ortho.cpp @@ -14,9 +14,9 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/mode/ortho.h" +#include "mrview/mode/ortho.h" -#include "gui/cursor.h" +#include "cursor.h" #include "mrtrix.h" namespace MR::GUI::MRView::Mode { diff --git a/cpp/lib/gui/mrview/mode/ortho.h b/cpp/lib/gui/mrview/mode/ortho.h index e65cfc3351..6ae0787064 100644 --- a/cpp/lib/gui/mrview/mode/ortho.h +++ b/cpp/lib/gui/mrview/mode/ortho.h @@ -17,7 +17,7 @@ #pragma once #include "app.h" -#include "gui/mrview/mode/slice.h" +#include "mrview/mode/slice.h" namespace MR::GUI::MRView::Mode { diff --git a/cpp/lib/gui/mrview/mode/slice.cpp b/cpp/lib/gui/mrview/mode/slice.cpp index 4477a7a280..21dc8d7959 100644 --- a/cpp/lib/gui/mrview/mode/slice.cpp +++ b/cpp/lib/gui/mrview/mode/slice.cpp @@ -14,9 +14,9 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/mode/slice.h" +#include "mrview/mode/slice.h" -#include "gui/opengl/transformation.h" +#include "opengl/transformation.h" namespace MR::GUI::MRView::Mode { diff --git a/cpp/lib/gui/mrview/mode/slice.h b/cpp/lib/gui/mrview/mode/slice.h index b763613d89..b11d0241ed 100644 --- a/cpp/lib/gui/mrview/mode/slice.h +++ b/cpp/lib/gui/mrview/mode/slice.h @@ -17,7 +17,7 @@ #pragma once #include "app.h" -#include "gui/mrview/mode/base.h" +#include "mrview/mode/base.h" namespace MR::GUI::MRView::Mode { diff --git a/cpp/lib/gui/mrview/mode/volume.cpp b/cpp/lib/gui/mrview/mode/volume.cpp index 7d47f2a54b..38ea4a8d60 100644 --- a/cpp/lib/gui/mrview/mode/volume.cpp +++ b/cpp/lib/gui/mrview/mode/volume.cpp @@ -14,12 +14,12 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/mode/volume.h" +#include "mrview/mode/volume.h" #include "file/config.h" -#include "gui/mrview/adjust_button.h" -#include "gui/mrview/tool/base.h" -#include "gui/mrview/tool/view.h" -#include "gui/opengl/lighting.h" +#include "mrview/adjust_button.h" +#include "mrview/tool/base.h" +#include "mrview/tool/view.h" +#include "opengl/lighting.h" namespace MR::GUI::MRView::Mode { diff --git a/cpp/lib/gui/mrview/mode/volume.h b/cpp/lib/gui/mrview/mode/volume.h index a2a5d9ec01..850336e12c 100644 --- a/cpp/lib/gui/mrview/mode/volume.h +++ b/cpp/lib/gui/mrview/mode/volume.h @@ -17,8 +17,8 @@ #pragma once #include "app.h" -#include "gui/mrview/mode/base.h" -#include "gui/opengl/transformation.h" +#include "mrview/mode/base.h" +#include "opengl/transformation.h" namespace MR::GUI::MRView { namespace Tool { diff --git a/cpp/lib/gui/mrview/qthelpers.cpp b/cpp/lib/gui/mrview/qthelpers.cpp index aa4627e82c..4bff14af57 100644 --- a/cpp/lib/gui/mrview/qthelpers.cpp +++ b/cpp/lib/gui/mrview/qthelpers.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/qthelpers.h" +#include "mrview/qthelpers.h" #include #include diff --git a/cpp/lib/gui/mrview/spin_box.h b/cpp/lib/gui/mrview/spin_box.h index 1f4bb58a2a..98ea3c1110 100644 --- a/cpp/lib/gui/mrview/spin_box.h +++ b/cpp/lib/gui/mrview/spin_box.h @@ -16,8 +16,8 @@ #pragma once -#include "gui/opengl/gl.h" #include "mrtrix.h" +#include "opengl/gl.h" namespace MR::GUI { diff --git a/cpp/lib/gui/mrview/sync/client.cpp b/cpp/lib/gui/mrview/sync/client.cpp index eb78c892d6..28877b903d 100644 --- a/cpp/lib/gui/mrview/sync/client.cpp +++ b/cpp/lib/gui/mrview/sync/client.cpp @@ -15,7 +15,7 @@ */ #include -#include "gui/mrview/sync/client.h" +#include "mrview/sync/client.h" #include namespace MR::GUI::MRView::Sync { diff --git a/cpp/lib/gui/mrview/sync/interprocesscommunicator.cpp b/cpp/lib/gui/mrview/sync/interprocesscommunicator.cpp index fc49e3be45..408cad1eed 100644 --- a/cpp/lib/gui/mrview/sync/interprocesscommunicator.cpp +++ b/cpp/lib/gui/mrview/sync/interprocesscommunicator.cpp @@ -19,9 +19,9 @@ #include #include "exception.h" -#include "gui/mrview/sync/enums.h" -#include "gui/mrview/sync/interprocesscommunicator.h" -#include "gui/mrview/sync/processlock.h" +#include "mrview/sync/enums.h" +#include "mrview/sync/interprocesscommunicator.h" +#include "mrview/sync/processlock.h" namespace MR::GUI::MRView::Sync { InterprocessCommunicator::InterprocessCommunicator() : QObject(0) { diff --git a/cpp/lib/gui/mrview/sync/interprocesscommunicator.h b/cpp/lib/gui/mrview/sync/interprocesscommunicator.h index bbcc125d7f..ea88d4577a 100644 --- a/cpp/lib/gui/mrview/sync/interprocesscommunicator.h +++ b/cpp/lib/gui/mrview/sync/interprocesscommunicator.h @@ -17,8 +17,8 @@ #include -#include "gui/mrview/sync/client.h" -#include "gui/mrview/sync/localsocketreader.h" +#include "mrview/sync/client.h" +#include "mrview/sync/localsocketreader.h" // maximum number of inter process syncers that are allowed. This can be // raised, but may reduce performance when new IPS are created. diff --git a/cpp/lib/gui/mrview/sync/localsocketreader.cpp b/cpp/lib/gui/mrview/sync/localsocketreader.cpp index 551e6f1a98..d185570cf1 100644 --- a/cpp/lib/gui/mrview/sync/localsocketreader.cpp +++ b/cpp/lib/gui/mrview/sync/localsocketreader.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/sync/localsocketreader.h" +#include "mrview/sync/localsocketreader.h" #include "exception.h" namespace MR::GUI::MRView::Sync { diff --git a/cpp/lib/gui/mrview/sync/processlock.cpp b/cpp/lib/gui/mrview/sync/processlock.cpp index e1b881f819..80fc9cc3ca 100644 --- a/cpp/lib/gui/mrview/sync/processlock.cpp +++ b/cpp/lib/gui/mrview/sync/processlock.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/sync/processlock.h" +#include "mrview/sync/processlock.h" #include namespace MR::GUI::MRView::Sync { diff --git a/cpp/lib/gui/mrview/sync/syncmanager.cpp b/cpp/lib/gui/mrview/sync/syncmanager.cpp index 8a74c011f6..07b82bf85a 100644 --- a/cpp/lib/gui/mrview/sync/syncmanager.cpp +++ b/cpp/lib/gui/mrview/sync/syncmanager.cpp @@ -14,8 +14,8 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/sync/syncmanager.h" -#include "gui/mrview/window.h" +#include "mrview/sync/syncmanager.h" +#include "mrview/window.h" namespace MR::GUI::MRView::Sync { SyncManager::SyncManager() : QObject(0) { diff --git a/cpp/lib/gui/mrview/sync/syncmanager.h b/cpp/lib/gui/mrview/sync/syncmanager.h index 0c5d941863..ebf2f4411b 100644 --- a/cpp/lib/gui/mrview/sync/syncmanager.h +++ b/cpp/lib/gui/mrview/sync/syncmanager.h @@ -15,8 +15,8 @@ */ #pragma once -#include "gui/mrview/sync/enums.h" -#include "gui/mrview/sync/interprocesscommunicator.h" +#include "mrview/sync/enums.h" +#include "mrview/sync/interprocesscommunicator.h" namespace MR::GUI::MRView::Sync { /** diff --git a/cpp/lib/gui/mrview/tool/base.cpp b/cpp/lib/gui/mrview/tool/base.cpp index 61df483771..e0cd88ee43 100644 --- a/cpp/lib/gui/mrview/tool/base.cpp +++ b/cpp/lib/gui/mrview/tool/base.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/base.h" +#include "mrview/tool/base.h" #include "app.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/base.h b/cpp/lib/gui/mrview/tool/base.h index 8866264c13..19744a0a3c 100644 --- a/cpp/lib/gui/mrview/tool/base.h +++ b/cpp/lib/gui/mrview/tool/base.h @@ -18,8 +18,8 @@ #include "file/config.h" -#include "gui/mrview/window.h" -#include "gui/projection.h" +#include "mrview/window.h" +#include "projection.h" #define LAYOUT_SPACING 3 diff --git a/cpp/lib/gui/mrview/tool/connectome/colourmap_observers.cpp b/cpp/lib/gui/mrview/tool/connectome/colourmap_observers.cpp index 5766bf212a..a71da5c2b1 100644 --- a/cpp/lib/gui/mrview/tool/connectome/colourmap_observers.cpp +++ b/cpp/lib/gui/mrview/tool/connectome/colourmap_observers.cpp @@ -14,9 +14,9 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/connectome/colourmap_observers.h" +#include "mrview/tool/connectome/colourmap_observers.h" -#include "gui/mrview/tool/connectome/connectome.h" +#include "mrview/tool/connectome/connectome.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/colourmap_observers.h b/cpp/lib/gui/mrview/tool/connectome/colourmap_observers.h index c3e912e002..6113a6a645 100644 --- a/cpp/lib/gui/mrview/tool/connectome/colourmap_observers.h +++ b/cpp/lib/gui/mrview/tool/connectome/colourmap_observers.h @@ -16,8 +16,8 @@ #pragma once -#include "gui/mrview/colourmap_button.h" -#include "gui/opengl/gl.h" +#include "mrview/colourmap_button.h" +#include "opengl/gl.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/connectome.cpp b/cpp/lib/gui/mrview/tool/connectome/connectome.cpp index d0a8341f81..d9750b738b 100644 --- a/cpp/lib/gui/mrview/tool/connectome/connectome.cpp +++ b/cpp/lib/gui/mrview/tool/connectome/connectome.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/connectome/connectome.h" +#include "mrview/tool/connectome/connectome.h" #include "header.h" #include "transform.h" @@ -22,8 +22,8 @@ #include "adapter/subset.h" #include "algo/loop.h" #include "algo/threaded_loop.h" +#include "dialog/file.h" #include "file/path.h" -#include "gui/dialog/file.h" #include "math/math.h" #include "math/rng.h" diff --git a/cpp/lib/gui/mrview/tool/connectome/connectome.h b/cpp/lib/gui/mrview/tool/connectome/connectome.h index 288d71ec8b..4c8559c138 100644 --- a/cpp/lib/gui/mrview/tool/connectome/connectome.h +++ b/cpp/lib/gui/mrview/tool/connectome/connectome.h @@ -24,34 +24,34 @@ #include "misc/bitset.h" #include "surface/mesh.h" -#include "gui/color_button.h" -#include "gui/lighting_dock.h" -#include "gui/mrview/adjust_button.h" -#include "gui/mrview/colourmap_button.h" -#include "gui/mrview/mode/base.h" -#include "gui/mrview/spin_box.h" -#include "gui/mrview/tool/base.h" -#include "gui/opengl/gl.h" -#include "gui/opengl/lighting.h" -#include "gui/opengl/shader.h" -#include "gui/projection.h" -#include "gui/shapes/cube.h" -#include "gui/shapes/cylinder.h" -#include "gui/shapes/sphere.h" +#include "color_button.h" +#include "lighting_dock.h" +#include "mrview/adjust_button.h" +#include "mrview/colourmap_button.h" +#include "mrview/mode/base.h" +#include "mrview/spin_box.h" +#include "mrview/tool/base.h" +#include "opengl/gl.h" +#include "opengl/lighting.h" +#include "opengl/shader.h" +#include "projection.h" +#include "shapes/cube.h" +#include "shapes/cylinder.h" +#include "shapes/sphere.h" #include "connectome/lut.h" #include "connectome/mat2vec.h" -#include "gui/mrview/tool/connectome/colourmap_observers.h" -#include "gui/mrview/tool/connectome/edge.h" -#include "gui/mrview/tool/connectome/file_data_vector.h" -#include "gui/mrview/tool/connectome/matrix_list.h" -#include "gui/mrview/tool/connectome/node.h" -#include "gui/mrview/tool/connectome/node_list.h" -#include "gui/mrview/tool/connectome/node_overlay.h" -#include "gui/mrview/tool/connectome/selection.h" -#include "gui/mrview/tool/connectome/shaders.h" -#include "gui/mrview/tool/connectome/types.h" +#include "mrview/tool/connectome/colourmap_observers.h" +#include "mrview/tool/connectome/edge.h" +#include "mrview/tool/connectome/file_data_vector.h" +#include "mrview/tool/connectome/matrix_list.h" +#include "mrview/tool/connectome/node.h" +#include "mrview/tool/connectome/node_list.h" +#include "mrview/tool/connectome/node_overlay.h" +#include "mrview/tool/connectome/selection.h" +#include "mrview/tool/connectome/shaders.h" +#include "mrview/tool/connectome/types.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/edge.cpp b/cpp/lib/gui/mrview/tool/connectome/edge.cpp index 240b496601..f876dc8c5b 100644 --- a/cpp/lib/gui/mrview/tool/connectome/edge.cpp +++ b/cpp/lib/gui/mrview/tool/connectome/edge.cpp @@ -14,14 +14,14 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/connectome/edge.h" +#include "mrview/tool/connectome/edge.h" #include "math/rng.h" #include "dwi/tractography/file.h" #include "dwi/tractography/properties.h" #include "dwi/tractography/streamline.h" -#include "gui/mrview/tool/connectome/connectome.h" +#include "mrview/tool/connectome/connectome.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/edge.h b/cpp/lib/gui/mrview/tool/connectome/edge.h index 3f55c60a16..31b19ca6cf 100644 --- a/cpp/lib/gui/mrview/tool/connectome/edge.h +++ b/cpp/lib/gui/mrview/tool/connectome/edge.h @@ -20,8 +20,8 @@ #include "connectome/connectome.h" #include "dwi/tractography/streamline.h" -#include "gui/opengl/gl.h" #include "math/math.h" +#include "opengl/gl.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/file_data_vector.cpp b/cpp/lib/gui/mrview/tool/connectome/file_data_vector.cpp index 91195a8a2e..ba4831c9bf 100644 --- a/cpp/lib/gui/mrview/tool/connectome/file_data_vector.cpp +++ b/cpp/lib/gui/mrview/tool/connectome/file_data_vector.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/connectome/file_data_vector.h" +#include "mrview/tool/connectome/file_data_vector.h" #include diff --git a/cpp/lib/gui/mrview/tool/connectome/file_data_vector.h b/cpp/lib/gui/mrview/tool/connectome/file_data_vector.h index c4f78a96a1..39afb40c8b 100644 --- a/cpp/lib/gui/mrview/tool/connectome/file_data_vector.h +++ b/cpp/lib/gui/mrview/tool/connectome/file_data_vector.h @@ -18,7 +18,7 @@ #include -#include "gui/gui.h" +#include "gui.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/matrix_list.cpp b/cpp/lib/gui/mrview/tool/connectome/matrix_list.cpp index cc5dc10763..a451e9bbf6 100644 --- a/cpp/lib/gui/mrview/tool/connectome/matrix_list.cpp +++ b/cpp/lib/gui/mrview/tool/connectome/matrix_list.cpp @@ -14,9 +14,9 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/connectome/matrix_list.h" +#include "mrview/tool/connectome/matrix_list.h" -#include "gui/mrview/tool/connectome/connectome.h" +#include "mrview/tool/connectome/connectome.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/matrix_list.h b/cpp/lib/gui/mrview/tool/connectome/matrix_list.h index 4802c5ea53..5c825ba4f6 100644 --- a/cpp/lib/gui/mrview/tool/connectome/matrix_list.h +++ b/cpp/lib/gui/mrview/tool/connectome/matrix_list.h @@ -20,8 +20,8 @@ #include -#include "gui/mrview/tool/connectome/file_data_vector.h" #include "mrtrix.h" +#include "mrview/tool/connectome/file_data_vector.h" namespace MR::GUI::MRView { diff --git a/cpp/lib/gui/mrview/tool/connectome/node.cpp b/cpp/lib/gui/mrview/tool/connectome/node.cpp index f0876ec3ce..14cdff2c85 100644 --- a/cpp/lib/gui/mrview/tool/connectome/node.cpp +++ b/cpp/lib/gui/mrview/tool/connectome/node.cpp @@ -14,11 +14,11 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/connectome/node.h" -#include "gui/mrview/window.h" +#include "mrview/tool/connectome/node.h" +#include "mrview/window.h" #include "exception.h" -#include "gui/mrview/window.h" +#include "mrview/window.h" #include "types.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/node.h b/cpp/lib/gui/mrview/tool/connectome/node.h index c24fafadef..2a2e3d91c1 100644 --- a/cpp/lib/gui/mrview/tool/connectome/node.h +++ b/cpp/lib/gui/mrview/tool/connectome/node.h @@ -18,7 +18,7 @@ #include "image.h" -#include "gui/opengl/gl.h" +#include "opengl/gl.h" #include "surface/mesh.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/node_list.cpp b/cpp/lib/gui/mrview/tool/connectome/node_list.cpp index ffeddc2f95..95671d394f 100644 --- a/cpp/lib/gui/mrview/tool/connectome/node_list.cpp +++ b/cpp/lib/gui/mrview/tool/connectome/node_list.cpp @@ -14,12 +14,12 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/connectome/node_list.h" +#include "mrview/tool/connectome/node_list.h" #include -#include "gui/mrview/tool/base.h" -#include "gui/mrview/tool/connectome/connectome.h" +#include "mrview/tool/base.h" +#include "mrview/tool/connectome/connectome.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/node_list.h b/cpp/lib/gui/mrview/tool/connectome/node_list.h index 5f16e67a46..73a937a518 100644 --- a/cpp/lib/gui/mrview/tool/connectome/node_list.h +++ b/cpp/lib/gui/mrview/tool/connectome/node_list.h @@ -18,8 +18,8 @@ #include -#include "gui/mrview/tool/base.h" -#include "gui/mrview/tool/connectome/selection.h" +#include "mrview/tool/base.h" +#include "mrview/tool/connectome/selection.h" #include #include diff --git a/cpp/lib/gui/mrview/tool/connectome/node_overlay.cpp b/cpp/lib/gui/mrview/tool/connectome/node_overlay.cpp index af3c44d7f8..3509221e0e 100644 --- a/cpp/lib/gui/mrview/tool/connectome/node_overlay.cpp +++ b/cpp/lib/gui/mrview/tool/connectome/node_overlay.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/connectome/node_overlay.h" +#include "mrview/tool/connectome/node_overlay.h" #include diff --git a/cpp/lib/gui/mrview/tool/connectome/node_overlay.h b/cpp/lib/gui/mrview/tool/connectome/node_overlay.h index 0e36bedaab..76cb7ffed9 100644 --- a/cpp/lib/gui/mrview/tool/connectome/node_overlay.h +++ b/cpp/lib/gui/mrview/tool/connectome/node_overlay.h @@ -19,8 +19,8 @@ #include "header.h" #include "types.h" -#include "gui/mrview/displayable.h" -#include "gui/mrview/gui_image.h" +#include "mrview/displayable.h" +#include "mrview/gui_image.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/selection.cpp b/cpp/lib/gui/mrview/tool/connectome/selection.cpp index bd83c9b58f..5ca1f8b9b1 100644 --- a/cpp/lib/gui/mrview/tool/connectome/selection.cpp +++ b/cpp/lib/gui/mrview/tool/connectome/selection.cpp @@ -14,9 +14,9 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/connectome/selection.h" +#include "mrview/tool/connectome/selection.h" -#include "gui/mrview/tool/base.h" +#include "mrview/tool/base.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/selection.h b/cpp/lib/gui/mrview/tool/connectome/selection.h index f06182cdbb..ed82c46574 100644 --- a/cpp/lib/gui/mrview/tool/connectome/selection.h +++ b/cpp/lib/gui/mrview/tool/connectome/selection.h @@ -18,8 +18,8 @@ #include "mrtrix.h" -#include "gui/color_button.h" -#include "gui/mrview/adjust_button.h" +#include "color_button.h" +#include "mrview/adjust_button.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/shaders.cpp b/cpp/lib/gui/mrview/tool/connectome/shaders.cpp index 9cd343d48b..7fefd933d0 100644 --- a/cpp/lib/gui/mrview/tool/connectome/shaders.cpp +++ b/cpp/lib/gui/mrview/tool/connectome/shaders.cpp @@ -14,10 +14,10 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/connectome/shaders.h" -#include "gui/mrview/window.h" +#include "mrview/tool/connectome/shaders.h" +#include "mrview/window.h" -#include "gui/mrview/tool/connectome/connectome.h" +#include "mrview/tool/connectome/connectome.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/connectome/shaders.h b/cpp/lib/gui/mrview/tool/connectome/shaders.h index a87f5fdf68..bf7d1ceb41 100644 --- a/cpp/lib/gui/mrview/tool/connectome/shaders.h +++ b/cpp/lib/gui/mrview/tool/connectome/shaders.h @@ -16,9 +16,9 @@ #pragma once -#include "gui/opengl/shader.h" +#include "opengl/shader.h" -#include "gui/mrview/tool/connectome/types.h" +#include "mrview/tool/connectome/types.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/fixel/base_fixel.cpp b/cpp/lib/gui/mrview/tool/fixel/base_fixel.cpp index 463d0d6c98..0068827b1d 100644 --- a/cpp/lib/gui/mrview/tool/fixel/base_fixel.cpp +++ b/cpp/lib/gui/mrview/tool/fixel/base_fixel.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/fixel/base_fixel.h" +#include "mrview/tool/fixel/base_fixel.h" namespace MR::GUI::MRView::Tool { BaseFixel::BaseFixel(const std::string &filename, Fixel &fixel_tool) diff --git a/cpp/lib/gui/mrview/tool/fixel/base_fixel.h b/cpp/lib/gui/mrview/tool/fixel/base_fixel.h index fa78f92eff..5c1cfa95ca 100644 --- a/cpp/lib/gui/mrview/tool/fixel/base_fixel.h +++ b/cpp/lib/gui/mrview/tool/fixel/base_fixel.h @@ -27,9 +27,9 @@ #include "fixel/legacy/fixel_metric.h" #include "fixel/legacy/image.h" -#include "gui/mrview/displayable.h" -#include "gui/mrview/tool/fixel/fixel.h" -#include "gui/mrview/tool/fixel/vector_structs.h" +#include "mrview/displayable.h" +#include "mrview/tool/fixel/fixel.h" +#include "mrview/tool/fixel/vector_structs.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/fixel/directory.cpp b/cpp/lib/gui/mrview/tool/fixel/directory.cpp index a58a0fc33e..8819b16fec 100644 --- a/cpp/lib/gui/mrview/tool/fixel/directory.cpp +++ b/cpp/lib/gui/mrview/tool/fixel/directory.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/fixel/directory.h" +#include "mrview/tool/fixel/directory.h" namespace MR::GUI::MRView::Tool { void Directory::load_image_buffer() { diff --git a/cpp/lib/gui/mrview/tool/fixel/directory.h b/cpp/lib/gui/mrview/tool/fixel/directory.h index 7df06b4ebf..2417a8ed04 100644 --- a/cpp/lib/gui/mrview/tool/fixel/directory.h +++ b/cpp/lib/gui/mrview/tool/fixel/directory.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/mrview/tool/fixel/base_fixel.h" +#include "mrview/tool/fixel/base_fixel.h" namespace MR::GUI::MRView::Tool { class Directory : public FixelType { diff --git a/cpp/lib/gui/mrview/tool/fixel/fixel.cpp b/cpp/lib/gui/mrview/tool/fixel/fixel.cpp index d8a749a253..17b7ef6685 100644 --- a/cpp/lib/gui/mrview/tool/fixel/fixel.cpp +++ b/cpp/lib/gui/mrview/tool/fixel/fixel.cpp @@ -14,18 +14,18 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/fixel/fixel.h" - -#include "gui/dialog/file.h" -#include "gui/mrview/qthelpers.h" -#include "gui/mrview/tool/fixel/base_fixel.h" -#include "gui/mrview/tool/fixel/directory.h" -#include "gui/mrview/tool/fixel/image4D.h" -#include "gui/mrview/tool/fixel/legacy.h" -#include "gui/mrview/tool/list_model_base.h" -#include "gui/mrview/window.h" +#include "mrview/tool/fixel/fixel.h" + +#include "dialog/file.h" #include "math/rng.h" #include "mrtrix.h" +#include "mrview/qthelpers.h" +#include "mrview/tool/fixel/base_fixel.h" +#include "mrview/tool/fixel/directory.h" +#include "mrview/tool/fixel/image4D.h" +#include "mrview/tool/fixel/legacy.h" +#include "mrview/tool/list_model_base.h" +#include "mrview/window.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/fixel/fixel.h b/cpp/lib/gui/mrview/tool/fixel/fixel.h index 528b88d1b4..dd496e1267 100644 --- a/cpp/lib/gui/mrview/tool/fixel/fixel.h +++ b/cpp/lib/gui/mrview/tool/fixel/fixel.h @@ -16,11 +16,11 @@ #pragma once -#include "gui/mrview/adjust_button.h" -#include "gui/mrview/colourmap_button.h" -#include "gui/mrview/combo_box_error.h" -#include "gui/mrview/tool/base.h" -#include "gui/projection.h" +#include "mrview/adjust_button.h" +#include "mrview/colourmap_button.h" +#include "mrview/combo_box_error.h" +#include "mrview/tool/base.h" +#include "projection.h" namespace MR::GUI::MRView::Tool { class Fixel : public Base, public ColourMapButtonObserver, public DisplayableVisitor { diff --git a/cpp/lib/gui/mrview/tool/fixel/image4D.cpp b/cpp/lib/gui/mrview/tool/fixel/image4D.cpp index 1ba73a9d5c..c44adf1187 100644 --- a/cpp/lib/gui/mrview/tool/fixel/image4D.cpp +++ b/cpp/lib/gui/mrview/tool/fixel/image4D.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/fixel/image4D.h" +#include "mrview/tool/fixel/image4D.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/fixel/image4D.h b/cpp/lib/gui/mrview/tool/fixel/image4D.h index 2ce2241b46..dab9e0c219 100644 --- a/cpp/lib/gui/mrview/tool/fixel/image4D.h +++ b/cpp/lib/gui/mrview/tool/fixel/image4D.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/mrview/tool/fixel/base_fixel.h" +#include "mrview/tool/fixel/base_fixel.h" namespace MR::GUI::MRView::Tool { class Image4D : public FixelType { diff --git a/cpp/lib/gui/mrview/tool/fixel/legacy.cpp b/cpp/lib/gui/mrview/tool/fixel/legacy.cpp index 579e81307e..27bff99e1f 100644 --- a/cpp/lib/gui/mrview/tool/fixel/legacy.cpp +++ b/cpp/lib/gui/mrview/tool/fixel/legacy.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/fixel/legacy.h" +#include "mrview/tool/fixel/legacy.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/fixel/legacy.h b/cpp/lib/gui/mrview/tool/fixel/legacy.h index 6f56a15393..8d8f6ce427 100644 --- a/cpp/lib/gui/mrview/tool/fixel/legacy.h +++ b/cpp/lib/gui/mrview/tool/fixel/legacy.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/mrview/tool/fixel/base_fixel.h" +#include "mrview/tool/fixel/base_fixel.h" namespace MR::GUI::MRView::Tool { class Legacy : public FixelType { diff --git a/cpp/lib/gui/mrview/tool/list.h b/cpp/lib/gui/mrview/tool/list.h index 701288ddb4..58ea938bd9 100644 --- a/cpp/lib/gui/mrview/tool/list.h +++ b/cpp/lib/gui/mrview/tool/list.h @@ -17,15 +17,15 @@ #ifndef TOOL // place #include files in here: -#include "gui/mrview/tool/connectome/connectome.h" -#include "gui/mrview/tool/fixel/fixel.h" -#include "gui/mrview/tool/odf/odf.h" -#include "gui/mrview/tool/overlay.h" -#include "gui/mrview/tool/roi_editor/roi.h" -#include "gui/mrview/tool/screen_capture.h" -#include "gui/mrview/tool/tractography/tractography.h" -#include "gui/mrview/tool/transform.h" -#include "gui/mrview/tool/view.h" +#include "mrview/tool/connectome/connectome.h" +#include "mrview/tool/fixel/fixel.h" +#include "mrview/tool/odf/odf.h" +#include "mrview/tool/overlay.h" +#include "mrview/tool/roi_editor/roi.h" +#include "mrview/tool/screen_capture.h" +#include "mrview/tool/tractography/tractography.h" +#include "mrview/tool/transform.h" +#include "mrview/tool/view.h" #else diff --git a/cpp/lib/gui/mrview/tool/list_model_base.h b/cpp/lib/gui/mrview/tool/list_model_base.h index 739f720618..8893878ade 100644 --- a/cpp/lib/gui/mrview/tool/list_model_base.h +++ b/cpp/lib/gui/mrview/tool/list_model_base.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/mrview/displayable.h" +#include "mrview/displayable.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/odf/item.cpp b/cpp/lib/gui/mrview/tool/odf/item.cpp index 7e7e85ca3a..b9d415d477 100644 --- a/cpp/lib/gui/mrview/tool/odf/item.cpp +++ b/cpp/lib/gui/mrview/tool/odf/item.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/odf/item.h" +#include "mrview/tool/odf/item.h" #include "dwi/gradient.h" #include "header.h" diff --git a/cpp/lib/gui/mrview/tool/odf/item.h b/cpp/lib/gui/mrview/tool/odf/item.h index d1b9384ded..4912864646 100644 --- a/cpp/lib/gui/mrview/tool/odf/item.h +++ b/cpp/lib/gui/mrview/tool/odf/item.h @@ -21,9 +21,9 @@ #include "dwi/shells.h" #include "dwi/directions/set.h" -#include "gui/dwi/renderer.h" -#include "gui/mrview/gui_image.h" -#include "gui/mrview/tool/odf/type.h" +#include "dwi/renderer.h" +#include "mrview/gui_image.h" +#include "mrview/tool/odf/type.h" namespace MR { diff --git a/cpp/lib/gui/mrview/tool/odf/model.cpp b/cpp/lib/gui/mrview/tool/odf/model.cpp index a694d97614..55e4851528 100644 --- a/cpp/lib/gui/mrview/tool/odf/model.cpp +++ b/cpp/lib/gui/mrview/tool/odf/model.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/odf/model.h" +#include "mrview/tool/odf/model.h" #include "header.h" diff --git a/cpp/lib/gui/mrview/tool/odf/model.h b/cpp/lib/gui/mrview/tool/odf/model.h index 439cf739ae..2ff95353cf 100644 --- a/cpp/lib/gui/mrview/tool/odf/model.h +++ b/cpp/lib/gui/mrview/tool/odf/model.h @@ -21,8 +21,8 @@ #include "types.h" -#include "gui/mrview/tool/odf/item.h" -#include "gui/mrview/tool/odf/type.h" +#include "mrview/tool/odf/item.h" +#include "mrview/tool/odf/type.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/odf/odf.cpp b/cpp/lib/gui/mrview/tool/odf/odf.cpp index 849db14e37..1229ca4132 100644 --- a/cpp/lib/gui/mrview/tool/odf/odf.cpp +++ b/cpp/lib/gui/mrview/tool/odf/odf.cpp @@ -18,16 +18,16 @@ #include "dwi/shells.h" #include "mrtrix.h" +#include "dialog/file.h" #include "dwi/directions/set.h" -#include "gui/dialog/file.h" -#include "gui/dwi/render_frame.h" -#include "gui/lighting_dock.h" -#include "gui/mrview/mode/base.h" -#include "gui/mrview/tool/odf/item.h" -#include "gui/mrview/tool/odf/model.h" -#include "gui/mrview/tool/odf/odf.h" -#include "gui/mrview/tool/odf/preview.h" -#include "gui/mrview/window.h" +#include "dwi/render_frame.h" +#include "lighting_dock.h" +#include "mrview/mode/base.h" +#include "mrview/tool/odf/item.h" +#include "mrview/tool/odf/model.h" +#include "mrview/tool/odf/odf.h" +#include "mrview/tool/odf/preview.h" +#include "mrview/window.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/odf/odf.h b/cpp/lib/gui/mrview/tool/odf/odf.h index 1e586faf2c..9f83c6a413 100644 --- a/cpp/lib/gui/mrview/tool/odf/odf.h +++ b/cpp/lib/gui/mrview/tool/odf/odf.h @@ -16,11 +16,11 @@ #pragma once -#include "gui/color_button.h" -#include "gui/mrview/adjust_button.h" -#include "gui/mrview/spin_box.h" -#include "gui/mrview/tool/base.h" -#include "gui/mrview/tool/odf/type.h" +#include "color_button.h" +#include "mrview/adjust_button.h" +#include "mrview/spin_box.h" +#include "mrview/tool/base.h" +#include "mrview/tool/odf/type.h" namespace MR::GUI { namespace DWI { diff --git a/cpp/lib/gui/mrview/tool/odf/preview.cpp b/cpp/lib/gui/mrview/tool/odf/preview.cpp index 87a3be4987..938dff622f 100644 --- a/cpp/lib/gui/mrview/tool/odf/preview.cpp +++ b/cpp/lib/gui/mrview/tool/odf/preview.cpp @@ -14,11 +14,11 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/odf/preview.h" -#include "gui/dwi/render_frame.h" -#include "gui/mrview/mode/base.h" -#include "gui/mrview/tool/odf/odf.h" -#include "gui/mrview/window.h" +#include "mrview/tool/odf/preview.h" +#include "dwi/render_frame.h" +#include "mrview/mode/base.h" +#include "mrview/tool/odf/odf.h" +#include "mrview/window.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/odf/preview.h b/cpp/lib/gui/mrview/tool/odf/preview.h index ad12d4e62c..9fa48f65e8 100644 --- a/cpp/lib/gui/mrview/tool/odf/preview.h +++ b/cpp/lib/gui/mrview/tool/odf/preview.h @@ -16,11 +16,11 @@ #pragma once -#include "gui/dwi/render_frame.h" +#include "dwi/render_frame.h" -#include "gui/mrview/spin_box.h" -#include "gui/mrview/tool/odf/odf.h" -#include "gui/mrview/window.h" +#include "mrview/spin_box.h" +#include "mrview/tool/odf/odf.h" +#include "mrview/window.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/odf/type.h b/cpp/lib/gui/mrview/tool/odf/type.h index e67ab16c26..d6a9ad1627 100644 --- a/cpp/lib/gui/mrview/tool/odf/type.h +++ b/cpp/lib/gui/mrview/tool/odf/type.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/dwi/renderer.h" +#include "dwi/renderer.h" namespace MR { diff --git a/cpp/lib/gui/mrview/tool/overlay.cpp b/cpp/lib/gui/mrview/tool/overlay.cpp index c9613cd12e..602e29339b 100644 --- a/cpp/lib/gui/mrview/tool/overlay.cpp +++ b/cpp/lib/gui/mrview/tool/overlay.cpp @@ -14,15 +14,15 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/overlay.h" - -#include "gui/dialog/file.h" -#include "gui/mrview/gui_image.h" -#include "gui/mrview/mode/slice.h" -#include "gui/mrview/qthelpers.h" -#include "gui/mrview/tool/list_model_base.h" -#include "gui/mrview/window.h" +#include "mrview/tool/overlay.h" + +#include "dialog/file.h" #include "mrtrix.h" +#include "mrview/gui_image.h" +#include "mrview/mode/slice.h" +#include "mrview/qthelpers.h" +#include "mrview/tool/list_model_base.h" +#include "mrview/window.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/overlay.h b/cpp/lib/gui/mrview/tool/overlay.h index b16a037021..58bf052c7d 100644 --- a/cpp/lib/gui/mrview/tool/overlay.h +++ b/cpp/lib/gui/mrview/tool/overlay.h @@ -16,11 +16,11 @@ #pragma once -#include "gui/mrview/adjust_button.h" -#include "gui/mrview/colourmap_button.h" -#include "gui/mrview/mode/base.h" -#include "gui/mrview/spin_box.h" -#include "gui/mrview/tool/base.h" +#include "mrview/adjust_button.h" +#include "mrview/colourmap_button.h" +#include "mrview/mode/base.h" +#include "mrview/spin_box.h" +#include "mrview/tool/base.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/roi_editor/item.cpp b/cpp/lib/gui/mrview/tool/roi_editor/item.cpp index e62d235a56..c4c6152c1a 100644 --- a/cpp/lib/gui/mrview/tool/roi_editor/item.cpp +++ b/cpp/lib/gui/mrview/tool/roi_editor/item.cpp @@ -17,14 +17,14 @@ #include #include -#include "gui/mrview/tool/roi_editor/item.h" +#include "mrview/tool/roi_editor/item.h" #include "algo/loop.h" #include "file/config.h" #include "progressbar.h" -#include "gui/dialog/file.h" -#include "gui/mrview/window.h" +#include "dialog/file.h" +#include "mrview/window.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/roi_editor/item.h b/cpp/lib/gui/mrview/tool/roi_editor/item.h index df1d163f46..824b689ec4 100644 --- a/cpp/lib/gui/mrview/tool/roi_editor/item.h +++ b/cpp/lib/gui/mrview/tool/roi_editor/item.h @@ -19,9 +19,9 @@ #include #include "algo/loop.h" -#include "gui/mrview/tool/roi_editor/undoentry.h" -#include "gui/mrview/volume.h" #include "header.h" +#include "mrview/tool/roi_editor/undoentry.h" +#include "mrview/volume.h" #include "types.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/roi_editor/model.cpp b/cpp/lib/gui/mrview/tool/roi_editor/model.cpp index 617d1bb5d5..26d068e5c4 100644 --- a/cpp/lib/gui/mrview/tool/roi_editor/model.cpp +++ b/cpp/lib/gui/mrview/tool/roi_editor/model.cpp @@ -14,8 +14,8 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/roi_editor/model.h" -#include "gui/mrview/window.h" +#include "mrview/tool/roi_editor/model.h" +#include "mrview/window.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/roi_editor/model.h b/cpp/lib/gui/mrview/tool/roi_editor/model.h index 2e5bd5579b..d3340ade6b 100644 --- a/cpp/lib/gui/mrview/tool/roi_editor/model.h +++ b/cpp/lib/gui/mrview/tool/roi_editor/model.h @@ -16,10 +16,10 @@ #pragma once -#include "gui/mrview/tool/list_model_base.h" -#include "gui/mrview/tool/roi_editor/item.h" #include "header.h" #include "memory.h" +#include "mrview/tool/list_model_base.h" +#include "mrview/tool/roi_editor/item.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/roi_editor/roi.cpp b/cpp/lib/gui/mrview/tool/roi_editor/roi.cpp index df5adfb7ea..ba77bd2dec 100644 --- a/cpp/lib/gui/mrview/tool/roi_editor/roi.cpp +++ b/cpp/lib/gui/mrview/tool/roi_editor/roi.cpp @@ -16,13 +16,13 @@ #include -#include "gui/mrview/qthelpers.h" -#include "gui/mrview/tool/roi_editor/roi.h" +#include "mrview/qthelpers.h" +#include "mrview/tool/roi_editor/roi.h" -#include "gui/cursor.h" -#include "gui/dialog/file.h" -#include "gui/projection.h" +#include "cursor.h" +#include "dialog/file.h" #include "header.h" +#include "projection.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/roi_editor/roi.h b/cpp/lib/gui/mrview/tool/roi_editor/roi.h index 5625d91ca1..fa7b42867e 100644 --- a/cpp/lib/gui/mrview/tool/roi_editor/roi.h +++ b/cpp/lib/gui/mrview/tool/roi_editor/roi.h @@ -20,15 +20,15 @@ #include "transform.h" #include "types.h" -#include "gui/color_button.h" -#include "gui/mrview/adjust_button.h" -#include "gui/mrview/mode/base.h" -#include "gui/mrview/mode/slice.h" -#include "gui/mrview/tool/base.h" - -#include "gui/mrview/tool/roi_editor/item.h" -#include "gui/mrview/tool/roi_editor/model.h" -#include "gui/mrview/tool/roi_editor/undoentry.h" +#include "color_button.h" +#include "mrview/adjust_button.h" +#include "mrview/mode/base.h" +#include "mrview/mode/slice.h" +#include "mrview/tool/base.h" + +#include "mrview/tool/roi_editor/item.h" +#include "mrview/tool/roi_editor/model.h" +#include "mrview/tool/roi_editor/undoentry.h" namespace MR { diff --git a/cpp/lib/gui/mrview/tool/roi_editor/undoentry.cpp b/cpp/lib/gui/mrview/tool/roi_editor/undoentry.cpp index 6c25deccea..5b4037ee3a 100644 --- a/cpp/lib/gui/mrview/tool/roi_editor/undoentry.cpp +++ b/cpp/lib/gui/mrview/tool/roi_editor/undoentry.cpp @@ -16,9 +16,9 @@ #include -#include "gui/mrview/tool/roi_editor/item.h" -#include "gui/mrview/tool/roi_editor/undoentry.h" -#include "gui/mrview/window.h" +#include "mrview/tool/roi_editor/item.h" +#include "mrview/tool/roi_editor/undoentry.h" +#include "mrview/window.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/roi_editor/undoentry.h b/cpp/lib/gui/mrview/tool/roi_editor/undoentry.h index 3afa217fc5..2a01e21022 100644 --- a/cpp/lib/gui/mrview/tool/roi_editor/undoentry.h +++ b/cpp/lib/gui/mrview/tool/roi_editor/undoentry.h @@ -21,8 +21,8 @@ #include "types.h" -#include "gui/opengl/gl.h" -#include "gui/opengl/shader.h" +#include "opengl/gl.h" +#include "opengl/shader.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/screen_capture.cpp b/cpp/lib/gui/mrview/tool/screen_capture.cpp index 8c0e800fee..cc978d74b8 100644 --- a/cpp/lib/gui/mrview/tool/screen_capture.cpp +++ b/cpp/lib/gui/mrview/tool/screen_capture.cpp @@ -16,13 +16,13 @@ #include +#include "dialog/file.h" #include "file/path.h" -#include "gui/dialog/file.h" -#include "gui/mrview/mode/base.h" -#include "gui/mrview/tool/screen_capture.h" -#include "gui/mrview/window.h" -#include "gui/opengl/transformation.h" #include "mrtrix.h" +#include "mrview/mode/base.h" +#include "mrview/tool/screen_capture.h" +#include "mrview/window.h" +#include "opengl/transformation.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/screen_capture.h b/cpp/lib/gui/mrview/tool/screen_capture.h index 54cef10694..8abcedcbc4 100644 --- a/cpp/lib/gui/mrview/tool/screen_capture.h +++ b/cpp/lib/gui/mrview/tool/screen_capture.h @@ -18,9 +18,9 @@ #include -#include "gui/mrview/adjust_button.h" -#include "gui/mrview/spin_box.h" -#include "gui/mrview/tool/base.h" +#include "mrview/adjust_button.h" +#include "mrview/spin_box.h" +#include "mrview/tool/base.h" namespace MR::GUI::MRView { class AdjustButton; diff --git a/cpp/lib/gui/mrview/tool/tractography/track_scalar_file.cpp b/cpp/lib/gui/mrview/tool/tractography/track_scalar_file.cpp index 5a77745b04..b8a48422cb 100644 --- a/cpp/lib/gui/mrview/tool/tractography/track_scalar_file.cpp +++ b/cpp/lib/gui/mrview/tool/tractography/track_scalar_file.cpp @@ -14,10 +14,10 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/tractography/track_scalar_file.h" +#include "mrview/tool/tractography/track_scalar_file.h" -#include "gui/dialog/file.h" -#include "gui/mrview/tool/tractography/tractogram.h" +#include "dialog/file.h" +#include "mrview/tool/tractography/tractogram.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/tractography/track_scalar_file.h b/cpp/lib/gui/mrview/tool/tractography/track_scalar_file.h index feb5a17e36..9d3abd757f 100644 --- a/cpp/lib/gui/mrview/tool/tractography/track_scalar_file.h +++ b/cpp/lib/gui/mrview/tool/tractography/track_scalar_file.h @@ -16,11 +16,11 @@ #pragma once -#include "gui/mrview/adjust_button.h" -#include "gui/mrview/colourmap_button.h" -#include "gui/mrview/displayable.h" -#include "gui/mrview/tool/base.h" -#include "gui/mrview/tool/tractography/tractogram_enums.h" +#include "mrview/adjust_button.h" +#include "mrview/colourmap_button.h" +#include "mrview/displayable.h" +#include "mrview/tool/base.h" +#include "mrview/tool/tractography/tractogram_enums.h" namespace MR::GUI::MRView::Tool { class Tractogram; diff --git a/cpp/lib/gui/mrview/tool/tractography/tractogram.cpp b/cpp/lib/gui/mrview/tool/tractography/tractogram.cpp index 61d68a016c..5293e88db3 100644 --- a/cpp/lib/gui/mrview/tool/tractography/tractogram.cpp +++ b/cpp/lib/gui/mrview/tool/tractography/tractogram.cpp @@ -14,16 +14,16 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/tractography/tractogram.h" +#include "mrview/tool/tractography/tractogram.h" #include "dwi/tractography/file.h" #include "dwi/tractography/properties.h" #include "dwi/tractography/scalar_file.h" #include "file/matrix.h" -#include "gui/mrview/mode/base.h" -#include "gui/mrview/window.h" -#include "gui/opengl/lighting.h" -#include "gui/projection.h" +#include "mrview/mode/base.h" +#include "mrview/window.h" +#include "opengl/lighting.h" #include "progressbar.h" +#include "projection.h" const size_t MAX_BUFFER_SIZE = 2796200; // number of points to fill 32MB diff --git a/cpp/lib/gui/mrview/tool/tractography/tractogram.h b/cpp/lib/gui/mrview/tool/tractography/tractogram.h index 20c3b26615..41f0e46d6e 100644 --- a/cpp/lib/gui/mrview/tool/tractography/tractogram.h +++ b/cpp/lib/gui/mrview/tool/tractography/tractogram.h @@ -17,8 +17,8 @@ #pragma once #include "dwi/tractography/properties.h" -#include "gui/mrview/displayable.h" -#include "gui/mrview/tool/tractography/tractography.h" +#include "mrview/displayable.h" +#include "mrview/tool/tractography/tractography.h" namespace MR::GUI { class Projection; diff --git a/cpp/lib/gui/mrview/tool/tractography/tractography.cpp b/cpp/lib/gui/mrview/tool/tractography/tractography.cpp index fb9e3aa7f0..aa4f9f3018 100644 --- a/cpp/lib/gui/mrview/tool/tractography/tractography.cpp +++ b/cpp/lib/gui/mrview/tool/tractography/tractography.cpp @@ -14,16 +14,16 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/tractography/tractography.h" -#include "gui/dialog/file.h" -#include "gui/lighting_dock.h" -#include "gui/mrview/qthelpers.h" -#include "gui/mrview/tool/list_model_base.h" -#include "gui/mrview/tool/tractography/track_scalar_file.h" -#include "gui/mrview/tool/tractography/tractogram.h" -#include "gui/mrview/window.h" -#include "gui/opengl/lighting.h" +#include "mrview/tool/tractography/tractography.h" +#include "dialog/file.h" +#include "lighting_dock.h" #include "mrtrix.h" +#include "mrview/qthelpers.h" +#include "mrview/tool/list_model_base.h" +#include "mrview/tool/tractography/track_scalar_file.h" +#include "mrview/tool/tractography/tractogram.h" +#include "mrview/window.h" +#include "opengl/lighting.h" namespace MR::GUI::MRView::Tool { const std::vector tractogram_geometry_types = {"pseudotubes", "lines", "points"}; diff --git a/cpp/lib/gui/mrview/tool/tractography/tractography.h b/cpp/lib/gui/mrview/tool/tractography/tractography.h index 090ac53135..6853cdf7dd 100644 --- a/cpp/lib/gui/mrview/tool/tractography/tractography.h +++ b/cpp/lib/gui/mrview/tool/tractography/tractography.h @@ -16,12 +16,12 @@ #pragma once -#include "gui/color_button.h" -#include "gui/mrview/adjust_button.h" -#include "gui/mrview/combo_box_error.h" -#include "gui/mrview/tool/base.h" -#include "gui/mrview/tool/tractography/track_scalar_file.h" -#include "gui/projection.h" +#include "color_button.h" +#include "mrview/adjust_button.h" +#include "mrview/combo_box_error.h" +#include "mrview/tool/base.h" +#include "mrview/tool/tractography/track_scalar_file.h" +#include "projection.h" namespace MR::GUI { namespace GL { diff --git a/cpp/lib/gui/mrview/tool/transform.cpp b/cpp/lib/gui/mrview/tool/transform.cpp index c87f81ecc2..8931ad2187 100644 --- a/cpp/lib/gui/mrview/tool/transform.cpp +++ b/cpp/lib/gui/mrview/tool/transform.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/transform.h" +#include "mrview/tool/transform.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/transform.h b/cpp/lib/gui/mrview/tool/transform.h index 438d63da93..0e6d5d8c44 100644 --- a/cpp/lib/gui/mrview/tool/transform.h +++ b/cpp/lib/gui/mrview/tool/transform.h @@ -16,8 +16,8 @@ #pragma once -#include "gui/mrview/mode/base.h" -#include "gui/mrview/tool/base.h" +#include "mrview/mode/base.h" +#include "mrview/tool/base.h" namespace MR::GUI::MRView::Tool { diff --git a/cpp/lib/gui/mrview/tool/view.cpp b/cpp/lib/gui/mrview/tool/view.cpp index ac730c4c20..5cdd434273 100644 --- a/cpp/lib/gui/mrview/tool/view.cpp +++ b/cpp/lib/gui/mrview/tool/view.cpp @@ -14,16 +14,16 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/tool/view.h" - -#include "gui/mrview/adjust_button.h" -#include "gui/mrview/mode/lightbox.h" -#include "gui/mrview/mode/lightbox_gui.h" -#include "gui/mrview/mode/ortho.h" -#include "gui/mrview/mode/volume.h" -#include "gui/mrview/window.h" +#include "mrview/tool/view.h" + #include "math/math.h" #include "mrtrix.h" +#include "mrview/adjust_button.h" +#include "mrview/mode/lightbox.h" +#include "mrview/mode/lightbox_gui.h" +#include "mrview/mode/ortho.h" +#include "mrview/mode/volume.h" +#include "mrview/window.h" #define FOV_RATE_MULTIPLIER 0.01f #define MRTRIX_MIN_ALPHA 1.0e-3f diff --git a/cpp/lib/gui/mrview/tool/view.h b/cpp/lib/gui/mrview/tool/view.h index ebb53c498a..68a5dc0a95 100644 --- a/cpp/lib/gui/mrview/tool/view.h +++ b/cpp/lib/gui/mrview/tool/view.h @@ -16,10 +16,10 @@ #pragma once -#include "gui/mrview/mode/base.h" -#include "gui/mrview/spin_box.h" -#include "gui/mrview/tool/base.h" -#include "gui/opengl/transformation.h" +#include "mrview/mode/base.h" +#include "mrview/spin_box.h" +#include "mrview/tool/base.h" +#include "opengl/transformation.h" namespace MR::GUI::MRView { class AdjustButton; diff --git a/cpp/lib/gui/mrview/volume.cpp b/cpp/lib/gui/mrview/volume.cpp index 14d42eb834..cbcc179257 100644 --- a/cpp/lib/gui/mrview/volume.cpp +++ b/cpp/lib/gui/mrview/volume.cpp @@ -14,9 +14,9 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/mrview/volume.h" +#include "mrview/volume.h" -#include "gui/mrview/window.h" +#include "mrview/window.h" namespace MR::GUI::MRView { diff --git a/cpp/lib/gui/mrview/volume.h b/cpp/lib/gui/mrview/volume.h index 8ed53270e4..5816a8ce91 100644 --- a/cpp/lib/gui/mrview/volume.h +++ b/cpp/lib/gui/mrview/volume.h @@ -20,8 +20,8 @@ #include "transform.h" #include "file/config.h" -#include "gui/mrview/displayable.h" -#include "gui/opengl/gl.h" +#include "mrview/displayable.h" +#include "opengl/gl.h" namespace MR::GUI { class Projection; diff --git a/cpp/lib/gui/mrview/window.cpp b/cpp/lib/gui/mrview/window.cpp index d0e9ccdcbf..ee9c2b0039 100644 --- a/cpp/lib/gui/mrview/window.cpp +++ b/cpp/lib/gui/mrview/window.cpp @@ -15,20 +15,20 @@ */ #include "algo/copy.h" #include "app.h" +#include "dialog/dialog.h" +#include "dialog/file.h" +#include "dialog/image_properties.h" +#include "dialog/opengl.h" +#include "dialog/progress.h" #include "file/config.h" -#include "gui/dialog/dialog.h" -#include "gui/dialog/file.h" -#include "gui/dialog/image_properties.h" -#include "gui/dialog/opengl.h" -#include "gui/dialog/progress.h" -#include "gui/mrview/mode/base.h" -#include "gui/mrview/mode/list.h" -#include "gui/mrview/qthelpers.h" -#include "gui/mrview/tool/base.h" -#include "gui/mrview/tool/list.h" -#include "gui/opengl/gl.h" -#include "gui/opengl/lighting.h" #include "header.h" +#include "mrview/mode/base.h" +#include "mrview/mode/list.h" +#include "mrview/qthelpers.h" +#include "mrview/tool/base.h" +#include "mrview/tool/list.h" +#include "opengl/gl.h" +#include "opengl/lighting.h" #include "timer.h" #include @@ -40,7 +40,7 @@ using namespace App; const OptionGroup Window::options = OptionGroup ("General options") + Option ("mode", "select initial display mode by its short ID. Valid mode IDs are: " -#include "gui/mrview/mode/list.h" +#include "mrview/mode/list.h" ) + Argument ("name"); #undef MODE @@ -448,7 +448,7 @@ Window::Window() #define MODE_OPTION(classname, specifier, name, description) MODE(classname, specifier, name, description) { size_t n = 1; -#include "gui/mrview/mode/list.h" +#include "mrview/mode/list.h" } #undef MODE #undef MODE_OPTION @@ -661,7 +661,7 @@ Window::Window() { using namespace Tool; size_t n = 1; -#include "gui/mrview/tool/list.h" +#include "mrview/tool/list.h" } for (int n = 0; n < tool_group->actions().size(); ++n) addAction(tool_group->actions()[n]); @@ -1663,7 +1663,7 @@ void Window::process_commandline_option() { // see whether option is claimed by any tools: size_t tool_id = 0; std::string stub; -#include "gui/mrview/tool/list.h" +#include "mrview/tool/list.h" // process general options: if (opt.opt->is("mode")) { diff --git a/cpp/lib/gui/mrview/window.h b/cpp/lib/gui/mrview/window.h index 4a4ec26489..387c73f9d8 100644 --- a/cpp/lib/gui/mrview/window.h +++ b/cpp/lib/gui/mrview/window.h @@ -16,14 +16,14 @@ #pragma once -#include "gui/cursor.h" -#include "gui/gui.h" -#include "gui/mrview/colourbars.h" -#include "gui/mrview/colourmap_button.h" -#include "gui/mrview/gui_image.h" -#include "gui/opengl/font.h" +#include "cursor.h" +#include "gui.h" #include "image.h" #include "memory.h" +#include "mrview/colourbars.h" +#include "mrview/colourmap_button.h" +#include "mrview/gui_image.h" +#include "opengl/font.h" namespace MR::GUI { namespace GL { diff --git a/cpp/lib/gui/opengl/font.cpp b/cpp/lib/gui/opengl/font.cpp index 86d01a9670..93791e75ca 100644 --- a/cpp/lib/gui/opengl/font.cpp +++ b/cpp/lib/gui/opengl/font.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/opengl/font.h" +#include "opengl/font.h" #include "debug.h" #include "math/math.h" diff --git a/cpp/lib/gui/opengl/font.h b/cpp/lib/gui/opengl/font.h index d8b9a356ef..b90ae5486b 100644 --- a/cpp/lib/gui/opengl/font.h +++ b/cpp/lib/gui/opengl/font.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/opengl/shader.h" +#include "opengl/shader.h" namespace MR::GUI::GL { diff --git a/cpp/lib/gui/opengl/gl.cpp b/cpp/lib/gui/opengl/gl.cpp index 6d8e68e019..db8220f34c 100644 --- a/cpp/lib/gui/opengl/gl.cpp +++ b/cpp/lib/gui/opengl/gl.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/opengl/gl.h" +#include "opengl/gl.h" #include "file/config.h" namespace MR::GUI::GL { diff --git a/cpp/lib/gui/opengl/gl.h b/cpp/lib/gui/opengl/gl.h index e579999fbc..bfcd69fcf6 100644 --- a/cpp/lib/gui/opengl/gl.h +++ b/cpp/lib/gui/opengl/gl.h @@ -26,7 +26,7 @@ #include #include #include -#include "gui/opengl/gl_core_3_3.h" +#include "opengl/gl_core_3_3.h" // clang-format on #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) diff --git a/cpp/lib/gui/opengl/gl_core_3_3.cpp b/cpp/lib/gui/opengl/gl_core_3_3.cpp index 884d7e702b..b01c5c2ca9 100644 --- a/cpp/lib/gui/opengl/gl_core_3_3.cpp +++ b/cpp/lib/gui/opengl/gl_core_3_3.cpp @@ -25,7 +25,7 @@ #include #endif -#include "gui/opengl/gl_core_3_3.h" +#include "opengl/gl_core_3_3.h" #include #include #include diff --git a/cpp/lib/gui/opengl/lighting.cpp b/cpp/lib/gui/opengl/lighting.cpp index 549ca22355..a95beb78bc 100644 --- a/cpp/lib/gui/opengl/lighting.cpp +++ b/cpp/lib/gui/opengl/lighting.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/opengl/lighting.h" +#include "opengl/lighting.h" #include "file/config.h" namespace MR::GUI::GL { diff --git a/cpp/lib/gui/opengl/lighting.h b/cpp/lib/gui/opengl/lighting.h index 8e5f89e85d..552ddfd8d8 100644 --- a/cpp/lib/gui/opengl/lighting.h +++ b/cpp/lib/gui/opengl/lighting.h @@ -16,7 +16,7 @@ #pragma once -#include "gui/opengl/gl.h" +#include "opengl/gl.h" namespace MR::GUI::GL { diff --git a/cpp/lib/gui/opengl/shader.cpp b/cpp/lib/gui/opengl/shader.cpp index ed7c3186fc..51a4e6b1e8 100644 --- a/cpp/lib/gui/opengl/shader.cpp +++ b/cpp/lib/gui/opengl/shader.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/opengl/shader.h" +#include "opengl/shader.h" namespace MR::GUI::GL::Shader { diff --git a/cpp/lib/gui/opengl/shader.h b/cpp/lib/gui/opengl/shader.h index 3497862730..b8478f3149 100644 --- a/cpp/lib/gui/opengl/shader.h +++ b/cpp/lib/gui/opengl/shader.h @@ -17,7 +17,7 @@ #pragma once #include "app.h" -#include "gui/opengl/gl.h" +#include "opengl/gl.h" namespace MR::GUI::GL::Shader { diff --git a/cpp/lib/gui/opengl/transformation.h b/cpp/lib/gui/opengl/transformation.h index 0d8ae8e946..0388df9ab3 100644 --- a/cpp/lib/gui/opengl/transformation.h +++ b/cpp/lib/gui/opengl/transformation.h @@ -18,8 +18,8 @@ #include -#include "gui/opengl/gl.h" #include "math/least_squares.h" +#include "opengl/gl.h" namespace MR::GUI::GL { diff --git a/cpp/lib/gui/projection.cpp b/cpp/lib/gui/projection.cpp index a83d314f54..8f7fa16c2f 100644 --- a/cpp/lib/gui/projection.cpp +++ b/cpp/lib/gui/projection.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/projection.h" +#include "projection.h" namespace MR::GUI { diff --git a/cpp/lib/gui/projection.h b/cpp/lib/gui/projection.h index c0ca984f9e..1de2d87e4d 100644 --- a/cpp/lib/gui/projection.h +++ b/cpp/lib/gui/projection.h @@ -16,11 +16,11 @@ #pragma once -#include "gui/crosshair.h" -#include "gui/gui.h" -#include "gui/opengl/font.h" -#include "gui/opengl/gl.h" -#include "gui/opengl/transformation.h" +#include "crosshair.h" +#include "gui.h" +#include "opengl/font.h" +#include "opengl/gl.h" +#include "opengl/transformation.h" namespace MR::GUI { diff --git a/cpp/lib/gui/shapes/cube.cpp b/cpp/lib/gui/shapes/cube.cpp index 3d248d10ff..0c0ce96362 100644 --- a/cpp/lib/gui/shapes/cube.cpp +++ b/cpp/lib/gui/shapes/cube.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/shapes/cube.h" +#include "shapes/cube.h" namespace { diff --git a/cpp/lib/gui/shapes/cube.h b/cpp/lib/gui/shapes/cube.h index 94fe81cbef..455e9d05d0 100644 --- a/cpp/lib/gui/shapes/cube.h +++ b/cpp/lib/gui/shapes/cube.h @@ -16,8 +16,8 @@ #pragma once -#include "gui/opengl/gl.h" -#include "gui/opengl/gl_core_3_3.h" +#include "opengl/gl.h" +#include "opengl/gl_core_3_3.h" namespace MR::GUI::Shapes { diff --git a/cpp/lib/gui/shapes/cylinder.cpp b/cpp/lib/gui/shapes/cylinder.cpp index bac8336892..4f018153ef 100644 --- a/cpp/lib/gui/shapes/cylinder.cpp +++ b/cpp/lib/gui/shapes/cylinder.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/shapes/cylinder.h" +#include "shapes/cylinder.h" #include "types.h" diff --git a/cpp/lib/gui/shapes/cylinder.h b/cpp/lib/gui/shapes/cylinder.h index 16d44687d5..5c9c832e50 100644 --- a/cpp/lib/gui/shapes/cylinder.h +++ b/cpp/lib/gui/shapes/cylinder.h @@ -16,8 +16,8 @@ #pragma once -#include "gui/opengl/gl.h" -#include "gui/opengl/gl_core_3_3.h" +#include "opengl/gl.h" +#include "opengl/gl_core_3_3.h" namespace MR::GUI::Shapes { diff --git a/cpp/lib/gui/shapes/halfsphere.cpp b/cpp/lib/gui/shapes/halfsphere.cpp index ac797335b9..d1d00219d3 100644 --- a/cpp/lib/gui/shapes/halfsphere.cpp +++ b/cpp/lib/gui/shapes/halfsphere.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/shapes/halfsphere.h" +#include "shapes/halfsphere.h" #include diff --git a/cpp/lib/gui/shapes/halfsphere.h b/cpp/lib/gui/shapes/halfsphere.h index 11be874b12..70a5253086 100644 --- a/cpp/lib/gui/shapes/halfsphere.h +++ b/cpp/lib/gui/shapes/halfsphere.h @@ -18,8 +18,8 @@ #include "types.h" -#include "gui/opengl/gl.h" -#include "gui/opengl/gl_core_3_3.h" +#include "opengl/gl.h" +#include "opengl/gl_core_3_3.h" namespace MR::GUI::Shapes { diff --git a/cpp/lib/gui/shapes/sphere.cpp b/cpp/lib/gui/shapes/sphere.cpp index 721e09d429..a6a188f75c 100644 --- a/cpp/lib/gui/shapes/sphere.cpp +++ b/cpp/lib/gui/shapes/sphere.cpp @@ -14,7 +14,7 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/shapes/sphere.h" +#include "shapes/sphere.h" #include diff --git a/cpp/lib/gui/shapes/sphere.h b/cpp/lib/gui/shapes/sphere.h index 3e4a70d991..e1eef46633 100644 --- a/cpp/lib/gui/shapes/sphere.h +++ b/cpp/lib/gui/shapes/sphere.h @@ -18,8 +18,8 @@ #include "types.h" -#include "gui/opengl/gl.h" -#include "gui/opengl/gl_core_3_3.h" +#include "opengl/gl.h" +#include "opengl/gl_core_3_3.h" namespace MR::GUI::Shapes { diff --git a/cpp/lib/gui/shview/render_window.cpp b/cpp/lib/gui/shview/render_window.cpp index d956b4b9e9..71acb71afc 100644 --- a/cpp/lib/gui/shview/render_window.cpp +++ b/cpp/lib/gui/shview/render_window.cpp @@ -14,14 +14,14 @@ * For more details, see http://www.mrtrix.org/. */ -#include "gui/shview/render_window.h" +#include "shview/render_window.h" #include "app.h" +#include "dialog/dialog.h" +#include "dialog/file.h" +#include "dwi/render_frame.h" #include "file/matrix.h" #include "file/path.h" -#include "gui/dialog/dialog.h" -#include "gui/dialog/file.h" -#include "gui/dwi/render_frame.h" -#include "gui/lighting_dock.h" +#include "lighting_dock.h" #include "math/SH.h" #include "math/math.h" diff --git a/cpp/lib/gui/shview/render_window.h b/cpp/lib/gui/shview/render_window.h index cbada0332f..52732de84a 100644 --- a/cpp/lib/gui/shview/render_window.h +++ b/cpp/lib/gui/shview/render_window.h @@ -16,8 +16,8 @@ #pragma once -#include "gui/dwi/render_frame.h" -#include "gui/opengl/gl.h" +#include "dwi/render_frame.h" +#include "opengl/gl.h" namespace MR::GUI { class LightingDock;