updated copyright message

[modules/med.git] / src / MEDCalc / cmp / MEDPresentationSlices.cxx

diff --git a/src/MEDCalc/cmp/MEDPresentationSlices.cxx b/src/MEDCalc/cmp/MEDPresentationSlices.cxx
index 8654e25bc27f59d40cb6890ab3b3393e67757456..42c87a7e080bac38eb0efeb07ebb7671c02b45fb 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationSlices.cxx
+++ b/src/MEDCalc/cmp/MEDPresentationSlices.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2016  CEA/DEN, EDF R&D
+// Copyright (C) 2016-2023  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -65,8 +65,10 @@ MEDPresentationSlices::setSliceParametersAndGroup()
 void
 MEDPresentationSlices::deleteGroup()
 {
+  deleteThresholds();
   std::ostringstream oss;
-  oss << "pvs.Delete(" << _objVar << ");";
+  oss << "pvs.Hide(" << _objVar << ");";
+  oss << "pvs.Delete(" << _objVar << ");del " <<_objVar<<";";
   pushAndExecPyLine(oss.str()); oss.str("");
 }
 
@@ -76,11 +78,11 @@ MEDPresentationSlices::adaptNumberOfSlices()
   std::ostringstream oss;
   int nbSlices = getIntProperty(MEDPresentationSlices::PROP_NB_SLICES);
 
-  oss << "for _ in range(max(len(" << _sliceListVar << ")-" << nbSlices << ", 0)):\n";
+  oss << "for _ in range(int(max(len(" << _sliceListVar << ")-" << nbSlices << ", 0))):\n";
   oss << "  pvs.Delete(" << _sliceListVar << ".pop());\n";
   pushAndExecPyLine(oss.str()); oss.str("");
 
-  oss << "for _ in range(" << nbSlices << "-max(len(" << _sliceListVar << "), 0)):\n";
+  oss << "for _ in range(" << nbSlices << "-int(max(len(" << _sliceListVar << "), 0))):\n";
   oss << "  obj = pvs.Slice(Input=" << _srcObjVar << ");\n";
   oss << "  obj.SliceType = 'Plane';\n";
   oss << "  " << _sliceListVar << ".append(obj);\n";
@@ -92,14 +94,7 @@ MEDPresentationSlices::generateAndDisplay()
 {
   adaptNumberOfSlices();
   setSliceParametersAndGroup();
-
-  showObject();
-
-  colorBy(_pvFieldType);
-  showScalarBar();
-  selectColorMap();
-  rescaleTransferFunction();
-  resetCameraAndRender();
+  recreateViewSetup();
 }
 
 std::string
@@ -147,6 +142,7 @@ MEDPresentationSlices::internalGeneratePipeline()
   std::ostringstream oss;
 
   createSource();
+  setTimestamp();
 
   // Populate internal array of available components:
   fillAvailableFieldComponents();
@@ -157,7 +153,7 @@ MEDPresentationSlices::internalGeneratePipeline()
       throw KERNEL::createSalomeException(mes);
   }
 
-  setOrCreateRenderView(); // instanciate __viewXXX
+  setOrCreateRenderView(); // instantiate __viewXXX
 
   // Now create the initial slices list
   oss << _sliceListVar << " = [];";
@@ -174,8 +170,14 @@ MEDPresentationSlices::updatePipeline(const MEDCALC::SlicesParameters& params)
 
   if (std::string(params.displayedComponent) != std::string(_params.displayedComponent))
     updateComponent<MEDPresentationSlices, MEDCALC::SlicesParameters>(std::string(params.displayedComponent));
-  if (params.scalarBarRange != _params.scalarBarRange)
-    updateScalarBarRange<MEDPresentationSlices, MEDCALC::SlicesParameters>(params.scalarBarRange);
+  if (params.scalarBarRange != _params.scalarBarRange ||
+      params.hideDataOutsideCustomRange != _params.hideDataOutsideCustomRange ||
+      params.scalarBarRangeArray[0] != _params.scalarBarRangeArray[0] ||
+      params.scalarBarRangeArray[1] != _params.scalarBarRangeArray[1])
+    updateScalarBarRange<MEDPresentationSlices, MEDCALC::SlicesParameters>(params.scalarBarRange,
+                                                                           params.hideDataOutsideCustomRange,
+                                                                           params.scalarBarRangeArray[0],
+                                                                           params.scalarBarRangeArray[1]);
   if (params.colorMap != _params.colorMap)
     updateColorMap<MEDPresentationSlices, MEDCALC::SlicesParameters>(params.colorMap);
 
@@ -191,6 +193,11 @@ MEDPresentationSlices::updatePipeline(const MEDCALC::SlicesParameters& params)
       }
       updateNbSlices(params.nbSlices);
     }
+  if (params.visibility != _params.visibility)
+    updateVisibility<MEDPresentationSlices, MEDCALC::SlicesParameters>(params.visibility);
+
+  if (params.scalarBarVisibility != _params.scalarBarVisibility)
+    updateScalarBarVisibility<MEDPresentationSlices, MEDCALC::SlicesParameters>(params.scalarBarVisibility);
 }
 
 void