From c416384e047836a6319e9d0ecab97e1db66c64c8 Mon Sep 17 00:00:00 2001 From: apo Date: Wed, 18 Jul 2007 11:45:38 +0000 Subject: [PATCH] implementation of adapatable GaussPoints scalar range --- idl/VISU_Gen.idl | 24 ++--- src/VISUGUI/VisuGUI_GaussPointsDlg.cxx | 141 ++++++++++++++++++++++++- src/VISUGUI/VisuGUI_GaussPointsDlg.h | 19 ++-- src/VISUGUI/VisuGUI_InputPane.cxx | 11 ++ src/VISUGUI/VisuGUI_InputPane.h | 1 + src/VISU_I/VISU_ColoredPrs3d_i.cc | 34 +++++- src/VISU_I/VISU_DumpPython.cc | 3 +- src/VISU_I/VISU_GaussPoints_i.cc | 20 ++-- src/VISU_I/VISU_ScalarMap_i.cc | 48 +-------- src/VISU_I/VISU_ScalarMap_i.hh | 8 -- 10 files changed, 215 insertions(+), 94 deletions(-) diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl index 0ac9c224..b8a1984c 100644 --- a/idl/VISU_Gen.idl +++ b/idl/VISU_Gen.idl @@ -422,6 +422,13 @@ module VISU { */ long GetScalarMode(); + /*! + * Sets scalar range - min and max boundaries of the scalar bar. + * \param theMin Min boundary of the scalar bar. + * \param theMax Max boundary of the scalar bar. + */ + void SetRange(in double theMin, in double theMax); + /*! * Gets the min boundary of the scalar bar. */ @@ -432,6 +439,11 @@ module VISU { */ double GetMax(); + /*! + * Sets scalar range that corresponds to the source data. + */ + void SetSourceRange(); + /*! * Gets the min boundary of the scalar bar from source data. */ @@ -688,18 +700,6 @@ module VISU { */ Scaling GetScaling(); - /*! - * Sets scalar range - min and max boundaries of the scalar bar. - * \param theMin Min boundary of the scalar bar. - * \param theMax Max boundary of the scalar bar. - */ - void SetRange(in double theMin, in double theMax); - - /*! - * Sets scalar range that corresponds to the source data. - */ - void SetSourceRange(); - /*! * Add group as geometry of presentation. * \param theMeshName - mesh name diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx index 0080d2ae..3b955d93 100644 --- a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx +++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx @@ -125,7 +125,34 @@ VisuGUI_GaussScalarBarPane::VisuGUI_GaussScalarBarPane (QWidget * parent, bool S RangeGroupLayout->addWidget( myModeLbl, 0, 0 ); RangeGroupLayout->addWidget( myModeCombo, 0, 1 ); - //TopLayout->addWidget( RangeGroup ); + RBFieldRange = new QRadioButton (tr("FIELD_RANGE_BTN"), RangeGroup, "RBFieldRange"); + RBImposedRange = new QRadioButton (tr("IMPOSED_RANGE_BTN"), RangeGroup, "RBImposedRange"); + RBFieldRange->setChecked( true ); + + MinEdit = new QLineEdit( RangeGroup, "MinEdit" ); + MinEdit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); + MinEdit->setMinimumWidth( 70 ); + MinEdit->setValidator( new QDoubleValidator(this) ); + MinEdit->setText( "0.0" ); + QLabel* MinLabel = new QLabel (tr("LBL_MIN"), RangeGroup, "MinLabel"); + MinLabel->setBuddy(MinEdit); + + MaxEdit = new QLineEdit( RangeGroup, "MaxEdit" ); + MaxEdit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); + MaxEdit->setMinimumWidth( 70 ); + MaxEdit->setValidator( new QDoubleValidator(this) ); + MaxEdit->setText( "0.0" ); + QLabel* MaxLabel = new QLabel (tr("LBL_MAX"), RangeGroup, "MaxLabel"); + MaxLabel->setBuddy(MaxEdit); + + RangeGroupLayout->addWidget( myModeLbl, 0, 0 ); + RangeGroupLayout->addMultiCellWidget( myModeCombo, 0, 0, 1, 3); + RangeGroupLayout->addMultiCellWidget( RBFieldRange, 1, 1, 0, 1); + RangeGroupLayout->addMultiCellWidget( RBImposedRange, 1, 1, 2, 3); + RangeGroupLayout->addWidget( MinLabel, 2, 0 ); + RangeGroupLayout->addWidget( MinEdit, 2, 1 ); + RangeGroupLayout->addWidget( MaxLabel, 2, 2 ); + RangeGroupLayout->addWidget( MaxEdit, 2, 3 ); // Colors and Labels ======================================================== QGroupBox* ColLabGroup = new QGroupBox (tr("COLORS_LABELS_GRP"), this, "ColLabGroup"); @@ -263,8 +290,14 @@ VisuGUI_GaussScalarBarPane::VisuGUI_GaussScalarBarPane (QWidget * parent, bool S myTextDlg->setTitleVisible(!SetPref); // signals and slots connections =========================================== - connect( myRBLocal, SIGNAL( toggled( bool ) ), myCBDisplayed, SLOT( setEnabled( bool ) ) ); - connect( myRBGlobal, SIGNAL( clicked() ), this, SLOT( onSetDisplayGlobal() ) ); + connect( RBFieldRange, SIGNAL( clicked() ), this, SLOT( fieldRangeClicked() ) ); + connect( RBImposedRange, SIGNAL( clicked() ), this, SLOT( imposedRangeClicked() ) ); + + connect( myModeCombo, SIGNAL( activated( int ) ), this, SLOT( changeScalarMode( int ) ) ); + + connect( myRBLocal, SIGNAL( clicked() ), this, SLOT( onLocalScalarBar() ) ); + connect( myRBGlobal, SIGNAL( clicked() ), this, SLOT( onGlobalScalarBar() ) ); + connect( RainbowButton, SIGNAL( toggled( bool ) ), ColorLabel, SLOT( setEnabled( bool ) ) ); connect( RainbowButton, SIGNAL( toggled( bool ) ), ColorSpin, SLOT( setEnabled( bool ) ) ); connect( RainbowButton, SIGNAL( toggled( bool ) ), LabelLabel, SLOT( setEnabled( bool ) ) ); @@ -278,17 +311,109 @@ VisuGUI_GaussScalarBarPane::VisuGUI_GaussScalarBarPane (QWidget * parent, bool S myIsStoreTextProp = false; } -void VisuGUI_GaussScalarBarPane::onSetDisplayGlobal() +void VisuGUI_GaussScalarBarPane::onGlobalScalarBar() { myCBDisplayed->setChecked( true ); + + RBImposedRange->setEnabled( false ); + RBFieldRange->setEnabled( false ); + MinEdit->setEnabled( false ); + MaxEdit->setEnabled( false ); +} + + +void VisuGUI_GaussScalarBarPane::onLocalScalarBar() +{ + myCBDisplayed->setEnabled( true ); + + RBImposedRange->setEnabled( true ); + RBFieldRange->setEnabled( true ); + + if ( RBImposedRange->isChecked() ) { + MinEdit->setEnabled( true ); + MaxEdit->setEnabled( true ); + } +} + + +/*! + Called when Range mode is changed to FieldRange +*/ +void VisuGUI_GaussScalarBarPane::fieldRangeClicked() +{ + RBImposedRange->setChecked( false ); + MinEdit->setEnabled( false ); + MaxEdit->setEnabled( false ); + + MinEdit->setText( QString::number( myPrsCopy->GetSourceMin() ) ); + MaxEdit->setText( QString::number( myPrsCopy->GetSourceMax() ) ); + + myPrsCopy->SetSourceRange(); +} + + +/*! + Called when Range mode is changed to FieldRange +*/ +void VisuGUI_GaussScalarBarPane::imposedRangeClicked() +{ + RBFieldRange->setChecked( false ); + MinEdit->setEnabled( true ); + MaxEdit->setEnabled( true ); + + myPrsCopy->SetRange(MinEdit->text().toDouble(), MaxEdit->text().toDouble()); } +/*! + Called when scalar mode is changed +*/ +void VisuGUI_GaussScalarBarPane::changeScalarMode( int theMode ) +{ + myPrsCopy->SetScalarMode( theMode ); + if ( RBFieldRange->isChecked() ) { + CORBA::Double aRange[2] = {myPrsCopy->GetSourceMin(), myPrsCopy->GetSourceMax()}; + MinEdit->setText( QString::number( aRange[0] ) ); + MaxEdit->setText( QString::number( aRange[1] ) ); + } +} + /** * Initialise dialog box from presentation object */ void VisuGUI_GaussScalarBarPane::initFromPrsObject(VISU::GaussPoints_i* thePrs) { + myPrsCopy = thePrs; + myModeCombo->setCurrentItem(thePrs->GetScalarMode()); + + bool activeLocal = thePrs->GetIsActiveLocalScalarBar(); + if ( activeLocal ) { + if ( thePrs->IsRangeFixed() ) { + RBImposedRange->setChecked( true ); + RBFieldRange->setChecked( false ); + MinEdit->setEnabled( true ); + MaxEdit->setEnabled( true ); + } else { + RBImposedRange->setChecked( false ); + RBFieldRange->setChecked( true ); + MinEdit->setEnabled( false ); + MaxEdit->setEnabled( false ); + } + } else { + RBImposedRange->setEnabled( false ); + RBFieldRange->setEnabled( false ); + MinEdit->setEnabled( false ); + MaxEdit->setEnabled( false ); + } + + if ( RBFieldRange->isChecked() ) { + MinEdit->setText( QString::number( thePrs->GetSourceMin() ) ); + MaxEdit->setText( QString::number( thePrs->GetSourceMax() ) ); + } else { + MinEdit->setText( QString::number( thePrs->GetMin() ) ); + MaxEdit->setText( QString::number( thePrs->GetMax() ) ); + } + setPosAndSize( thePrs->GetPosX(), thePrs->GetPosY(), thePrs->GetWidth(), @@ -297,7 +422,6 @@ void VisuGUI_GaussScalarBarPane::initFromPrsObject(VISU::GaussPoints_i* thePrs) SpacingSpin->setValue(thePrs->GetSpacing()); - bool activeLocal = thePrs->GetIsActiveLocalScalarBar(); myRBLocal->setChecked( activeLocal ); myRBGlobal->setChecked( !activeLocal ); @@ -377,6 +501,13 @@ void VisuGUI_GaussScalarBarPane::initFromPrsObject(VISU::GaussPoints_i* thePrs) */ int VisuGUI_GaussScalarBarPane::storeToPrsObject(VISU::GaussPoints_i* thePrs) { thePrs->SetScalarMode(myModeCombo->currentItem()); + + if (RBFieldRange->isChecked()) { + thePrs->SetSourceRange(); + } else { + thePrs->SetRange(MinEdit->text().toDouble(), MaxEdit->text().toDouble()); + } + thePrs->SetPosition(XSpin->value(), YSpin->value()); thePrs->SetSize(WidthSpin->value(), HeightSpin->value()); thePrs->SetSpacing(SpacingSpin->value()); diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.h b/src/VISUGUI/VisuGUI_GaussPointsDlg.h index bf117d7c..e0962e51 100644 --- a/src/VISUGUI/VisuGUI_GaussPointsDlg.h +++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.h @@ -29,6 +29,7 @@ #define VISUGUI_GAUSSPOINTSDLS_H #include "VisuGUI_Prs3dDlg.h" +#include "VISU_GaussPoints_i.hh" #include @@ -40,10 +41,6 @@ class VVTK_SizeBox; class VisuGUI_TextPrefDlg; class VisuGUI_InputPane; -namespace VISU -{ - class GaussPoints_i; -} //! Specific Scalar Bar tab. /*! Uses for set up Gauss Points Scalar Bars preferenses. */ @@ -71,6 +68,11 @@ class VisuGUI_GaussScalarBarPane : public QVBox protected: QButtonGroup* RangeGroup; + QRadioButton* RBFieldRange; + QRadioButton* RBImposedRange; + QLineEdit* MinEdit; + QLineEdit* MaxEdit; + SALOME::GenericObjPtr myPrsCopy; QRadioButton* RBhori; QRadioButton* RBvert; @@ -105,11 +107,16 @@ class VisuGUI_GaussScalarBarPane : public QVBox bool myIsStoreTextProp; private slots: + void onGlobalScalarBar(); + void onLocalScalarBar(); + + void fieldRangeClicked(); + void imposedRangeClicked(); + void changeScalarMode( int ); + void changeDefaults( int ); -//VSR: 08/06/06: void changeRange( int ); void XYChanged( double ); void onTextPref(); - void onSetDisplayGlobal(); }; //! Create Gauss Points Presentation Dialog. diff --git a/src/VISUGUI/VisuGUI_InputPane.cxx b/src/VISUGUI/VisuGUI_InputPane.cxx index 82d03a41..90915b17 100644 --- a/src/VISUGUI/VisuGUI_InputPane.cxx +++ b/src/VISUGUI/VisuGUI_InputPane.cxx @@ -197,7 +197,9 @@ VisuGUI_InputPane::VisuGUI_InputPane( VISU::VISUType theType, } } + connect( myTimeStamps, SIGNAL( activated( int ) ), this, SLOT( changeTimeStamp( int ) ) ); connect( myReInit, SIGNAL( toggled( bool ) ), SLOT( onReInitialize( bool ) ) ); + connect( myUseGroupsGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( onTypeChanged() ) ); connect( myAllGroups, SIGNAL( doubleClicked( QListBoxItem* ) ), this, SLOT( onListDoubleClicked( QListBoxItem* ) ) ); connect( mySelectedGroups, SIGNAL( doubleClicked( QListBoxItem* ) ), this, SLOT( onListDoubleClicked( QListBoxItem* ) ) ); @@ -420,6 +422,15 @@ void VisuGUI_InputPane::onSelectionChanged() } +//--------------------------------------------------------------- +void VisuGUI_InputPane::changeTimeStamp( int theTimeStamp ) +{ + myPrs->SetTimeStampNumber( myPrs->GetTimeStampNumberByIndex( theTimeStamp ) ); + myPrs->Apply( true ); + myDialog->initFromPrsObject( myPrs, false ); +} + + //--------------------------------------------------------------- void VisuGUI_InputPane::onReInitialize( bool on ) { diff --git a/src/VISUGUI/VisuGUI_InputPane.h b/src/VISUGUI/VisuGUI_InputPane.h index 47a0cf8c..eea4df64 100644 --- a/src/VISUGUI/VisuGUI_InputPane.h +++ b/src/VISUGUI/VisuGUI_InputPane.h @@ -75,6 +75,7 @@ public: public slots: virtual void onSelectionChanged(); virtual void onReInitialize( bool ); + virtual void changeTimeStamp( int ); private slots: void onTypeChanged(); diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.cc b/src/VISU_I/VISU_ColoredPrs3d_i.cc index 58423840..46b613e2 100644 --- a/src/VISU_I/VISU_ColoredPrs3d_i.cc +++ b/src/VISU_I/VISU_ColoredPrs3d_i.cc @@ -178,10 +178,19 @@ VISU::ColoredPrs3d_i try{ DoSetInput(anIsCreatNew, theReInit); + + if(anIsCreatNew) + GetSpecificPL()->Init(); + + // To update scalar range according to the new input + if(!IsTimeStampFixed() && !IsRangeFixed() || theReInit) + SetSourceRange(); + + GetCResult()->ConnectObserver(this, myResultConnection); + myPreviousEntity = myEntity; myPreviousFieldName = myFieldName; myPreviousTimeStampNumber = myTimeStampNumber; - GetCResult()->ConnectObserver(this, myResultConnection); }catch(std::exception& exc){ INFOS("Follow exception was occured :\n"<GetNbColors()); SetBarOrientation(anOrigin->GetBarOrientation()); + SetRange(anOrigin->GetMin(), anOrigin->GetMax()); + UseFixedRange(anOrigin->IsRangeFixed()); + SetPosition(anOrigin->GetPosX(), anOrigin->GetPosY()); SetSize(anOrigin->GetWidth(), anOrigin->GetHeight()); SetLabels(anOrigin->GetLabels()); @@ -1057,6 +1069,16 @@ VISU::ColoredPrs3d_i int aScalarMode = aResourceMgr->integerValue("VISU", "scalar_bar_mode", 0); SetScalarMode(aScalarMode); + // Scalar Range + int aRangeType = aResourceMgr->integerValue("VISU" , "scalar_range_type", 0); + UseFixedRange(aRangeType == 1); + + if(IsRangeFixed()){ + float aMin = aResourceMgr->doubleValue("VISU", "scalar_range_min", 0); + float aMax = aResourceMgr->doubleValue("VISU", "scalar_range_max", 0); + SetRange(aMin, aMax); + } + int aNumberOfColors = aResourceMgr->integerValue( "VISU", "scalar_bar_num_colors", 64 ); SetNbColors(aNumberOfColors); @@ -1193,6 +1215,12 @@ VISU::ColoredPrs3d_i Build(ERestore); SetScalarMode(VISU::Storable::FindValue(theMap,"myScalarMode").toInt()); + float aMin = VISU::Storable::FindValue(theMap,"myScalarRange[0]").toDouble(); + float aMax = VISU::Storable::FindValue(theMap,"myScalarRange[1]").toDouble(); + SetRange(aMin, aMax); + + UseFixedRange(VISU::Storable::FindValue(theMap,"myIsFixedRange", "0").toInt()); + SetNbColors(VISU::Storable::FindValue(theMap,"myNumberOfColors").toInt()); SetBarOrientation((VISU::ColoredPrs3d::Orientation)VISU::Storable::FindValue(theMap,"myOrientation").toInt()); @@ -1235,6 +1263,10 @@ VISU::ColoredPrs3d_i Storable::DataToStream( theStr, "myIsTimeStampFixed", int(myIsTimeStampFixed) ); Storable::DataToStream( theStr, "myScalarMode", int(GetScalarMode()) ); + Storable::DataToStream( theStr, "myScalarRange[0]", GetMin() ); + Storable::DataToStream( theStr, "myScalarRange[1]", GetMax() ); + Storable::DataToStream( theStr, "myIsFixedRange", IsRangeFixed() ); + Storable::DataToStream( theStr, "myNumberOfColors", int(GetNbColors()) ); Storable::DataToStream( theStr, "myOrientation", myOrientation ); diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc index 073d7367..6b707e3e 100644 --- a/src/VISU_I/VISU_DumpPython.cc +++ b/src/VISU_I/VISU_DumpPython.cc @@ -278,6 +278,8 @@ namespace VISU theStr<GetScalarMode()<<")"<GetMin()<<", "<GetMax()<<")"<GetMin()<<", "<GetMax()<<")"<GetGroupNames(); VISU::ScalarMap_i::TGroupNames::const_iterator anIter = aGroupNames.begin(); diff --git a/src/VISU_I/VISU_GaussPoints_i.cc b/src/VISU_I/VISU_GaussPoints_i.cc index 3e8ea243..16051e9c 100644 --- a/src/VISU_I/VISU_GaussPoints_i.cc +++ b/src/VISU_I/VISU_GaussPoints_i.cc @@ -224,9 +224,6 @@ VISU::GaussPoints_i if(const GaussPoints_i* aPrs3d = dynamic_cast(theOrigin)){ GaussPoints_i* anOrigin = const_cast(aPrs3d); - // To restore the range after shallow copy of the pipeline mapper - // in the parent class - SetSourceRange(); SetIsActiveLocalScalarBar(anOrigin->GetIsActiveLocalScalarBar()); SetIsDispGlobalScalarBar(anOrigin->GetIsDispGlobalScalarBar()); @@ -636,13 +633,6 @@ VISU::GaussPoints_i throw std::runtime_error("There is no TimeStamp with the parameters !!!"); GetSpecificPL()->SetGaussPtsIDMapper(aGaussPtsIDMapper); - if(theIsInitilizePipe){ - GetSpecificPL()->Init(); - } - - // To update scalar range according to the new input - if(!IsTimeStampFixed() || theReInit) - SetSourceRange(); } @@ -791,8 +781,7 @@ VISU::GaussPoints_i anActor->SetBarVisibility(true); GetPipeLine()->GetMapper()->SetScalarVisibility(1); - vtkFloatingPointType aRange[2]; - GetSpecificPL()->GetSourceRange(aRange); + vtkFloatingPointType* aRange = GetSpecificPL()->GetScalarRange(); aScalarBarCtrl->SetRangeLocal(aRange); TMinMax aTMinMax(-VTK_LARGE_FLOAT,VTK_LARGE_FLOAT); @@ -930,12 +919,15 @@ VISU::GaussPoints_i ::SetSourceRange() { if(IsTimeStampFixed() || GetIsActiveLocalScalarBar()) - GetSpecificPL()->SetSourceRange(); + ProcessVoidEvent(new TVoidMemFunEvent + (GetSpecificPL(), &VISU_ColoredPL::SetSourceRange)); else{ TMinMax aTMinMax = GetField()->GetMinMax(GetScalarMode()); vtkFloatingPointType aScalarRange[2] = {aTMinMax.first, aTMinMax.second}; - GetSpecificPL()->SetScalarRange(aScalarRange); + ProcessVoidEvent(new TVoidMemFun1ArgEvent + (GetSpecificPL(), &VISU_ColoredPL::SetScalarRange, aScalarRange)); } + UseFixedRange(false); } CORBA::Double diff --git a/src/VISU_I/VISU_ScalarMap_i.cc b/src/VISU_I/VISU_ScalarMap_i.cc index b22a9250..3d978644 100644 --- a/src/VISU_I/VISU_ScalarMap_i.cc +++ b/src/VISU_I/VISU_ScalarMap_i.cc @@ -188,9 +188,6 @@ VISU::ScalarMap_i if(const ScalarMap_i* aPrs3d = dynamic_cast(theOrigin)){ ScalarMap_i* anOrigin = const_cast(aPrs3d); - SetRange(anOrigin->GetMin(), anOrigin->GetMax()); - UseFixedRange(anOrigin->IsRangeFixed()); - SetScaling(anOrigin->GetScaling()); myGroupNames = anOrigin->GetGroupNames(); @@ -215,18 +212,7 @@ VISU::ScalarMap_i SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr(); - // Scalar Range - int aRangeType = aResourceMgr->integerValue("VISU" , "scalar_range_type", 0); - if(aRangeType == 1){ - float aMin = aResourceMgr->doubleValue("VISU", "scalar_range_min", 0); - float aMax = aResourceMgr->doubleValue("VISU", "scalar_range_max", 0); - SetRange(aMin,aMax); - } - - UseFixedRange((aRangeType == 1) ? true : false); - bool isLog = aResourceMgr->booleanValue("VISU", "scalar_bar_logarithmic", false); - - if( isLog ) + if( aResourceMgr->booleanValue("VISU", "scalar_bar_logarithmic", false) ) SetScaling(VISU::LOGARITHMIC); else SetScaling(VISU::LINEAR); @@ -253,12 +239,6 @@ VISU::ScalarMap_i SetScaling(VISU::Scaling(VISU::Storable::FindValue(theMap,"myScaling").toInt())); - float aMin = VISU::Storable::FindValue(theMap,"myScalarRange[0]").toDouble(); - float aMax = VISU::Storable::FindValue(theMap,"myScalarRange[1]").toDouble(); - SetRange(aMin,aMax); - - UseFixedRange(VISU::Storable::FindValue(theMap,"myIsFixedRange").toInt()); - bool anIsExists; QString aGeomNames = VISU::Storable::FindValue(theMap, "myGeomNameList", &anIsExists); if(anIsExists){ @@ -294,9 +274,6 @@ VISU::ScalarMap_i { TSuperClass::ToStream(theStr); - Storable::DataToStream( theStr, "myScalarRange[0]", GetMin() ); - Storable::DataToStream( theStr, "myScalarRange[1]", GetMax() ); - Storable::DataToStream( theStr, "myIsFixedRange", IsRangeFixed() ); Storable::DataToStream( theStr, "myScaling", GetScaling() ); std::ostringstream aGeomNameList; @@ -328,22 +305,6 @@ VISU::ScalarMap_i (GetSpecificPL(), &VISU_ColoredPL::SetScaling, theScaling)); } -//---------------------------------------------------------------------------- -void -VISU::ScalarMap_i -::SetRange(CORBA::Double theMin, CORBA::Double theMax) -{ - TSuperClass::SetRange(theMin, theMax); -} - -//---------------------------------------------------------------------------- -void -VISU::ScalarMap_i -::SetSourceRange() -{ - TSuperClass::SetSourceRange(); -} - //---------------------------------------------------------------------------- const VISU::ScalarMap_i::TGroupNames& VISU::ScalarMap_i @@ -428,13 +389,6 @@ VISU::ScalarMap_i throw std::runtime_error("There is no TimeStamp with the parameters !!!"); GetSpecificPL()->SetUnstructuredGridIDMapper(anIDMapper); - if(theIsInitilizePipe){ - GetSpecificPL()->Init(); - } - - // To update scalar range according to the new input - if(!IsTimeStampFixed() && !IsRangeFixed() || theReInit) - SetSourceRange(); } diff --git a/src/VISU_I/VISU_ScalarMap_i.hh b/src/VISU_I/VISU_ScalarMap_i.hh index 6d73120b..d52a2fb5 100644 --- a/src/VISU_I/VISU_ScalarMap_i.hh +++ b/src/VISU_I/VISU_ScalarMap_i.hh @@ -76,14 +76,6 @@ namespace VISU void SetScaling(VISU::Scaling theScaling); - virtual - void - SetRange(CORBA::Double theMin, CORBA::Double theMax); - - virtual - void - SetSourceRange(); - //---------------------------------------------------------------------------- //! Sets initial source geometry virtual -- 2.39.2