Move MEDCALC tests into SSL mode

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

diff --git a/src/MEDCalc/cmp/MEDPresentationManager_i.cxx b/src/MEDCalc/cmp/MEDPresentationManager_i.cxx
index 8fc47d514e86d9bdba045ffcecb2bbd6186e7de5..68940841241cc93dbaba0cd6d15a2692422fc194 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationManager_i.cxx
+++ b/src/MEDCalc/cmp/MEDPresentationManager_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2011-2022  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
@@ -22,12 +22,16 @@
 #include "Basics_Utils.hxx"
 
 // presentations
+#include "MEDPresentationMeshView.hxx"
 #include "MEDPresentationScalarMap.hxx"
-//#include "MEDPresentationContour.hxx"
-//#include "MEDPresentationVectorField.hxx"
-//#include "MEDPresentationSlices.hxx"
-//#include "MEDPresentationDeflectionShape.hxx"
-//#include "MEDPresentationPointSprite.hxx"
+#include "MEDPresentationContour.hxx"
+#include "MEDPresentationSlices.hxx"
+#include "MEDPresentationVectorField.hxx"
+#include "MEDPresentationDeflectionShape.hxx"
+#include "MEDPresentationPointSprite.hxx"
+#include "MEDPresentationPlot3D.hxx"
+#include "MEDPresentationStreamLines.hxx"
+#include "MEDPresentationCutSegment.hxx"
 
 #include <SALOME_KernelServices.hxx>
 
@@ -72,9 +76,10 @@ MEDPresentationManager_i::GenerateID()
 MEDPresentation*
 MEDPresentationManager_i::_getPresentation(MEDPresentation::TypeID presentationID) const
 {
+  STDLOG("Get presentation " << presentationID);
   std::map<MEDPresentation::TypeID, MEDPresentation*>::const_iterator citr = _presentations.find(presentationID);
   if (citr == _presentations.end())
-    return NULL;
+    return nullptr;
   return (*citr).second;
 }
 
@@ -93,7 +98,7 @@ MEDPresentationManager_i::getPresentationStringProperty(MEDPresentation::TypeID
 {
   MEDPresentation* pres = _getPresentation(presentationID);
   if (pres) {
-    return (char*) pres->getStringProperty(propName).c_str();
+    return CORBA::string_dup(pres->getStringProperty(propName).c_str());
   }
   else
     throw KERNEL::createSalomeException("getPresentationStringProperty(): presentation not found!!");
@@ -122,41 +127,101 @@ MEDPresentationManager_i::getPresentationIntProperty(MEDPresentation::TypeID pre
 
 }
 
+void
+MEDPresentationManager_i::setPresentationDoubleProperty(MEDPresentation::TypeID presentationID, const char* propName,
+  const CORBA::Double propValue)
+{
+  MEDPresentation* pres = _getPresentation(presentationID);
+  if (pres)
+    pres->setDoubleProperty(propName, propValue);
+  else
+    throw KERNEL::createSalomeException("setPresentationDoubleProperty(): presentation not found!!");
+}
+
+CORBA::Double
+MEDPresentationManager_i::getPresentationDoubleProperty(MEDPresentation::TypeID presentationID, const char* propName)
+{
+  MEDPresentation* pres = _getPresentation(presentationID);
+  if (pres) {
+    return (CORBA::Double) pres->getDoubleProperty(propName);
+  }
+  else
+    throw KERNEL::createSalomeException("getPresentationIntProperty(): presentation not found!!");
+
+}
+
+
+MEDPresentation::TypeID
+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)
-//{
-//  return _makePresentation<MEDPresentationContour>(params);
-//}
-//
-//MEDPresentation::TypeID
-//MEDPresentationManager_i::makeVectorField(const MEDCALC::VectorFieldParameters& params)
-//{
-//  return _makePresentation<MEDPresentationVectorField>(params);
-//}
-//
-//MEDPresentation::TypeID
-//MEDPresentationManager_i::makeSlices(const MEDCALC::SlicesParameters& params)
-//{
-//  return _makePresentation<MEDPresentationSlices>(params);
-//}
-//
-//MEDPresentation::TypeID
-//MEDPresentationManager_i::makeDeflectionShape(const MEDCALC::DeflectionShapeParameters& params)
-//{
-//  return _makePresentation<MEDPresentationDeflectionShape>(params);
-//}
-//
-//MEDPresentation::TypeID
-//MEDPresentationManager_i::makePointSprite(const MEDCALC::PointSpriteParameters& params)
-//{
-//  return _makePresentation<MEDPresentationPointSprite>(params);
-//}
+MEDPresentation::TypeID
+MEDPresentationManager_i::makeContour(const MEDCALC::ContourParameters& params, const MEDCALC::ViewModeType viewMode)
+{
+  return _makePresentation<MEDPresentationContour>(params, viewMode);
+}
+
+MEDPresentation::TypeID
+MEDPresentationManager_i::makeVectorField(const MEDCALC::VectorFieldParameters& params, const MEDCALC::ViewModeType viewMode)
+{
+  return _makePresentation<MEDPresentationVectorField>(params, viewMode);
+}
+
+MEDPresentation::TypeID
+MEDPresentationManager_i::makeSlices(const MEDCALC::SlicesParameters& params, const MEDCALC::ViewModeType viewMode)
+{
+  return _makePresentation<MEDPresentationSlices>(params, viewMode);
+}
+
+MEDPresentation::TypeID
+MEDPresentationManager_i::makeDeflectionShape(const MEDCALC::DeflectionShapeParameters& params, const MEDCALC::ViewModeType viewMode)
+{
+  return _makePresentation<MEDPresentationDeflectionShape>(params, viewMode);
+}
+
+MEDPresentation::TypeID
+MEDPresentationManager_i::makePointSprite(const MEDCALC::PointSpriteParameters& params, const MEDCALC::ViewModeType viewMode)
+{
+  return _makePresentation<MEDPresentationPointSprite>(params, viewMode);
+}
+
+// sphinx doc: begin of makePlot3D
+MEDPresentation::TypeID
+MEDPresentationManager_i::makePlot3D(const MEDCALC::Plot3DParameters& params, const MEDCALC::ViewModeType viewMode)
+{
+  return _makePresentation<MEDPresentationPlot3D>(params, viewMode);
+}
+// sphinx doc: end of makePlot3D
+
+MEDPresentation::TypeID
+MEDPresentationManager_i::makeStreamLines(const MEDCALC::StreamLinesParameters& params, const MEDCALC::ViewModeType viewMode)
+{
+  return _makePresentation<MEDPresentationStreamLines>(params, viewMode);
+}
+
+MEDPresentation::TypeID
+MEDPresentationManager_i::makeCutSegment(const MEDCALC::CutSegmentParameters& params, const MEDCALC::ViewModeType viewMode)
+{
+  return _makePresentation<MEDPresentationCutSegment>(params, viewMode);
+}
+
+MEDCALC::MeshViewParameters
+MEDPresentationManager_i::getMeshViewParameters(MEDPresentation::TypeID presentationID)
+{
+  MEDCALC::MeshViewParameters* p = new MEDCALC::MeshViewParameters();
+  _getParameters<MEDPresentationMeshView>(presentationID, *p);
+  MEDCALC::MeshViewParameters_var tmp(p);
+  return tmp._retn();
+}
+
 
 MEDCALC::ScalarMapParameters*
 MEDPresentationManager_i::getScalarMapParameters(MEDPresentation::TypeID presentationID)
@@ -167,53 +232,153 @@ MEDPresentationManager_i::getScalarMapParameters(MEDPresentation::TypeID present
   return tmp._retn();
 }
 
+MEDCALC::ContourParameters*
+MEDPresentationManager_i::getContourParameters(MEDPresentation::TypeID presentationID)
+{
+  MEDCALC::ContourParameters* p = new MEDCALC::ContourParameters();
+  _getParameters<MEDPresentationContour>(presentationID, *p);
+  MEDCALC::ContourParameters_var tmp(p);
+  return tmp._retn();
+}
+
+MEDCALC::SlicesParameters*
+MEDPresentationManager_i::getSlicesParameters(MEDPresentation::TypeID presentationID)
+{
+  MEDCALC::SlicesParameters* p = new MEDCALC::SlicesParameters();
+  _getParameters<MEDPresentationSlices>(presentationID, *p);
+  MEDCALC::SlicesParameters_var tmp(p);
+  return tmp._retn();
+}
+
+MEDCALC::VectorFieldParameters*
+MEDPresentationManager_i::getVectorFieldParameters(MEDPresentation::TypeID presentationID)
+{
+  MEDCALC::VectorFieldParameters* p = new MEDCALC::VectorFieldParameters;
+  _getParameters<MEDPresentationVectorField>(presentationID, *p);
+  MEDCALC::VectorFieldParameters_var tmp(p);
+  return tmp._retn();
+}
+
+MEDCALC::PointSpriteParameters*
+MEDPresentationManager_i::getPointSpriteParameters(MEDPresentation::TypeID presentationID)
+{
+  MEDCALC::PointSpriteParameters* p = new MEDCALC::PointSpriteParameters();
+  _getParameters<MEDPresentationPointSprite>(presentationID, *p);
+  MEDCALC::PointSpriteParameters_var tmp(p);
+  return tmp._retn();
+}
+
+// sphinx doc: begin of getPlot3DParameters
+MEDCALC::Plot3DParameters*
+MEDPresentationManager_i::getPlot3DParameters(MEDPresentation::TypeID presentationID)
+{
+  MEDCALC::Plot3DParameters* p = new MEDCALC::Plot3DParameters();
+  _getParameters<MEDPresentationPlot3D>(presentationID, *p);
+  MEDCALC::Plot3DParameters_var tmp(p);
+  return tmp._retn();
+}
+// sphinx doc: end of getPlot3DParameters
+
+MEDCALC::StreamLinesParameters*
+MEDPresentationManager_i::getStreamLinesParameters(MEDPresentation::TypeID presentationID)
+{
+  MEDCALC::StreamLinesParameters* p = new MEDCALC::StreamLinesParameters();
+  _getParameters<MEDPresentationStreamLines>(presentationID, *p);
+  MEDCALC::StreamLinesParameters_var tmp(p);
+  return tmp._retn();
+}
+
+MEDCALC::CutSegmentParameters*
+MEDPresentationManager_i::getCutSegmentParameters(MEDPresentation::TypeID presentationID)
+{
+  MEDCALC::CutSegmentParameters* p = new MEDCALC::CutSegmentParameters();
+  _getParameters<MEDPresentationCutSegment>(presentationID, *p);
+  MEDCALC::CutSegmentParameters_var tmp(p);
+  return tmp._retn();
+}
+
+MEDCALC::DeflectionShapeParameters*
+MEDPresentationManager_i::getDeflectionShapeParameters(MEDPresentation::TypeID presentationID)
+{
+  MEDCALC::DeflectionShapeParameters* p = new MEDCALC::DeflectionShapeParameters();
+  _getParameters<MEDPresentationDeflectionShape>(presentationID, *p);
+  MEDCALC::DeflectionShapeParameters_var tmp(p);
+  return tmp._retn();
+}
+
+
+void
+MEDPresentationManager_i::updateMeshView(MEDPresentation::TypeID presentationID, const MEDCALC::MeshViewParameters& params)
+{
+  return _updatePresentation<MEDPresentationMeshView>(presentationID, params);
+}
+
 void
 MEDPresentationManager_i::updateScalarMap(MEDPresentation::TypeID presentationID, const MEDCALC::ScalarMapParameters& params)
 {
   return _updatePresentation<MEDPresentationScalarMap>(presentationID, params);
 }
 
-//void
-//MEDPresentationManager_i::updateContour(MEDPresentation::TypeID presentationID, const MEDCALC::ContourParameters& params)
-//{
-//  return _updatePresentation<MEDPresentationContour>(presentationID, params);
-//}
-//
-//void
-//MEDPresentationManager_i::updateVectorField(MEDPresentation::TypeID presentationID, const MEDCALC::VectorFieldParameters& params)
-//{
-//  return _updatePresentation<MEDPresentationVectorField>(presentationID, params);
-//}
-//
-//void
-//MEDPresentationManager_i::updateSlices(MEDPresentation::TypeID presentationID, const MEDCALC::SlicesParameters& params)
-//{
-//  return _updatePresentation<MEDPresentationSlices>(presentationID, params);
-//}
-//
-//void
-//MEDPresentationManager_i::updateDeflectionShape(MEDPresentation::TypeID presentationID, const MEDCALC::DeflectionShapeParameters& params)
-//{
-//  return _updatePresentation<MEDPresentationDeflectionShape>(presentationID, params);
-//}
-//
-//void
-//MEDPresentationManager_i::updatePointSprite(MEDPresentation::TypeID presentationID, const MEDCALC::PointSpriteParameters& params)
-//{
-//  return _updatePresentation<MEDPresentationPointSprite>(presentationID, params);
-//}
+void
+MEDPresentationManager_i::updateContour(MEDPresentation::TypeID presentationID, const MEDCALC::ContourParameters& params)
+{
+  return _updatePresentation<MEDPresentationContour>(presentationID, params);
+}
+
+void
+MEDPresentationManager_i::updateVectorField(MEDPresentation::TypeID presentationID, const MEDCALC::VectorFieldParameters& params)
+{
+  return _updatePresentation<MEDPresentationVectorField>(presentationID, params);
+}
+
+void
+MEDPresentationManager_i::updateSlices(MEDPresentation::TypeID presentationID, const MEDCALC::SlicesParameters& params)
+{
+  return _updatePresentation<MEDPresentationSlices>(presentationID, params);
+}
+
+void
+MEDPresentationManager_i::updateDeflectionShape(MEDPresentation::TypeID presentationID, const MEDCALC::DeflectionShapeParameters& params)
+{
+  return _updatePresentation<MEDPresentationDeflectionShape>(presentationID, params);
+}
+
+void
+MEDPresentationManager_i::updatePointSprite(MEDPresentation::TypeID presentationID, const MEDCALC::PointSpriteParameters& params)
+{
+  return _updatePresentation<MEDPresentationPointSprite>(presentationID, params);
+}
+
+// sphinx doc: begin of updatePlot3D
+void
+MEDPresentationManager_i::updatePlot3D(MEDPresentation::TypeID presentationID, const MEDCALC::Plot3DParameters& params)
+{
+  return _updatePresentation<MEDPresentationPlot3D>(presentationID, params);
+}
+// sphinx doc: end of updatePlot3D
+
+void
+MEDPresentationManager_i::updateStreamLines(MEDPresentation::TypeID presentationID, const MEDCALC::StreamLinesParameters& params)
+{
+  return _updatePresentation<MEDPresentationStreamLines>(presentationID, params);
+}
+
+void
+MEDPresentationManager_i::updateCutSegment(MEDPresentation::TypeID presentationID, const MEDCALC::CutSegmentParameters& params)
+{
+  return _updatePresentation<MEDPresentationCutSegment>(presentationID, params);
+}
 
 CORBA::Boolean
 MEDPresentationManager_i::removePresentation(MEDPresentation::TypeID presentationID)
 {
-  std::map<MEDPresentation::TypeID, MEDPresentation*>::const_iterator citr = _presentations.find(presentationID);
-  if (citr == _presentations.end()) {
-    std::cerr << "removePresentation(): presentation not found!!" << std::endl;
+  STDLOG("Remove presentation " << presentationID);
+  MEDPresentation* presentation = _getPresentation(presentationID);
+  
+  if (!presentation)
     return false;
-  }
-  MEDPresentation* presentation = (*citr).second;
-  if (presentation)
-    delete presentation;
+  
+  delete presentation;
   _presentations.erase(presentationID);
 
   STDLOG("Presentation " << presentationID << " has been removed.");
@@ -230,8 +395,19 @@ MEDPresentationManager_i::activateView(MEDPresentation::TypeID presentationID)
   }
   MEDPresentation* presentation = (*citr).second;
 
-  presentation->activateView();
+  if (!presentation->activateView())
+    {
+      // The view has been recreated - transfer all presentations that were in the deleted view to this new one
+      int viewId = presentation->getPyViewID();
+      std::map<MEDPresentation::TypeID, MEDPresentation*>::iterator citr = _presentations.begin();
+      for (; citr != _presentations.end(); ++citr)
+        {
+          if(citr->second->getPyViewID() == viewId)
+            citr->second->recreateViewSetup();
+        }
+    }
   _activeViewPythonId = presentation->getPyViewID();
+  STDLOG("Activated view " << _activeViewPythonId);
   return true;
 }
 
@@ -246,7 +422,7 @@ MEDPresentationManager_i::getActiveViewPythonId()
 }
 
 
-//MEDCALC::MEDPresentationViewMode
+//MEDCALC::ViewModeType
 //MEDPresentationManager_i::getPresentationViewMode(MEDPresentation::TypeID presentationID)
 //{
 //  MEDPresentation* pres = _getPresentation(presentationID);
@@ -258,12 +434,12 @@ MEDPresentationManager_i::getActiveViewPythonId()
 //  }
 //}
 
-char*
+char *
 MEDPresentationManager_i::getParavisDump(MEDPresentation::TypeID presentationID)
 {
   MEDPresentation* pres = _getPresentation(presentationID);
   if (pres) {
-    return (char*) pres->paravisDump().c_str();
+    return CORBA::string_dup(pres->paravisDump().c_str());
   }
   else
     throw KERNEL::createSalomeException("getParavisDump(): presentation not found!!");
@@ -280,3 +456,25 @@ MEDPresentationManager_i::getAllPresentations()
     (*presList)[i] = it->first;
   return presList;
 }
+
+MEDCALC::PresentationVisibility 
+MEDPresentationManager_i::stateInActiveView(MEDPresentation::TypeID presentationID)
+{
+  MEDPresentation* pres = _getPresentation(presentationID);
+  if (pres)
+    return pres->presentationStateInActiveView();
+  else
+    throw KERNEL::createSalomeException("stateInActiveView(): presentation not found!!");
+}
+ 
+
+void
+MEDPresentationManager_i::cleanUp()
+{
+  STDLOG("Cleanup");
+  _activeViewPythonId = -1;
+  std::map<MEDPresentation::TypeID, MEDPresentation*>::iterator it;
+  for (it = _presentations.begin(); it != _presentations.end(); ++it)
+    delete(it->second);
+  _presentations.clear();
+}