From b84c1290245f25af4031514a7335eeae40c6d28b Mon Sep 17 00:00:00 2001 From: apo Date: Fri, 24 Nov 2006 06:41:59 +0000 Subject: [PATCH] To override "Handle(SALOME_InteractiveObject) ColoredPrs3d_i::GetIO()" instead of "std::string GetEntry()" to create VISU Actors with proper instance of Interactive Object --- src/VISU_I/VISU_ColoredPrs3d_i.cc | 56 ++++++++++++++++++++++++++++--- src/VISU_I/VISU_ColoredPrs3d_i.hh | 6 ++-- 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.cc b/src/VISU_I/VISU_ColoredPrs3d_i.cc index a8380e9f..b5248103 100644 --- a/src/VISU_I/VISU_ColoredPrs3d_i.cc +++ b/src/VISU_I/VISU_ColoredPrs3d_i.cc @@ -366,14 +366,16 @@ VISU::ColoredPrs3d_i myHolderEntry = theEntry; } -std::string + +//---------------------------------------------------------------------------- +Handle(SALOME_InteractiveObject) VISU::ColoredPrs3d_i -::GetEntry() +::GetIO() { + Handle(SALOME_InteractiveObject) anIO = TSuperClass::GetIO(); if(myHolderEntry != "") - return myHolderEntry; - - return TSuperClass::GetEntry(); + anIO->setEntry(myHolderEntry.c_str()); + return anIO; } //---------------------------------------------------------------------------- @@ -428,6 +430,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SameAsParams(const ColoredPrs3d_i* theOrigin) @@ -449,6 +452,7 @@ VISU::ColoredPrs3d_i return myScalarMapPL->GetScalarMode(); } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetScalarMode(CORBA::Long theScalarMode) @@ -456,6 +460,7 @@ VISU::ColoredPrs3d_i myScalarMapPL->SetScalarMode(theScalarMode); } +//---------------------------------------------------------------------------- CORBA::Double VISU::ColoredPrs3d_i ::GetMin() @@ -463,6 +468,7 @@ VISU::ColoredPrs3d_i return myScalarMapPL->GetScalarRange()[0]; } +//---------------------------------------------------------------------------- CORBA::Double VISU::ColoredPrs3d_i ::GetMax() @@ -498,6 +504,7 @@ VISU::ColoredPrs3d_i UseFixedRange(false); } +//---------------------------------------------------------------------------- CORBA::Double VISU::ColoredPrs3d_i ::GetSourceMin() @@ -512,6 +519,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- CORBA::Double VISU::ColoredPrs3d_i ::GetSourceMax() @@ -534,6 +542,7 @@ VISU::ColoredPrs3d_i GetSpecificPL()->SetNbColors(theNbColors); } +//---------------------------------------------------------------------------- CORBA::Long VISU::ColoredPrs3d_i ::GetNbColors() @@ -541,6 +550,7 @@ VISU::ColoredPrs3d_i return GetSpecificPL()->GetNbColors(); } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetBarOrientation(VISU::ScalarMap::Orientation theOrientation) @@ -551,6 +561,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- VISU::ScalarMap::Orientation VISU::ColoredPrs3d_i ::GetBarOrientation() @@ -558,6 +569,7 @@ VISU::ColoredPrs3d_i return myOrientation; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetPosition(CORBA::Double X, CORBA::Double Y) @@ -567,6 +579,7 @@ VISU::ColoredPrs3d_i myParamsTime.Modified(); } +//---------------------------------------------------------------------------- CORBA::Double VISU::ColoredPrs3d_i ::GetPosX() @@ -574,6 +587,7 @@ VISU::ColoredPrs3d_i return myPosition[0]; } +//---------------------------------------------------------------------------- CORBA::Double VISU::ColoredPrs3d_i ::GetPosY() @@ -581,6 +595,7 @@ VISU::ColoredPrs3d_i return myPosition[1]; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetSize(CORBA::Double theWidth, CORBA::Double theHeight) @@ -590,6 +605,7 @@ VISU::ColoredPrs3d_i myParamsTime.Modified(); } +//---------------------------------------------------------------------------- CORBA::Double VISU::ColoredPrs3d_i ::GetWidth() @@ -597,6 +613,7 @@ VISU::ColoredPrs3d_i return myWidth; } +//---------------------------------------------------------------------------- CORBA::Double VISU::ColoredPrs3d_i ::GetHeight() @@ -604,6 +621,7 @@ VISU::ColoredPrs3d_i return myHeight; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetLabels(CORBA::Long theNbLabels) @@ -614,6 +632,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- CORBA::Long VISU::ColoredPrs3d_i ::GetLabels() @@ -621,6 +640,7 @@ VISU::ColoredPrs3d_i return myNumberOfLabels; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetTitle(const char* theTitle) @@ -636,6 +656,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- char* VISU::ColoredPrs3d_i ::GetTitle() @@ -643,6 +664,7 @@ VISU::ColoredPrs3d_i return CORBA::string_dup(myTitle.c_str()); } +//---------------------------------------------------------------------------- std::string VISU::ColoredPrs3d_i ::GetCTitle() @@ -650,6 +672,7 @@ VISU::ColoredPrs3d_i return myTitle; } +//---------------------------------------------------------------------------- bool VISU::ColoredPrs3d_i ::IsBoldTitle() @@ -657,6 +680,7 @@ VISU::ColoredPrs3d_i return myIsBoldTitle; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetBoldTitle(bool theIsBoldTitle) @@ -667,6 +691,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- bool VISU::ColoredPrs3d_i ::IsItalicTitle() @@ -674,6 +699,7 @@ VISU::ColoredPrs3d_i return myIsItalicTitle; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetItalicTitle(bool theIsItalicTitle) @@ -684,6 +710,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- bool VISU::ColoredPrs3d_i ::IsShadowTitle() @@ -691,6 +718,7 @@ VISU::ColoredPrs3d_i return myIsShadowTitle; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetShadowTitle(bool theIsShadowTitle) @@ -701,6 +729,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- int VISU::ColoredPrs3d_i ::GetTitFontType() @@ -708,6 +737,7 @@ VISU::ColoredPrs3d_i return myTitFontType; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetTitFontType(int theTitFontType) @@ -718,6 +748,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::GetTitleColor(vtkFloatingPointType* theR, @@ -729,6 +760,7 @@ VISU::ColoredPrs3d_i *theB = myTitleColor[2]; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetTitleColor(vtkFloatingPointType theR, @@ -741,6 +773,7 @@ VISU::ColoredPrs3d_i myParamsTime.Modified(); } +//---------------------------------------------------------------------------- bool VISU::ColoredPrs3d_i ::IsBoldLabel() @@ -748,6 +781,7 @@ VISU::ColoredPrs3d_i return myIsBoldLabel; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetBoldLabel(bool theIsBoldLabel) @@ -758,6 +792,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- bool VISU::ColoredPrs3d_i ::IsItalicLabel() @@ -765,6 +800,7 @@ VISU::ColoredPrs3d_i return myIsItalicLabel; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetItalicLabel(bool theIsItalicLabel) @@ -775,6 +811,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- bool VISU::ColoredPrs3d_i ::IsShadowLabel() @@ -782,6 +819,7 @@ VISU::ColoredPrs3d_i return myIsShadowLabel; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetShadowLabel(bool theIsShadowLabel) @@ -792,6 +830,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- int VISU::ColoredPrs3d_i ::GetLblFontType() @@ -799,6 +838,7 @@ VISU::ColoredPrs3d_i return myLblFontType; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetLblFontType(int theLblFontType) @@ -809,6 +849,7 @@ VISU::ColoredPrs3d_i } } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::GetLabelColor(vtkFloatingPointType* theR, @@ -820,6 +861,7 @@ VISU::ColoredPrs3d_i *theB = myLabelColor[2]; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::SetLabelColor(vtkFloatingPointType theR, @@ -841,6 +883,7 @@ VISU::ColoredPrs3d_i return myIsFixedRange; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::UseFixedRange(bool theUseFixedRange) @@ -848,6 +891,7 @@ VISU::ColoredPrs3d_i myIsFixedRange = theUseFixedRange; } +//---------------------------------------------------------------------------- std::string VISU::ColoredPrs3d_i ::GetScalarBarTitle() @@ -972,6 +1016,7 @@ VISU::ColoredPrs3d_i return this; } +//---------------------------------------------------------------------------- VISU::Storable* VISU::ColoredPrs3d_i ::Restore(const Storable::TRestoringMap& theMap) @@ -1019,6 +1064,7 @@ VISU::ColoredPrs3d_i return this; } +//---------------------------------------------------------------------------- void VISU::ColoredPrs3d_i ::ToStream(std::ostringstream& theStr) diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.hh b/src/VISU_I/VISU_ColoredPrs3d_i.hh index 0204fe4a..bed9333e 100644 --- a/src/VISU_I/VISU_ColoredPrs3d_i.hh +++ b/src/VISU_I/VISU_ColoredPrs3d_i.hh @@ -228,9 +228,11 @@ namespace VISU void SetHolderEntry(const std::string& theEntry); + //---------------------------------------------------------------------------- + //! Create and return the interactive object virtual - std::string - GetEntry(); + Handle(SALOME_InteractiveObject) + GetIO(); //---------------------------------------------------------------------------- public: -- 2.39.2