moves and experimental moves

GUI/Model/Item/SessionItem.cpp → GUI/Model/BaseItem/SessionItem.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Item/SessionItem.cpp
+//! @file      GUI/Model/BaseItem/SessionItem.cpp
 //! @brief     Implements class SessionItem
 //!
 //! @homepage  http://www.bornagainproject.org

GUI/Model/Item/SessionItem.h → GUI/Model/BaseItem/SessionItem.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Item/SessionItem.h
+//! @file      GUI/Model/BaseItem/SessionItem.h
 //! @brief     Defines class SessionItem
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_ITEM_SESSIONITEM_H
-#define BORNAGAIN_GUI_MODEL_ITEM_SESSIONITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_BASEITEM_SESSIONITEM_H
+#define BORNAGAIN_GUI_MODEL_BASEITEM_SESSIONITEM_H
 
 #include "Base/Util/Assert.h"
 #include "Fit/Param/RealLimits.h"
@@ -404,4 +404,4 @@ template <typename T> bool SessionItem::hasModelType() const
     return modelType() == T::M_TYPE;
 }
 
-#endif // BORNAGAIN_GUI_MODEL_ITEM_SESSIONITEM_H
+#endif // BORNAGAIN_GUI_MODEL_BASEITEM_SESSIONITEM_H

GUI/Model/Item/AxesItems.h

@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_ITEM_AXESITEMS_H
 #define BORNAGAIN_GUI_MODEL_ITEM_AXESITEMS_H
 
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 #include "GUI/Model/Types/DoubleDescriptor.h" // no forward declaration < used in many children
 #include <memory>
 

GUI/Model/Item/BackgroundItems.h

@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_ITEM_BACKGROUNDITEMS_H
 #define BORNAGAIN_GUI_MODEL_ITEM_BACKGROUNDITEMS_H
 
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 
 class IBackground;
 

GUI/Model/Item/BeamItems.h

@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_MODEL_ITEM_BEAMITEMS_H
 
 #include "GUI/Model/Item/SpecularBeamInclinationItem.h"
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 #include <heinz/Vectors3D.h>
 
 class BasicAxisItem;

GUI/Model/Item/Data1DViewItem.h

@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_MODEL_ITEM_DATA1DVIEWITEM_H
 
 #include "GUI/Model/Group/SelectionDescriptor.h"
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 
 class AmplitudeAxisItem;
 class BasicAxisItem;

GUI/Model/Item/DataItem.h

@@ -17,7 +17,7 @@
 
 #include "Device/Data/OutputData.h"
 #include "GUI/Model/Group/SelectionDescriptor.h"
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 #include "GUI/Support/IO/SaveLoadInterface.h"
 #include <QDateTime>
 #include <mutex>

GUI/Model/Item/DetectorItems.h

@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_ITEM_DETECTORITEMS_H
 #define BORNAGAIN_GUI_MODEL_ITEM_DETECTORITEMS_H
 
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 #include <heinz/Vectors3D.h>
 
 class MaskContainerItem;

GUI/Model/Item/FitParameterContainerItem.h

@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_ITEM_FITPARAMETERCONTAINERITEM_H
 #define BORNAGAIN_GUI_MODEL_ITEM_FITPARAMETERCONTAINERITEM_H
 
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 
 namespace mumufit {
 

GUI/Model/Item/FitParameterItem.h

@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_MODEL_ITEM_FITPARAMETERITEM_H
 
 #include "Fit/Param/AttLimits.h"
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 
 class FitParameterLinkItem;
 

GUI/Model/Item/FitParameterLinkItem.h

@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_ITEM_FITPARAMETERLINKITEM_H
 #define BORNAGAIN_GUI_MODEL_ITEM_FITPARAMETERLINKITEM_H
 
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 
 //! The FitParameterLinkItem class holds a link to ParameterItem in tuning tree.
 

GUI/Model/Item/FitSuiteItem.h

@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_ITEM_FITSUITEITEM_H
 #define BORNAGAIN_GUI_MODEL_ITEM_FITSUITEITEM_H
 
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 
 class FitParameterContainerItem;
 class MinimizerContainerItem;

GUI/Model/Item/FootprintItems.h

@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_ITEM_FOOTPRINTITEMS_H
 #define BORNAGAIN_GUI_MODEL_ITEM_FOOTPRINTITEMS_H
 
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 
 class IFootprintFactor;
 

GUI/Model/Item/GroupItem.h

@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_MODEL_ITEM_GROUPITEM_H
 
 #include "GUI/Model/Item/GroupItemController.h"
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 #include <memory>
 
 class GroupInfo;

GUI/Model/Item/GroupItemController.cpp

@@ -15,7 +15,7 @@
 #include "GUI/Model/Item/GroupItemController.h"
 
 #include "GUI/Model/Item/ItemFactory.h"
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 #include "GUI/Util/ComboProperty.h"
 #include <utility>
 

GUI/Model/Item/InterferenceItems.cpp

@@ -14,11 +14,11 @@
 
 #include "GUI/Model/Item/InterferenceItems.h"
 #include "Base/Const/Units.h"
-#include "GUI/Model/Item/FTDecayFunctionItemCatalogs.h"
+#include "GUI/Model/MakeItem/FTDecayFunctionItemCatalogs.h"
 #include "GUI/Model/Item/FTDecayFunctionItems.h"
-#include "GUI/Model/Item/FTDistributionItemCatalogs.h"
+#include "GUI/Model/MakeItem/FTDistributionItemCatalogs.h"
 #include "GUI/Model/Item/FTDistributionItems.h"
-#include "GUI/Model/Item/Lattice2DItemCatalog.h"
+#include "GUI/Model/MakeItem/Lattice2DItemCatalog.h"
 #include "GUI/Model/Item/Lattice2DItems.h"
 #include "GUI/Model/Types/UIntDescriptor.h"
 #include "GUI/Model/XML/Serializer.h"

GUI/Model/Item/ItemFactory.cpp

@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Item/ItemFactory.h"
-#include "GUI/Model/Item/ItemCatalog.h"
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/MakeItem/ItemCatalog.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 
 SessionItem* GUI::Model::ItemFactory::CreateItem(const QString& model_name, SessionItem* parent)
 {

GUI/Model/Item/ItemWithParticles.cpp

@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Item/ItemWithParticles.h"
 #include "Base/Vector/RotMatrix.h"
-#include "GUI/Model/Item/RotationItemCatalog.h"
+#include "GUI/Model/MakeItem/RotationItemCatalog.h"
 #include "GUI/Model/XML/Serializer.h"
 #include "Sample/Particle/IParticle.h"
 #include "Sample/Scattering/Rotations.h"

GUI/Model/Item/JobItem.cpp

@@ -22,7 +22,7 @@
 #include "GUI/Model/Item/JobItemUtils.h"
 #include "GUI/Model/Item/Data1DViewItem.h"
 #include "GUI/Model/Item/ItemWithMaterial.h"
-#include "GUI/Model/XML/SessionXML.h"
+#include "GUI/Model/Model/SessionXML.h"
 #include "GUI/Support/Data/XML.h"
 #include "GUI/Support/IO/ItemFileNameUtils.h"
 #include "GUI/Util/DeserializationException.h"

GUI/Model/Item/JobItem.h

@@ -18,7 +18,7 @@
 #include "GUI/Model/Item/ParameterTreeItems.h"
 #include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Model/Item/MultiLayerItem.h"
-#include "GUI/Model/Item/SessionItem.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 #include "GUI/Model/Model/SessionModel.h" // call to model() from templated fct
 #include "GUI/Support/Data/JobStatus.h"     // enum cannot be forward declared
 #include "GUI/Support/Data/SimulationOptionsItem.h"