rename GUI/View/Plot2D/ -> GUI/View/Canvas/

GUI/View/Plot2D/ColorMapCanvas.cpp → GUI/View/Canvas/ColorMapCanvas.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Plot2D/ColorMapCanvas.cpp
+//! @file      GUI/View/Canvas/ColorMapCanvas.cpp
 //! @brief     Declares class ColorMapCanvas.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Plot2D/ColorMapCanvas.h"
+#include "GUI/View/Canvas/ColorMapCanvas.h"
 #include "GUI/Model/Data/Data2DItem.h"
 #include "GUI/View/PlotScale/FontScalingEvent.h"
 #include "GUI/View/Plotter/ColorMap.h"

GUI/View/Plot2D/ColorMapCanvas.h → GUI/View/Canvas/ColorMapCanvas.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Plot2D/ColorMapCanvas.h
+//! @file      GUI/View/Canvas/ColorMapCanvas.h
 //! @brief     Defines class ColorMapCanvas.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_PLOT2D_COLORMAPCANVAS_H
-#define BORNAGAIN_GUI_VIEW_PLOT2D_COLORMAPCANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_CANVAS_COLORMAPCANVAS_H
+#define BORNAGAIN_GUI_VIEW_CANVAS_COLORMAPCANVAS_H
 
 #include <QWidget>
 
@@ -44,4 +44,4 @@ private:
     PlotStatusLabel* m_statusLabel;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_PLOT2D_COLORMAPCANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_CANVAS_COLORMAPCANVAS_H

GUI/View/Plot2D/IntensityDataCanvas.cpp → GUI/View/Canvas/IntensityDataCanvas.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Plot2D/IntensityDataCanvas.cpp
+//! @file      GUI/View/Canvas/IntensityDataCanvas.cpp
 //! @brief     Implements class IntensityDataCanvas.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,13 +12,13 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Plot2D/IntensityDataCanvas.h"
+#include "GUI/View/Canvas/IntensityDataCanvas.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Data/Data2DItem.h"
 #include "GUI/Model/Device/DatafileItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/View/Canvas/ColorMapCanvas.h"
 #include "GUI/View/Info/MessageBox.h"
-#include "GUI/View/Plot2D/ColorMapCanvas.h"
 #include "GUI/View/PlotScale/SavePlotAssistant.h"
 #include "GUI/View/Plotter/ColorMap.h"
 #include "GUI/View/Tool/Globals.h"

GUI/View/Plot2D/IntensityDataCanvas.h → GUI/View/Canvas/IntensityDataCanvas.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Plot2D/IntensityDataCanvas.h
+//! @file      GUI/View/Canvas/IntensityDataCanvas.h
 //! @brief     Defines class IntensityDataCanvas.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_PLOT2D_INTENSITYDATACANVAS_H
-#define BORNAGAIN_GUI_VIEW_PLOT2D_INTENSITYDATACANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_CANVAS_INTENSITYDATACANVAS_H
+#define BORNAGAIN_GUI_VIEW_CANVAS_INTENSITYDATACANVAS_H
 
 #include "GUI/View/Access/DataAccessWidget.h"
 
@@ -50,4 +50,4 @@ private:
     QAction* m_savePlotAction;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_PLOT2D_INTENSITYDATACANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_CANVAS_INTENSITYDATACANVAS_H

GUI/View/Frame/Fit2DFrame.cpp

@@ -19,8 +19,8 @@
 #include "GUI/Model/Data/Data1DItem.h"
 #include "GUI/Model/Data/Data2DItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/View/Canvas/ColorMapCanvas.h"
 #include "GUI/View/Canvas/ProgressCanvas.h"
-#include "GUI/View/Plot2D/ColorMapCanvas.h"
 #include "GUI/View/Plotter/ColorMap.h"
 #include "GUI/View/Plotter/PlotStatusLabel.h"
 #include "GUI/View/Plotter/RangeUtil.h"

GUI/View/Frame/Plot2DFrame.cpp

@@ -14,7 +14,7 @@
 
 #include "GUI/View/Frame/Plot2DFrame.h"
 #include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/View/Plot2D/IntensityDataCanvas.h"
+#include "GUI/View/Canvas/IntensityDataCanvas.h"
 #include "GUI/View/Setup/Fourier2DPresenter.h"
 #include "GUI/View/Setup/Scale2DEditor.h"
 #include "GUI/View/Tool/ActionFactory.h"