Merge 'abn/V8_1_fix' branch into V8_1_BR.

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

diff --git a/src/MEDCalc/cmp/MEDPresentationScalarMap.cxx b/src/MEDCalc/cmp/MEDPresentationScalarMap.cxx
index 573a34b39a6717385d0138a8c32700c6b390f8a6..f308b539b1711f38ddc2281bf25967176eed4615 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)
 {
 }
@@ -43,40 +43,22 @@ MEDPresentationScalarMap::internalGeneratePipeline()
 
   MEDPyLockWrapper lock;
 
-  std::ostringstream oss_o, oss_d,oss_l, oss, oss_v;
-  oss_o << "__obj" << _objId;      std::string obj(oss_o.str());
-  oss_d << "__disp" << _dispId;    std::string disp(oss_d.str());
-  oss_l << "__lut" << _lutId;    std::string lut(oss_l.str());
-  oss_v << "__view" << _renderViewPyId;    std::string view(oss_v.str());
-
-  pushAndExecPyLine( getRenderViewCommand() ); // instanciate __viewXXX
-
-  oss << obj << " = pvs.MEDReader(FileName='" << _fileName << "');";
-  pushAndExecPyLine(oss.str()); oss.str("");
+  setOrCreateRenderView(); // instanciate __viewXXX
+  createSource();
 
   // Populate internal array of available components:
   fillAvailableFieldComponents();
-//  dumpIntProperties();
-//  dumpStringProperties();
-
-  oss << disp << " = pvs.Show(" << obj << ", " << view << ");";
-  pushAndExecPyLine(oss.str()); oss.str("");
-  oss << "pvs.ColorBy(" << disp << ", ('" << _fieldType << "', '" << _fieldName << "'));";
-  pushAndExecPyLine(oss.str()); oss.str("");
-  oss << disp <<  ".SetScalarBarVisibility(" << view << ", True);";
-  pushAndExecPyLine(oss.str()); oss.str("");
-  oss << getRescaleCommand();
-  pushAndExecPyLine(oss.str()); oss.str("");
-  oss << lut << " = pvs.GetColorTransferFunction('" << _fieldName << "');";
-  pushAndExecPyLine(oss.str()); oss.str("");
-  pushAndExecPyLine(getColorMapCommand()); oss.str("");
-  pushAndExecPyLine(getResetCameraCommand());
-  pushAndExecPyLine("pvs.Render();");
-
-  // Retrieve Python object for internal storage:
-//  PyObject* p_obj = getPythonObjectFromMain(obj.c_str());
-//  PyObject* p_disp = getPythonObjectFromMain(disp.c_str());
-//  pushPyObjects(std::make_pair(_objId, p_obj), std::make_pair(disp_id, p_disp));
+
+  // Nothing to do in a scalar map, obj = source:
+  pushAndExecPyLine(_objVar + " = " + _srcObjVar);
+
+  showObject();
+
+  colorBy();
+  showScalarBar();
+  selectColorMap();
+  rescaleTransferFunction();
+  resetCameraAndRender();
 }
 
 void
@@ -85,7 +67,7 @@ MEDPresentationScalarMap::updatePipeline(const MEDCALC::ScalarMapParameters& par
   if (params.fieldHandlerId != _params.fieldHandlerId)
     throw KERNEL::createSalomeException("Unexpected updatePipeline error! Mismatching fieldHandlerId!");
 
-  if (params.displayedComponent != _params.displayedComponent)
+  if (std::string(params.displayedComponent) != std::string(_params.displayedComponent))
     updateComponent<MEDPresentationScalarMap, MEDCALC::ScalarMapParameters>(std::string(params.displayedComponent));
   if (params.scalarBarRange != _params.scalarBarRange)
     updateScalarBarRange<MEDPresentationScalarMap, MEDCALC::ScalarMapParameters>(params.scalarBarRange);