[MEDCalc] Simplifying IDL enum names.

diff --git a/idl/MEDPresentationManager.idl b/idl/MEDPresentationManager.idl
index f66f62721929a09aa1f7811300cb6f535ac60e5c..09689a92d87f26e59627941bd5674f4fe4c91044 100644 (file)
--- a/idl/MEDPresentationManager.idl
+++ b/idl/MEDPresentationManager.idl
@@ -27,24 +27,24 @@ module MEDCALC
 {
   /* Enumerations and constants */
 
-  enum MEDPresentationViewMode {
+  enum ViewModeType {
     VIEW_MODE_OVERLAP,
     VIEW_MODE_REPLACE,
     VIEW_MODE_NEW_LAYOUT,
     VIEW_MODE_SPLIT_VIEW
   };
 
-  enum MEDPresentationColorMap {
+  enum ColorMapType {
     COLOR_MAP_BLUE_TO_RED_RAINBOW,
     COLOR_MAP_COOL_TO_WARM
   };
 
-  enum MEDPresentationScalarBarRange {
+  enum ScalarBarRangeType {
     SCALAR_BAR_ALL_TIMESTEPS,
     SCALAR_BAR_CURRENT_TIMESTEP
   };
 
-  enum MEDPresentationMeshMode {
+  enum MeshModeType {
     MESH_MODE_WIREFRAME,
     MESH_MODE_SURFACE_EDGES,
     MESH_MODE_SURFACE
@@ -64,7 +64,7 @@ module MEDCALC
 
   const string DISPLAY_EUCLIDEAN_NORM = "";  // Void string to avoid clash with a real component name -- never used actually?
 
-  enum MEDPresentationSliceOrientation {
+  enum SliceOrientationType {
     SLICE_NORMAL_TO_X,
     SLICE_NORMAL_TO_Y,
     SLICE_NORMAL_TO_Z,
@@ -76,14 +76,14 @@ module MEDCALC
 
   /* Default values */
 
-  const MEDPresentationViewMode VIEW_MODE_DEFAULT = VIEW_MODE_REPLACE;
-  const MEDPresentationColorMap COLOR_MAP_DEFAULT = COLOR_MAP_BLUE_TO_RED_RAINBOW;
-  const MEDPresentationScalarBarRange SCALAR_BAR_RANGE_DEFAULT = SCALAR_BAR_ALL_TIMESTEPS;
-  const MEDPresentationMeshMode MESH_MODE_DEFAULT = MESH_MODE_WIREFRAME;
+  const ViewModeType VIEW_MODE_DEFAULT = VIEW_MODE_REPLACE;
+  const ColorMapType COLOR_MAP_DEFAULT = COLOR_MAP_BLUE_TO_RED_RAINBOW;
+  const ScalarBarRangeType SCALAR_BAR_RANGE_DEFAULT = SCALAR_BAR_ALL_TIMESTEPS;
+  const MeshModeType MESH_MODE_DEFAULT = MESH_MODE_WIREFRAME;
 //  const long SCALAR_BAR_RANGE_VAL_MIN_DEFAULT = -1;
 //  const long SCALAR_BAR_RANGE_VAL_MAX_DEFAULT = -1;
   const string DISPLAY_DEFAULT = DISPLAY_EUCLIDEAN_NORM;
-  const MEDPresentationSliceOrientation SLICE_ORIENTATION_DEFAULT = SLICE_NORMAL_TO_X;
+  const SliceOrientationType SLICE_ORIENTATION_DEFAULT = SLICE_NORMAL_TO_X;
   const long NB_CONTOURS_DEFAULT = 10;
   const long NB_SLICES_DEFAULT = 1;
 
@@ -92,38 +92,38 @@ module MEDCALC
   // Just showing the mesh 
   struct MeshViewParameters {
     long fieldHandlerId;   // TODO should be a meshHandlerId really ...
-    MEDPresentationMeshMode mode;
+    MeshModeType mode;
   };
 
   // A simple scalar map
   struct ScalarMapParameters {
     long fieldHandlerId;
     string displayedComponent; // DISPLAY_EUCLIDEAN_NORM or any component name
-    MEDPresentationScalarBarRange scalarBarRange;
-    MEDPresentationColorMap colorMap;
+    ScalarBarRangeType scalarBarRange;
+    ColorMapType colorMap;
   };
 
   // A contour is an isoline in 2D and an isosurface in 3D
   struct ContourParameters {   // Contour are only for scalar fields
     long fieldHandlerId;
-    MEDPresentationScalarBarRange scalarBarRange;
-    MEDPresentationColorMap colorMap;
+    ScalarBarRangeType scalarBarRange;
+    ColorMapType colorMap;
     long nbContours;
   };
 
 //  struct VectorFieldParameters {
 //    long fieldHandlerId;
 //    string displayedComponent; // DISPLAY_EUCLIDEAN_NORM or any component name
-//    MEDPresentationScalarBarRange scalarBarRange;
-//    MEDPresentationColorMap colorMap;
+//    ScalarBarRangeType scalarBarRange;
+//    ColorMapType colorMap;
 //  };
 //
   struct SlicesParameters {
     long fieldHandlerId;
     string displayedComponent; // DISPLAY_EUCLIDEAN_NORM or any component name
-    MEDPresentationScalarBarRange scalarBarRange;
-    MEDPresentationColorMap colorMap;
-    MEDPresentationSliceOrientation orientation;
+    ScalarBarRangeType scalarBarRange;
+    ColorMapType colorMap;
+    SliceOrientationType orientation;
     long nbSlices;
   };
 //
@@ -134,8 +134,8 @@ module MEDCALC
 //  struct PointSpriteParameters {
 //    long fieldHandlerId;
 //    string displayedComponent; // DISPLAY_EUCLIDEAN_NORM or any component name
-//    MEDPresentationScalarBarRange scalarBarRange;
-//    MEDPresentationColorMap colorMap;
+//    ScalarBarRangeType scalarBarRange;
+//    ColorMapType colorMap;
 //  };
 
   typedef sequence<long> PresentationsList;
@@ -144,14 +144,14 @@ module MEDCALC
 
   interface MEDPresentationManager : SALOME::GenericObj
   {
-    long makeMeshView(in MeshViewParameters params, in MEDPresentationViewMode viewMode);
-    long makeScalarMap(in ScalarMapParameters params, in MEDPresentationViewMode viewMode);
-    long makeContour(in ContourParameters params, in MEDPresentationViewMode viewMode)
+    long makeMeshView(in MeshViewParameters params, in ViewModeType viewMode);
+    long makeScalarMap(in ScalarMapParameters params, in ViewModeType viewMode);
+    long makeContour(in ContourParameters params, in ViewModeType viewMode)
       raises (SALOME::SALOME_Exception);
-//    long makeVectorField(in VectorFieldParameters params, in MEDPresentationViewMode viewMode);
-    long makeSlices(in SlicesParameters params, in MEDPresentationViewMode viewMode);
-//    long makeDeflectionShape(in DeflectionShapeParameters params, in MEDPresentationViewMode viewMode);
-//    long makePointSprite(in PointSpriteParameters params, in MEDPresentationViewMode viewMode);
+//    long makeVectorField(in VectorFieldParameters params, in ViewModeType viewMode);
+    long makeSlices(in SlicesParameters params, in ViewModeType viewMode);
+//    long makeDeflectionShape(in DeflectionShapeParameters params, in ViewModeType viewMode);
+//    long makePointSprite(in PointSpriteParameters params, in ViewModeType viewMode);
 
     void setPresentationStringProperty(in long presId, in string propName, in string propValue);
     string getPresentationStringProperty(in long presId, in string propName);
@@ -179,7 +179,7 @@ module MEDCALC
     // Low level ParaVis dump
     string getParavisDump(in long presId);
 
-//    MEDPresentationViewMode getPresentationViewMode(in long presId);
+//    ViewModeType getPresentationViewMode(in long presId);
     
     PresentationsList getAllPresentations();
   };

diff --git a/src/MEDCalc/cmp/MEDPresentation.cxx b/src/MEDCalc/cmp/MEDPresentation.cxx
index 04e618dabbc4f57ca1c77c29c7f2cbeea811cd49..c82f3076575c6f9540bd1ac4ba1c4b1a9fcb2dc8 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentation.cxx
+++ b/src/MEDCalc/cmp/MEDPresentation.cxx
@@ -37,9 +37,9 @@ const std::string MEDPresentation::PROP_COLOR_MAP = "colorMap";
 const std::string MEDPresentation::PROP_SCALAR_BAR_RANGE = "scalarBarRange";
 
 MEDPresentation::MEDPresentation(MEDPresentation::TypeID fieldHandlerId, const std::string& name,
-                                 const MEDCALC::MEDPresentationViewMode viewMode,
-                                 const MEDCALC::MEDPresentationColorMap colorMap,
-                                 const MEDCALC::MEDPresentationScalarBarRange sbRange)
+                                 const MEDCALC::ViewModeType viewMode,
+                                 const MEDCALC::ColorMapType colorMap,
+                                 const MEDCALC::ScalarBarRangeType sbRange)
     : _fieldHandlerId(fieldHandlerId), _propertiesStr(),
       //_pipeline(0), _display(0)
       _selectedComponentIndex(-1),

diff --git a/src/MEDCalc/cmp/MEDPresentation.hxx b/src/MEDCalc/cmp/MEDPresentation.hxx
index a47d1b2ff0648bfc74abff834eb5ef5a8fe0f3b7..bfcdd2fccd2a68af110fc812181ddf641a2ec4c3 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentation.hxx
+++ b/src/MEDCalc/cmp/MEDPresentation.hxx
@@ -70,9 +70,9 @@ protected:
   static int GeneratePythonId();
 
   MEDPresentation(MEDPresentation::TypeID fieldHandlerId, const std::string& name,
-                  const MEDCALC::MEDPresentationViewMode viewMode,
-                  const MEDCALC::MEDPresentationColorMap colorMap,
-                  const MEDCALC::MEDPresentationScalarBarRange sbRange);
+                  const MEDCALC::ViewModeType viewMode,
+                  const MEDCALC::ColorMapType colorMap,
+                  const MEDCALC::ScalarBarRangeType sbRange);
   std::string getRenderViewCommand() const;
   std::string getRenderViewVar() const;
   std::string getResetCameraCommand() const;
@@ -91,16 +91,16 @@ protected:
 
   void fillAvailableFieldComponents();
 
-//  virtual MEDCALC::MEDPresentationViewMode getViewMode() = 0;
+//  virtual MEDCALC::ViewModeType getViewMode() = 0;
 
   template<typename PresentationType, typename PresentationParameters>
   void updateComponent(const std::string& newCompo);
 
   template<typename PresentationType, typename PresentationParameters>
-  void updateColorMap(MEDCALC::MEDPresentationColorMap colorMap);
+  void updateColorMap(MEDCALC::ColorMapType colorMap);
 
   template<typename PresentationType, typename PresentationParameters>
-  void updateScalarBarRange(MEDCALC::MEDPresentationScalarBarRange sbRange);
+  void updateScalarBarRange(MEDCALC::ScalarBarRangeType sbRange);
 
   template<typename PresentationType, typename PresentationParameters>
   void getParameters(PresentationParameters& params) const;
@@ -125,9 +125,9 @@ protected:
   MEDPresentation::TypeID _fieldHandlerId;
 
   int _selectedComponentIndex;
-  MEDCALC::MEDPresentationViewMode _viewMode;
-  MEDCALC::MEDPresentationColorMap _colorMap;
-  MEDCALC::MEDPresentationScalarBarRange _sbRange;
+  MEDCALC::ViewModeType _viewMode;
+  MEDCALC::ColorMapType _colorMap;
+  MEDCALC::ScalarBarRangeType _sbRange;
 
   ///! Identifier (in the Python dump) of the render view
   int _renderViewPyId;

diff --git a/src/MEDCalc/cmp/MEDPresentation.txx b/src/MEDCalc/cmp/MEDPresentation.txx
index 8d6fa6f0716454290c9304b4676d9e3e6aedcf47..dc99dcdc522b111732d6eebc6b84db36f3ca031e 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentation.txx
+++ b/src/MEDCalc/cmp/MEDPresentation.txx
@@ -98,7 +98,7 @@ MEDPresentation::updateComponent(const std::string& newCompo)
 
 template<typename PresentationType, typename PresentationParameters>
 void
-MEDPresentation::updateColorMap(MEDCALC::MEDPresentationColorMap colorMap)
+MEDPresentation::updateColorMap(MEDCALC::ColorMapType colorMap)
 {
   PresentationType * p = static_cast<PresentationType*>(this);
 
@@ -123,7 +123,7 @@ MEDPresentation::updateColorMap(MEDCALC::MEDPresentationColorMap colorMap)
 
 template<typename PresentationType, typename PresentationParameters>
 void
-MEDPresentation::updateScalarBarRange(MEDCALC::MEDPresentationScalarBarRange sbRange)
+MEDPresentation::updateScalarBarRange(MEDCALC::ScalarBarRangeType sbRange)
 {
   PresentationType * p = static_cast<PresentationType*>(this);
 

diff --git a/src/MEDCalc/cmp/MEDPresentationContour.cxx b/src/MEDCalc/cmp/MEDPresentationContour.cxx
index 591f73ceea3d841725fdd21676edbb259807ffa5..fee4659e59a133cb89f096b5503117c35bfa34e8 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationContour.cxx
+++ b/src/MEDCalc/cmp/MEDPresentationContour.cxx
@@ -29,7 +29,7 @@ const std::string MEDPresentationContour::TYPE_NAME = "MEDPresentationContour";
 const std::string MEDPresentationContour::PROP_NB_CONTOUR = "nbContour";
 
 MEDPresentationContour::MEDPresentationContour(const MEDCALC::ContourParameters& params,
-                                               const MEDCALC::MEDPresentationViewMode viewMode) :
+                                               const MEDCALC::ViewModeType viewMode) :
         MEDPresentation(params.fieldHandlerId, TYPE_NAME, viewMode, params.colorMap, params.scalarBarRange),
         _params(params)
 {

diff --git a/src/MEDCalc/cmp/MEDPresentationContour.hxx b/src/MEDCalc/cmp/MEDPresentationContour.hxx
index 7a61ce020ac781994d0f2f3cd19672cbc91aabd2..bf36fee8c3a4eaa2f73cbf5e84c8faf10c968576 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationContour.hxx
+++ b/src/MEDCalc/cmp/MEDPresentationContour.hxx
@@ -29,7 +29,7 @@ public:
   static const std::string TYPE_NAME;
   static const std::string PROP_NB_CONTOUR;
 
-  MEDPresentationContour(const MEDCALC::ContourParameters& params, const MEDCALC::MEDPresentationViewMode viewMode);
+  MEDPresentationContour(const MEDCALC::ContourParameters& params, const MEDCALC::ViewModeType viewMode);
   virtual ~MEDPresentationContour() {}
 
   void updatePipeline(const MEDCALC::ContourParameters& params);

diff --git a/src/MEDCalc/cmp/MEDPresentationDeflectionShape.hxx b/src/MEDCalc/cmp/MEDPresentationDeflectionShape.hxx
index f03240e087ff2cab0c09d56e7b70bb3fcf6b9e84..e23be43741cce85702e8b46f521a7efe58b7108f 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationDeflectionShape.hxx
+++ b/src/MEDCalc/cmp/MEDPresentationDeflectionShape.hxx
@@ -32,7 +32,7 @@ public:
   virtual ~MEDPresentationDeflectionShape() {}
 
   void updatePipeline(const MEDCALC::DeflectionShapeParameters& params);
-  MEDCALC::MEDPresentationViewMode getViewMode() { return _params.viewMode; }
+  MEDCALC::ViewModeType getViewMode() { return _params.viewMode; }
 
 protected:
   virtual void internalGeneratePipeline();

diff --git a/src/MEDCalc/cmp/MEDPresentationManager_i.cxx b/src/MEDCalc/cmp/MEDPresentationManager_i.cxx
index ad763cb6728f9b470c7363b1272d15825c76b994..09b2f57265fd6b6e55b8393385ac4cdc962b6082 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationManager_i.cxx
+++ b/src/MEDCalc/cmp/MEDPresentationManager_i.cxx
@@ -124,19 +124,19 @@ MEDPresentationManager_i::getPresentationIntProperty(MEDPresentation::TypeID pre
 }
 
 MEDPresentation::TypeID
-MEDPresentationManager_i::makeMeshView(const MEDCALC::MeshViewParameters& params, const MEDCALC::MEDPresentationViewMode viewMode)
+MEDPresentationManager_i::makeMeshView(const MEDCALC::MeshViewParameters& params, const MEDCALC::ViewModeType viewMode)
 {
   return _makePresentation<MEDPresentationMeshView>(params, viewMode);
 }
 
 MEDPresentation::TypeID
-MEDPresentationManager_i::makeScalarMap(const MEDCALC::ScalarMapParameters& params, const MEDCALC::MEDPresentationViewMode viewMode)
+MEDPresentationManager_i::makeScalarMap(const MEDCALC::ScalarMapParameters& params, const MEDCALC::ViewModeType viewMode)
 {
   return _makePresentation<MEDPresentationScalarMap>(params, viewMode);
 }
 
 MEDPresentation::TypeID
-MEDPresentationManager_i::makeContour(const MEDCALC::ContourParameters& params, const MEDCALC::MEDPresentationViewMode viewMode)
+MEDPresentationManager_i::makeContour(const MEDCALC::ContourParameters& params, const MEDCALC::ViewModeType viewMode)
 {
   return _makePresentation<MEDPresentationContour>(params, viewMode);
 }
@@ -148,7 +148,7 @@ MEDPresentationManager_i::makeContour(const MEDCALC::ContourParameters& params,
 //}
 //
 MEDPresentation::TypeID
-MEDPresentationManager_i::makeSlices(const MEDCALC::SlicesParameters& params, const MEDCALC::MEDPresentationViewMode viewMode)
+MEDPresentationManager_i::makeSlices(const MEDCALC::SlicesParameters& params, const MEDCALC::ViewModeType viewMode)
 {
   return _makePresentation<MEDPresentationSlices>(params, viewMode);
 }
@@ -287,7 +287,7 @@ MEDPresentationManager_i::getActiveViewPythonId()
 }
 
 
-//MEDCALC::MEDPresentationViewMode
+//MEDCALC::ViewModeType
 //MEDPresentationManager_i::getPresentationViewMode(MEDPresentation::TypeID presentationID)
 //{
 //  MEDPresentation* pres = _getPresentation(presentationID);

diff --git a/src/MEDCalc/cmp/MEDPresentationManager_i.hxx b/src/MEDCalc/cmp/MEDPresentationManager_i.hxx
index 7c0cb19a04f2a371a96e75c2884a142e23d6690a..c2c17873a2a73d0b5e69c24def524928412bcfc5 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationManager_i.hxx
+++ b/src/MEDCalc/cmp/MEDPresentationManager_i.hxx
@@ -39,13 +39,13 @@ class MEDPresentationManager_i: public POA_MEDCALC::MEDPresentationManager,
 
   static MEDPresentationManager_i* getInstance();
 
-  MEDCALC_EXPORT MEDPresentation::TypeID makeMeshView(const MEDCALC::MeshViewParameters&, const MEDCALC::MEDPresentationViewMode);
-  MEDCALC_EXPORT MEDPresentation::TypeID makeScalarMap(const MEDCALC::ScalarMapParameters&, const MEDCALC::MEDPresentationViewMode);
-  MEDCALC_EXPORT MEDPresentation::TypeID makeContour(const MEDCALC::ContourParameters&, const MEDCALC::MEDPresentationViewMode);
-//  MEDCALC_EXPORT MEDPresentation::TypeID makeVectorField(const MEDCALC::VectorFieldParameters&, const MEDCALC::MEDPresentationViewMode);
-  MEDCALC_EXPORT MEDPresentation::TypeID makeSlices(const MEDCALC::SlicesParameters&, const MEDCALC::MEDPresentationViewMode);
-//  MEDCALC_EXPORT MEDPresentation::TypeID makeDeflectionShape(const MEDCALC::DeflectionShapeParameters&, const MEDCALC::MEDPresentationViewMode);
-//  MEDCALC_EXPORT MEDPresentation::TypeID makePointSprite(const MEDCALC::PointSpriteParameters&, const MEDCALC::MEDPresentationViewMode);
+  MEDCALC_EXPORT MEDPresentation::TypeID makeMeshView(const MEDCALC::MeshViewParameters&, const MEDCALC::ViewModeType);
+  MEDCALC_EXPORT MEDPresentation::TypeID makeScalarMap(const MEDCALC::ScalarMapParameters&, const MEDCALC::ViewModeType);
+  MEDCALC_EXPORT MEDPresentation::TypeID makeContour(const MEDCALC::ContourParameters&, const MEDCALC::ViewModeType);
+//  MEDCALC_EXPORT MEDPresentation::TypeID makeVectorField(const MEDCALC::VectorFieldParameters&, const MEDCALC::ViewModeType);
+  MEDCALC_EXPORT MEDPresentation::TypeID makeSlices(const MEDCALC::SlicesParameters&, const MEDCALC::ViewModeType);
+//  MEDCALC_EXPORT MEDPresentation::TypeID makeDeflectionShape(const MEDCALC::DeflectionShapeParameters&, const MEDCALC::ViewModeType);
+//  MEDCALC_EXPORT MEDPresentation::TypeID makePointSprite(const MEDCALC::PointSpriteParameters&, const MEDCALC::ViewModeType);
 
   MEDCALC_EXPORT void setPresentationStringProperty(MEDPresentation::TypeID presentationID, const char* propName, const char* propValue);
   MEDCALC_EXPORT char* getPresentationStringProperty(MEDPresentation::TypeID presentationID, const char* propName);
@@ -69,7 +69,7 @@ class MEDPresentationManager_i: public POA_MEDCALC::MEDPresentationManager,
   MEDCALC_EXPORT CORBA::Boolean removePresentation(MEDPresentation::TypeID);
   MEDCALC_EXPORT CORBA::Boolean activateView(MEDPresentation::TypeID);
   MEDCALC_EXPORT CORBA::Long getActiveViewPythonId();
-//  MEDCALC_EXPORT MEDCALC::MEDPresentationViewMode getPresentationViewMode(MEDPresentation::TypeID);
+//  MEDCALC_EXPORT MEDCALC::ViewModeType getPresentationViewMode(MEDPresentation::TypeID);
   MEDCALC_EXPORT char* getParavisDump(MEDPresentation::TypeID presentationID);
   MEDCALC_EXPORT MEDCALC::PresentationsList* getAllPresentations();
 
@@ -81,7 +81,7 @@ class MEDPresentationManager_i: public POA_MEDCALC::MEDPresentationManager,
 
   // Create a new presentation instance and return its unique ID
   template<typename PresentationType, typename PresentationParameters>
-  MEDPresentation::TypeID _makePresentation(const PresentationParameters params, MEDCALC::MEDPresentationViewMode viewMode);
+  MEDPresentation::TypeID _makePresentation(const PresentationParameters params, MEDCALC::ViewModeType viewMode);
 
   // Update presentation
   template<typename PresentationType, typename PresentationParameters>

diff --git a/src/MEDCalc/cmp/MEDPresentationManager_i.txx b/src/MEDCalc/cmp/MEDPresentationManager_i.txx
index 8981408956d1c24339c96258464c379853fed6b8..f147554a3cfcb9460cbb143d69d1deb2ceee7080 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationManager_i.txx
+++ b/src/MEDCalc/cmp/MEDPresentationManager_i.txx
@@ -24,7 +24,7 @@
 
 template<typename PresentationType, typename PresentationParameters>
 MEDPresentation::TypeID
-MEDPresentationManager_i::_makePresentation(const PresentationParameters params, const MEDCALC::MEDPresentationViewMode viewMode)
+MEDPresentationManager_i::_makePresentation(const PresentationParameters params, const MEDCALC::ViewModeType viewMode)
 {
   int activeViewId = getActiveViewPythonId();
 

diff --git a/src/MEDCalc/cmp/MEDPresentationMeshView.cxx b/src/MEDCalc/cmp/MEDPresentationMeshView.cxx
index ff23a68b895f36fb317099fd548d5794bc4c51dc..83678f19bffd2a1b69b4aa2a7def0710ac2103d8 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationMeshView.cxx
+++ b/src/MEDCalc/cmp/MEDPresentationMeshView.cxx
@@ -29,7 +29,7 @@ const std::string MEDPresentationMeshView::TYPE_NAME = "MEDPresentationMeshView"
 const std::string MEDPresentationMeshView::PROP_MESH_MODE = "meshMode";
 
 MEDPresentationMeshView::MEDPresentationMeshView(const MEDCALC::MeshViewParameters& params,
-                                               const MEDCALC::MEDPresentationViewMode viewMode) :
+                                               const MEDCALC::ViewModeType viewMode) :
         // Cheating a bit here - a mesh view doesn't need a color map or a range:
         MEDPresentation(params.fieldHandlerId, TYPE_NAME, viewMode, MEDCALC::COLOR_MAP_DEFAULT,
                         MEDCALC::SCALAR_BAR_RANGE_DEFAULT),
@@ -96,7 +96,7 @@ MEDPresentationMeshView::updatePipeline(const MEDCALC::MeshViewParameters& param
 }
 
 void
-MEDPresentationMeshView::updateMeshMode(const MEDCALC::MEDPresentationMeshMode mode)
+MEDPresentationMeshView::updateMeshMode(const MEDCALC::MeshModeType mode)
 {
   _params.mode = mode;
 

diff --git a/src/MEDCalc/cmp/MEDPresentationMeshView.hxx b/src/MEDCalc/cmp/MEDPresentationMeshView.hxx
index 06c43fa92dc7154e66257429a61b69cea0453aa3..30c6d8bcaa77b0b9862005270fb0e7c83cec51ab 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationMeshView.hxx
+++ b/src/MEDCalc/cmp/MEDPresentationMeshView.hxx
@@ -29,7 +29,7 @@ public:
   static const std::string TYPE_NAME;
   static const std::string PROP_MESH_MODE;
 
-  MEDPresentationMeshView(const MEDCALC::MeshViewParameters& params, const MEDCALC::MEDPresentationViewMode viewMode);
+  MEDPresentationMeshView(const MEDCALC::MeshViewParameters& params, const MEDCALC::ViewModeType viewMode);
   virtual ~MEDPresentationMeshView() {}
 
   void updatePipeline(const MEDCALC::MeshViewParameters& params);
@@ -38,7 +38,7 @@ public:
   void setParameters(const MEDCALC::MeshViewParameters & params) { _params = params; } ;
 
 protected:
-  void updateMeshMode(const MEDCALC::MEDPresentationMeshMode mode);
+  void updateMeshMode(const MEDCALC::MeshModeType mode);
   virtual void internalGeneratePipeline();
 
   std::string getMeshViewCommand() const;

diff --git a/src/MEDCalc/cmp/MEDPresentationPointSprite.hxx b/src/MEDCalc/cmp/MEDPresentationPointSprite.hxx
index 49b200b125a1d7c71c2436784f485f6b94f11738..56d83e27b1fa2d0e7b946c53f7973d9d6529aae1 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationPointSprite.hxx
+++ b/src/MEDCalc/cmp/MEDPresentationPointSprite.hxx
@@ -32,7 +32,7 @@ public:
   virtual ~MEDPresentationPointSprite() {}
 
   void updatePipeline(const MEDCALC::PointSpriteParameters& params);
-  MEDCALC::MEDPresentationViewMode getViewMode() { return _params.viewMode; }
+  MEDCALC::ViewModeType getViewMode() { return _params.viewMode; }
 
 protected:
   virtual void internalGeneratePipeline();

diff --git a/src/MEDCalc/cmp/MEDPresentationScalarMap.cxx b/src/MEDCalc/cmp/MEDPresentationScalarMap.cxx
index 3f603db7bd231cc9f5e4d74f962ab8b8a1081a35..79af31efd47fbaca5c9ac5b976425f6833be7b13 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationScalarMap.cxx
+++ b/src/MEDCalc/cmp/MEDPresentationScalarMap.cxx
@@ -31,7 +31,7 @@
 const std::string MEDPresentationScalarMap::TYPE_NAME = "MEDPresentationScalarMap";
 
 MEDPresentationScalarMap::MEDPresentationScalarMap(const MEDCALC::ScalarMapParameters& params,
-                                                   const MEDCALC::MEDPresentationViewMode viewMode) :
+                                                   const MEDCALC::ViewModeType viewMode) :
     MEDPresentation(params.fieldHandlerId, TYPE_NAME, viewMode, params.colorMap, params.scalarBarRange), _params(params)
 {
 }

diff --git a/src/MEDCalc/cmp/MEDPresentationScalarMap.hxx b/src/MEDCalc/cmp/MEDPresentationScalarMap.hxx
index d396d24f31a695c210d74b7fb995e0190e76416f..79a17963b76d3e9614f7396c3b643a44aee69184 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationScalarMap.hxx
+++ b/src/MEDCalc/cmp/MEDPresentationScalarMap.hxx
@@ -29,7 +29,7 @@ class MEDCALC_EXPORT MEDPresentationScalarMap : public MEDPresentation
 public:
   static const std::string TYPE_NAME;
 
-  MEDPresentationScalarMap(const MEDCALC::ScalarMapParameters& params, const MEDCALC::MEDPresentationViewMode viewMode);
+  MEDPresentationScalarMap(const MEDCALC::ScalarMapParameters& params, const MEDCALC::ViewModeType viewMode);
   virtual ~MEDPresentationScalarMap() {}
 
   void updatePipeline(const MEDCALC::ScalarMapParameters& params);
@@ -37,7 +37,7 @@ public:
   void getParameters(MEDCALC::ScalarMapParameters & params) const { params = _params; } ;
   void setParameters(const MEDCALC::ScalarMapParameters & params) { _params = params; } ;
 
-//  MEDCALC::MEDPresentationViewMode getViewMode() { return _params.viewMode; }
+//  MEDCALC::ViewModeType getViewMode() { return _params.viewMode; }
 
 protected:
   virtual void internalGeneratePipeline();

diff --git a/src/MEDCalc/cmp/MEDPresentationSlices.cxx b/src/MEDCalc/cmp/MEDPresentationSlices.cxx
index a71284f03e641c3e4ade2a64daab696bbb68a51b..3e51ee28fd601c1af2ce3b92eb92451fb80d04a2 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationSlices.cxx
+++ b/src/MEDCalc/cmp/MEDPresentationSlices.cxx
@@ -30,7 +30,7 @@ const std::string MEDPresentationSlices::PROP_NB_SLICES = "nbSlices";
 const std::string MEDPresentationSlices::PROP_SLICE_ORIENTATION = "slicesOrientation";
 
 MEDPresentationSlices::MEDPresentationSlices(const MEDCALC::SlicesParameters& params,
-                                               const MEDCALC::MEDPresentationViewMode viewMode) :
+                                               const MEDCALC::ViewModeType viewMode) :
         MEDPresentation(params.fieldHandlerId, TYPE_NAME, viewMode, params.colorMap, params.scalarBarRange),
         _params(params)
 {
@@ -163,7 +163,7 @@ MEDPresentationSlices::updateNbSlices(const int nbSlices)
 }
 
 void
-MEDPresentationSlices::updateOrientation(const MEDCALC::MEDPresentationSliceOrientation orientation)
+MEDPresentationSlices::updateOrientation(const MEDCALC::SliceOrientationType orientation)
 {
   _params.orientation = orientation;
 

diff --git a/src/MEDCalc/cmp/MEDPresentationSlices.hxx b/src/MEDCalc/cmp/MEDPresentationSlices.hxx
index bc55bbcfdd98c860dbc75e4ea287c2602ee5d9d4..9237475342c1aa40c27082f0d2733ea4f59d7d30 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationSlices.hxx
+++ b/src/MEDCalc/cmp/MEDPresentationSlices.hxx
@@ -30,7 +30,7 @@ public:
   static const std::string PROP_NB_SLICES;
   static const std::string PROP_SLICE_ORIENTATION;
 
-  MEDPresentationSlices(const MEDCALC::SlicesParameters& params, const MEDCALC::MEDPresentationViewMode viewMode);
+  MEDPresentationSlices(const MEDCALC::SlicesParameters& params, const MEDCALC::ViewModeType viewMode);
   virtual ~MEDPresentationSlices() {}
 
   void updatePipeline(const MEDCALC::SlicesParameters& params);
@@ -40,7 +40,7 @@ public:
 
 protected:
   void updateNbSlices(const int nbSlices);
-  void updateOrientation(const MEDCALC::MEDPresentationSliceOrientation orientation);
+  void updateOrientation(const MEDCALC::SliceOrientationType orientation);
   virtual void internalGeneratePipeline();
 
   std::string getNbSlicesCommand() const;

diff --git a/src/MEDCalc/cmp/MEDPresentationVectorField.hxx b/src/MEDCalc/cmp/MEDPresentationVectorField.hxx
index 3da7403113c2ab6e15240c44b7b04a803acfa9c9..758cb152e1edb189ff7e9897dabd5564295589c6 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationVectorField.hxx
+++ b/src/MEDCalc/cmp/MEDPresentationVectorField.hxx
@@ -32,7 +32,7 @@ public:
   virtual ~MEDPresentationVectorField() {}
 
   void updatePipeline(const MEDCALC::VectorFieldParameters& params);
-  MEDCALC::MEDPresentationViewMode getViewMode() { return _params.viewMode; }
+  MEDCALC::ViewModeType getViewMode() { return _params.viewMode; }
 
 protected:
   virtual void internalGeneratePipeline();

diff --git a/src/MEDCalc/gui/MEDModule.cxx b/src/MEDCalc/gui/MEDModule.cxx
index 8cef0f7d17d1e40cfd1b856e4334756708c4b5d5..3a9cc15dbf9906f6b49ff3ed5b6d59664da69d1a 100644 (file)
--- a/src/MEDCalc/gui/MEDModule.cxx
+++ b/src/MEDCalc/gui/MEDModule.cxx
@@ -360,19 +360,19 @@ MEDModule::addActionInPopupMenu(int actionId,const QString& menus,const QString&
   mgr->setRule( this->action( actionId ), rule, QtxPopupMgr::VisibleRule );
 }
 
-//MEDCALC::MEDPresentationViewMode
+//MEDCALC::ViewModeType
 //MEDModule::getSelectedViewMode() const
 //{
 //  return _presentationController->getSelectedViewMode();
 //}
 //
-//MEDCALC::MEDPresentationColorMap
+//MEDCALC::ColorMapType
 //MEDModule::getSelectedColorMap() const
 //{
 //  return _presentationController->getSelectedColorMap();
 //}
 //
-//MEDCALC::MEDPresentationScalarBarRange
+//MEDCALC::ScalarBarRangeType
 //MEDModule::getSelectedScalarBarRange() const
 //{
 //  return _presentationController->getSelectedScalarBarRange();

diff --git a/src/MEDCalc/gui/MEDModule.hxx b/src/MEDCalc/gui/MEDModule.hxx
index ed3cafce551ebe0a6b7da39513315bb9b28e126f..c53e6458a93e641367a016acdb9986db4143e8aa 100644 (file)
--- a/src/MEDCalc/gui/MEDModule.hxx
+++ b/src/MEDCalc/gui/MEDModule.hxx
@@ -80,9 +80,9 @@ public:
                             const QString& menus="",
                             const QString& rule="client='ObjectBrowser'");
 
-//  MEDCALC::MEDPresentationViewMode getSelectedViewMode() const;
-//  MEDCALC::MEDPresentationColorMap getSelectedColorMap() const;
-//  MEDCALC::MEDPresentationScalarBarRange getSelectedScalarBarRange() const;
+//  MEDCALC::ViewModeType getSelectedViewMode() const;
+//  MEDCALC::ColorMapType getSelectedColorMap() const;
+//  MEDCALC::ScalarBarRangeType getSelectedScalarBarRange() const;
 
   inline SALOME_AppStudyEditor* getStudyEditor() { return _studyEditor; }
   void requestSALOMETermination() const;

diff --git a/src/MEDCalc/gui/MEDWidgetHelper.cxx b/src/MEDCalc/gui/MEDWidgetHelper.cxx
index 015bb8eaa3a6ee86410d68656910ebc48995b886..4451ca9ad2ac8892839cddccb36913d862d15c3e 100644 (file)
--- a/src/MEDCalc/gui/MEDWidgetHelper.cxx
+++ b/src/MEDCalc/gui/MEDWidgetHelper.cxx
@@ -47,9 +47,9 @@ void MEDWidgetHelper::loadParametersFromEngine()
       oss << MEDPresentation::PROP_COMPONENT << i;
       _allCompos.push_back(_presManager->getPresentationStringProperty(_presId, oss.str().c_str()));
     }
-  _colorMap = static_cast<MEDCALC::MEDPresentationColorMap>(
+  _colorMap = static_cast<MEDCALC::ColorMapType>(
       _presManager->getPresentationIntProperty(_presId, MEDPresentation::PROP_COLOR_MAP.c_str()));
-  _scalarBarRange = static_cast<MEDCALC::MEDPresentationScalarBarRange>(
+  _scalarBarRange = static_cast<MEDCALC::ScalarBarRangeType>(
       _presManager->getPresentationIntProperty(_presId, MEDPresentation::PROP_SCALAR_BAR_RANGE.c_str()));
 }
 

diff --git a/src/MEDCalc/gui/MEDWidgetHelper.hxx b/src/MEDCalc/gui/MEDWidgetHelper.hxx
index fa0e6a0c70ae3a3748a7b11b7a4f9dfc0d9a5934..2fbeaadca42d5a887adcdaf72d42a0458a3fe221 100644 (file)
--- a/src/MEDCalc/gui/MEDWidgetHelper.hxx
+++ b/src/MEDCalc/gui/MEDWidgetHelper.hxx
@@ -76,10 +76,10 @@ protected:
   std::vector<std::string> _allCompos; // All available components
 
   // Color map
-  MEDCALC::MEDPresentationColorMap _colorMap;
+  MEDCALC::ColorMapType _colorMap;
 
   // Scalar bar range
-  MEDCALC::MEDPresentationScalarBarRange _scalarBarRange;
+  MEDCALC::ScalarBarRangeType _scalarBarRange;
 };
 
 #endif

diff --git a/src/MEDCalc/gui/MEDWidgetHelperMeshView.cxx b/src/MEDCalc/gui/MEDWidgetHelperMeshView.cxx
index d927164b855f529d905acfecac83a24226c01773..2ea42450099a22329de575078bdac30b2020ee33 100644 (file)
--- a/src/MEDCalc/gui/MEDWidgetHelperMeshView.cxx
+++ b/src/MEDCalc/gui/MEDWidgetHelperMeshView.cxx
@@ -38,7 +38,7 @@ MEDWidgetHelperMeshView::~MEDWidgetHelperMeshView()
 void MEDWidgetHelperMeshView::loadParametersFromEngine()
 {
   MEDWidgetHelper::loadParametersFromEngine();
-  _meshMode = static_cast<MEDCALC::MEDPresentationMeshMode>(
+  _meshMode = static_cast<MEDCALC::MeshModeType>(
           _presManager->getPresentationIntProperty(_presId, MEDPresentationMeshView::PROP_MESH_MODE.c_str()));
 }
 

diff --git a/src/MEDCalc/gui/MEDWidgetHelperMeshView.hxx b/src/MEDCalc/gui/MEDWidgetHelperMeshView.hxx
index 4a04c56fd6514d95992fdb72f7a94bf571dbd288..efbd56117ef562676d0ea95816c9e21ece6a357f 100644 (file)
--- a/src/MEDCalc/gui/MEDWidgetHelperMeshView.hxx
+++ b/src/MEDCalc/gui/MEDWidgetHelperMeshView.hxx
@@ -46,7 +46,7 @@ protected:
   virtual void loadParametersFromEngine();
 
 private:
-  MEDCALC::MEDPresentationMeshMode _meshMode;
+  MEDCALC::MeshModeType _meshMode;
 };
 
 #endif /* SRC_MEDCALC_GUI_MEDWIDGETHELPERMESHVIEW_HXX_ */

diff --git a/src/MEDCalc/gui/MEDWidgetHelperSlices.cxx b/src/MEDCalc/gui/MEDWidgetHelperSlices.cxx
index f9cb1b7d826f3a1e6981724cff0cd4035d9f1fc9..b785cfab604338a4dd230fc32536828cd5cd4955 100644 (file)
--- a/src/MEDCalc/gui/MEDWidgetHelperSlices.cxx
+++ b/src/MEDCalc/gui/MEDWidgetHelperSlices.cxx
@@ -40,7 +40,7 @@ void MEDWidgetHelperSlices::loadParametersFromEngine()
 {
   MEDWidgetHelper::loadParametersFromEngine();
   _nbSlices = _presManager->getPresentationIntProperty(_presId, MEDPresentationSlices::PROP_NB_SLICES.c_str());
-  _sliceOrientation = static_cast<MEDCALC::MEDPresentationSliceOrientation>(
+  _sliceOrientation = static_cast<MEDCALC::SliceOrientationType>(
       _presManager->getPresentationIntProperty(_presId, MEDPresentationSlices::PROP_SLICE_ORIENTATION.c_str()));
 }
 

diff --git a/src/MEDCalc/gui/MEDWidgetHelperSlices.hxx b/src/MEDCalc/gui/MEDWidgetHelperSlices.hxx
index aace3b7095a14145aff4b62ae0fc55c84c8fd795..ddfcb2a84751938b026bdcbd20017dbb0db1181e 100644 (file)
--- a/src/MEDCalc/gui/MEDWidgetHelperSlices.hxx
+++ b/src/MEDCalc/gui/MEDWidgetHelperSlices.hxx
@@ -48,7 +48,7 @@ protected:
 
 private:
   int _nbSlices;
-  MEDCALC::MEDPresentationSliceOrientation _sliceOrientation;
+  MEDCALC::SliceOrientationType _sliceOrientation;
 };
 
 #endif /* SRC_MEDCALC_GUI_MEDWIDGETHELPERSLICES_HXX_ */

diff --git a/src/MEDCalc/gui/PresentationController.cxx b/src/MEDCalc/gui/PresentationController.cxx
index d9ea2b2b9d508b151b6cf97b6bcfeab7f993ad9b..ffd9bab25867669160df4cd6d93aeaed4afd0bda 100644 (file)
--- a/src/MEDCalc/gui/PresentationController.cxx
+++ b/src/MEDCalc/gui/PresentationController.cxx
@@ -254,7 +254,7 @@ PresentationController::createActions()
 
 }
 
-MEDCALC::MEDPresentationViewMode
+MEDCALC::ViewModeType
 PresentationController::getSelectedViewMode() const
 {
   if (_salomeModule->action(OPTIONS_VIEW_MODE_REPLACE_ID)->isChecked()) {
@@ -274,13 +274,13 @@ PresentationController::getSelectedViewMode() const
   return MEDCALC::VIEW_MODE_REPLACE;
 }
 
-MEDCALC::MEDPresentationColorMap
+MEDCALC::ColorMapType
 PresentationController::getSelectedColorMap() const
 {
   return _widgetPresentationParameters->getColorMap();
 }
 
-MEDCALC::MEDPresentationScalarBarRange
+MEDCALC::ScalarBarRangeType
 PresentationController::getSelectedScalarBarRange() const
 {
   return _widgetPresentationParameters->getScalarBarRange();
@@ -401,7 +401,7 @@ PresentationController::onDeletePresentation()
 QString
 PresentationController::getViewModePython() const
 {
-  MEDCALC::MEDPresentationViewMode viewMode = getSelectedViewMode();
+  MEDCALC::ViewModeType viewMode = getSelectedViewMode();
   switch(viewMode) {
     case MEDCALC::VIEW_MODE_REPLACE: return "MEDCALC.VIEW_MODE_REPLACE";
     case MEDCALC::VIEW_MODE_OVERLAP: return "MEDCALC.VIEW_MODE_OVERLAP";
@@ -414,7 +414,7 @@ PresentationController::getViewModePython() const
 QString
 PresentationController::getColorMapPython() const
 {
-  MEDCALC::MEDPresentationColorMap colorMap = getSelectedColorMap();
+  MEDCALC::ColorMapType colorMap = getSelectedColorMap();
   switch(colorMap) {
     case MEDCALC::COLOR_MAP_BLUE_TO_RED_RAINBOW: return "MEDCALC.COLOR_MAP_BLUE_TO_RED_RAINBOW";
     case MEDCALC::COLOR_MAP_COOL_TO_WARM: return "MEDCALC.COLOR_MAP_COOL_TO_WARM";
@@ -425,7 +425,7 @@ PresentationController::getColorMapPython() const
 QString
 PresentationController::getScalarBarRangePython() const
 {
-  MEDCALC::MEDPresentationScalarBarRange colorMap = getSelectedScalarBarRange();
+  MEDCALC::ScalarBarRangeType colorMap = getSelectedScalarBarRange();
   switch(colorMap) {
     case MEDCALC::SCALAR_BAR_ALL_TIMESTEPS: return "MEDCALC.SCALAR_BAR_ALL_TIMESTEPS";
     case MEDCALC::SCALAR_BAR_CURRENT_TIMESTEP: return "MEDCALC.SCALAR_BAR_CURRENT_TIMESTEP";
@@ -436,7 +436,7 @@ PresentationController::getScalarBarRangePython() const
 QString
 PresentationController::getMeshModePython(const int mode) const
 {
-  MEDCALC::MEDPresentationMeshMode mod = static_cast<MEDCALC::MEDPresentationMeshMode>(mode);
+  MEDCALC::MeshModeType mod = static_cast<MEDCALC::MeshModeType>(mode);
   switch(mod) {
     case MEDCALC::MESH_MODE_WIREFRAME:     return "MEDCALC.MESH_MODE_WIREFRAME";
     case MEDCALC::MESH_MODE_SURFACE:       return "MEDCALC.MESH_MODE_SURFACE";
@@ -448,7 +448,7 @@ PresentationController::getMeshModePython(const int mode) const
 QString
 PresentationController::getSliceOrientationPython(const int orientation) const
 {
-  MEDCALC::MEDPresentationSliceOrientation orient = static_cast<MEDCALC::MEDPresentationSliceOrientation>(orientation);
+  MEDCALC::SliceOrientationType orient = static_cast<MEDCALC::SliceOrientationType>(orientation);
   switch(orient) {
     case MEDCALC::SLICE_NORMAL_TO_X:   return "MEDCALC.SLICE_NORMAL_TO_X";
     case MEDCALC::SLICE_NORMAL_TO_Y:   return "MEDCALC.SLICE_NORMAL_TO_Y";
@@ -663,7 +663,7 @@ PresentationController::updateTreeViewWithNewPresentation(long fieldId, long pre
       oss.str().c_str(), type.c_str(),ico.c_str(), presentationId);
 
 
-  //  MEDCALC::MEDPresentationViewMode viewMode = MEDFactoryClient::getPresentationManager()->getPresentationViewMode(presentationId);
+  //  MEDCALC::ViewModeType viewMode = MEDFactoryClient::getPresentationManager()->getPresentationViewMode(presentationId);
   //
   //  // Remove sibling presentations if view mode is set to REPLACE
   //  if (viewMode == MEDCALC::VIEW_MODE_REPLACE) {

diff --git a/src/MEDCalc/gui/PresentationController.hxx b/src/MEDCalc/gui/PresentationController.hxx
index 9d92c1b0a9fc4f3d9271de428db4ab26775efabe..39d58a3e789088cfd6398459cd4098567e9bb6e1 100644 (file)
--- a/src/MEDCalc/gui/PresentationController.hxx
+++ b/src/MEDCalc/gui/PresentationController.hxx
@@ -48,9 +48,9 @@ public:
 
   void createActions();
 
-  MEDCALC::MEDPresentationViewMode getSelectedViewMode() const;
-  MEDCALC::MEDPresentationColorMap getSelectedColorMap() const;
-  MEDCALC::MEDPresentationScalarBarRange getSelectedScalarBarRange() const;
+  MEDCALC::ViewModeType getSelectedViewMode() const;
+  MEDCALC::ColorMapType getSelectedColorMap() const;
+  MEDCALC::ScalarBarRangeType getSelectedScalarBarRange() const;
 
   void showDockWidgets(bool isVisible);
 

diff --git a/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx b/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx
index 65238551de469229fd90bce4c6692e2303341d5e..8d7a3e1be906e779978c5b8e1b211b3d928b5445 100644 (file)
--- a/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx
+++ b/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx
@@ -198,7 +198,7 @@ int WidgetPresentationParameters::getNbSlices() const
 
 
 void
-WidgetPresentationParameters::setScalarBarRange(MEDCALC::MEDPresentationScalarBarRange sbrange)
+WidgetPresentationParameters::setScalarBarRange(MEDCALC::ScalarBarRangeType sbrange)
 {
   int idx;
   if (sbrange == MEDCALC::SCALAR_BAR_ALL_TIMESTEPS)
@@ -217,7 +217,7 @@ WidgetPresentationParameters::setScalarBarRange(MEDCALC::MEDPresentationScalarBa
 }
 
 void
-WidgetPresentationParameters::setColorMap(MEDCALC::MEDPresentationColorMap colorMap)
+WidgetPresentationParameters::setColorMap(MEDCALC::ColorMapType colorMap)
 {
   int idx = -1;
   if (colorMap == MEDCALC::COLOR_MAP_BLUE_TO_RED_RAINBOW)
@@ -237,7 +237,7 @@ WidgetPresentationParameters::setColorMap(MEDCALC::MEDPresentationColorMap color
 }
 
 void
-WidgetPresentationParameters::setMeshMode(MEDCALC::MEDPresentationMeshMode mode)
+WidgetPresentationParameters::setMeshMode(MEDCALC::MeshModeType mode)
 {
   // Show the widget:
   _ui.labelMeshMode->show();
@@ -269,7 +269,7 @@ WidgetPresentationParameters::setMeshMode(MEDCALC::MEDPresentationMeshMode mode)
 }
 
 void
-WidgetPresentationParameters::setSliceOrientation(MEDCALC::MEDPresentationSliceOrientation orient)
+WidgetPresentationParameters::setSliceOrientation(MEDCALC::SliceOrientationType orient)
 {
   // Show the widget:
   _ui.labelSliceOrient->show();
@@ -313,7 +313,7 @@ WidgetPresentationParameters::setSliceOrientation(MEDCALC::MEDPresentationSliceO
 }
 
 
-MEDCALC::MEDPresentationSliceOrientation
+MEDCALC::SliceOrientationType
 WidgetPresentationParameters::getSliceOrientation() const
 {
   QString sbrange = _ui.comboBoxSliceOrient->currentText();
@@ -343,7 +343,7 @@ WidgetPresentationParameters::getSliceOrientation() const
   return MEDCALC::SLICE_NORMAL_TO_X;
 }
 
-MEDCALC::MEDPresentationMeshMode
+MEDCALC::MeshModeType
 WidgetPresentationParameters::getMeshMode() const
 {
   QString mesm = _ui.comboBoxMesh->currentText();
@@ -362,7 +362,7 @@ WidgetPresentationParameters::getMeshMode() const
 }
 
 
-MEDCALC::MEDPresentationScalarBarRange
+MEDCALC::ScalarBarRangeType
 WidgetPresentationParameters::getScalarBarRange() const
 {
   QString sbrange = _ui.comboBoxScalarBarRange->currentText();
@@ -395,7 +395,7 @@ WidgetPresentationParameters::getScalarBarRange() const
 //  return _ui.doubleSpinBoxMaxVal->value();
 //}
 
-MEDCALC::MEDPresentationColorMap
+MEDCALC::ColorMapType
 WidgetPresentationParameters::getColorMap() const
 {
   QString colorMap = _ui.comboBoxColorMap->currentText();

diff --git a/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.hxx b/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.hxx
index 530ca64786dcf160a1b71f9c6605fee8ebb638fc..b518e5605d797efd7afe5e9e577d19c4bf663255 100644 (file)
--- a/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.hxx
+++ b/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.hxx
@@ -42,17 +42,17 @@ public:
   std::string getComponent() const;
   void setComponents(std::vector<std::string> compos, int selecIndex);
 
-  MEDCALC::MEDPresentationMeshMode getMeshMode() const;
-  void setMeshMode(MEDCALC::MEDPresentationMeshMode mode);
+  MEDCALC::MeshModeType getMeshMode() const;
+  void setMeshMode(MEDCALC::MeshModeType mode);
 
-  MEDCALC::MEDPresentationScalarBarRange getScalarBarRange() const;
-  void setScalarBarRange(MEDCALC::MEDPresentationScalarBarRange);
+  MEDCALC::ScalarBarRangeType getScalarBarRange() const;
+  void setScalarBarRange(MEDCALC::ScalarBarRangeType);
 
 //  double getScalarBarTimestep() const;
 //  double getScalarBarMinVal() const;
 //  double getScalarBarMaxVal() const;
-  MEDCALC::MEDPresentationColorMap getColorMap() const;
-  void setColorMap(MEDCALC::MEDPresentationColorMap);
+  MEDCALC::ColorMapType getColorMap() const;
+  void setColorMap(MEDCALC::ColorMapType);
 
   void setPresName(const std::string& name);
 
@@ -62,8 +62,8 @@ public:
   int getNbSlices() const;
   void setNbSlices(int nbSlices);
 
-  MEDCALC::MEDPresentationSliceOrientation getSliceOrientation() const;
-  void setSliceOrientation(MEDCALC::MEDPresentationSliceOrientation orient);
+  MEDCALC::SliceOrientationType getSliceOrientation() const;
+  void setSliceOrientation(MEDCALC::SliceOrientationType orient);
 
   void toggleWidget(bool show);
   bool isShown() const;