X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCalc%2Fcmp%2FMEDPresentationScalarMap.cxx;h=2f969abb07d160a53deb49248d8f8f5f9f76aa6d;hb=9a9f81053e1e8fa736b90baf2843b49e6df8af81;hp=f308b539b1711f38ddc2281bf25967176eed4615;hpb=b29346253f2ca9139088351013761a970e1647ba;p=modules%2Fmed.git diff --git a/src/MEDCalc/cmp/MEDPresentationScalarMap.cxx b/src/MEDCalc/cmp/MEDPresentationScalarMap.cxx index f308b539b..2f969abb0 100644 --- a/src/MEDCalc/cmp/MEDPresentationScalarMap.cxx +++ b/src/MEDCalc/cmp/MEDPresentationScalarMap.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2016 CEA/DEN, EDF R&D +// Copyright (C) 2016-2021 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 @@ -43,8 +43,9 @@ MEDPresentationScalarMap::internalGeneratePipeline() MEDPyLockWrapper lock; - setOrCreateRenderView(); // instanciate __viewXXX + setOrCreateRenderView(); // instantiate __viewXXX createSource(); + setTimestamp(); // Populate internal array of available components: fillAvailableFieldComponents(); @@ -59,6 +60,7 @@ MEDPresentationScalarMap::internalGeneratePipeline() selectColorMap(); rescaleTransferFunction(); resetCameraAndRender(); + pushAndExecPyLine(_dispVar+".SetRepresentationType('Surface')"); } void @@ -67,11 +69,22 @@ MEDPresentationScalarMap::updatePipeline(const MEDCALC::ScalarMapParameters& par if (params.fieldHandlerId != _params.fieldHandlerId) throw KERNEL::createSalomeException("Unexpected updatePipeline error! Mismatching fieldHandlerId!"); - if (std::string(params.displayedComponent) != std::string(_params.displayedComponent)) - updateComponent(std::string(params.displayedComponent)); - if (params.scalarBarRange != _params.scalarBarRange) - updateScalarBarRange(params.scalarBarRange); if (params.colorMap != _params.colorMap) updateColorMap(params.colorMap); + + if (std::string(params.displayedComponent) != std::string(_params.displayedComponent)) + updateComponent(std::string(params.displayedComponent)); + if (params.scalarBarRange != _params.scalarBarRange || + params.hideDataOutsideCustomRange != _params.hideDataOutsideCustomRange || + params.scalarBarRangeArray[0] != _params.scalarBarRangeArray[0] || + params.scalarBarRangeArray[1] != _params.scalarBarRangeArray[1] ) + updateScalarBarRange(params.scalarBarRange, + params.hideDataOutsideCustomRange, + params.scalarBarRangeArray[0], + params.scalarBarRangeArray[1]); + if (params.visibility != _params.visibility) + updateVisibility(params.visibility); + if (params.scalarBarVisibility != _params.scalarBarVisibility) + updateScalarBarVisibility(params.scalarBarVisibility); }