From: ouv <ouv@opencascade.com>
Date: Wed, 20 Dec 2006 11:24:14 +0000 (+0000)
Subject: Restore selection
X-Git-Tag: WP1_2_3_20-12-2006_bug_fixing
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0d691ab33d050ae7ad2c4bec4e19ae7e6443f5c9;p=modules%2Fvisu.git

Restore selection
---

diff --git a/src/VISUGUI/VisuGUI_InputPane.cxx b/src/VISUGUI/VisuGUI_InputPane.cxx
index 589a0d2e..f20c92f3 100644
--- a/src/VISUGUI/VisuGUI_InputPane.cxx
+++ b/src/VISUGUI/VisuGUI_InputPane.cxx
@@ -99,7 +99,6 @@ VisuGUI_InputPane::VisuGUI_InputPane( VISU::VISUType theType,
   onSelectionChanged();
 
   myFieldFilter = new VisuGUI_FieldFilter( theType );
-  GetSelectionMgr( myModule )->installFilter( myFieldFilter );
 
   hide();
 }
@@ -263,6 +262,7 @@ void VisuGUI_InputPane::initFromPrsObject( VISU::ColoredPrs3d_i* thePrs )
   myTimeStamps->setCurrentItem( thePrs->GetTimeStampIndexByNumber( aTimeStampNumber ) );
 
   myFieldFilter->setPrs3dEntry( thePrs->GetHolderEntry() );
+  GetSelectionMgr( myModule )->installFilter( myFieldFilter );
 }
 
 int VisuGUI_InputPane::storeToPrsObject( VISU::ColoredPrs3d_i* thePrs )
diff --git a/src/VISUGUI/VisuGUI_Prs3dTools.h b/src/VISUGUI/VisuGUI_Prs3dTools.h
index 20306499..abcdac84 100644
--- a/src/VISUGUI/VisuGUI_Prs3dTools.h
+++ b/src/VISUGUI/VisuGUI_Prs3dTools.h
@@ -82,8 +82,8 @@ namespace VISU
 		      false ); // in edition mode
 	QApplication::restoreOverrideCursor();
       }
-      RestoreSelection(theModule, NULL/*thePrs3d*/);
       delete aDlg;
+      RestoreSelection(theModule, NULL/*thePrs3d*/);
     }
   }
 
diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.cc b/src/VISU_I/VISU_ColoredPrs3d_i.cc
index ba7a4eec..acebf2cf 100644
--- a/src/VISU_I/VISU_ColoredPrs3d_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3d_i.cc
@@ -467,6 +467,8 @@ VISU::ColoredPrs3d_i
 
     UseFixedRange( anOrigin->IsRangeFixed() );
     myIsTimeStampFixed = anOrigin->IsTimeStampFixed();
+
+    SetHolderEntry( anOrigin->GetHolderEntry() );
   }
 }
   
@@ -489,8 +491,6 @@ VISU::ColoredPrs3d_i
   else if(theScalarMode > aNbComp)
     theScalarMode = 0;
 
-  //cout << "VISU::ColoredPrs3d_i::SetScalarMode - " << theScalarMode << endl;
-
   myScalarMapPL->SetScalarMode(theScalarMode);
 }
 
@@ -922,7 +922,6 @@ void
 VISU::ColoredPrs3d_i
 ::UseFixedRange(bool theUseFixedRange)
 {
-  //cout << "UseFixedRange(" << (int)theUseFixedRange << ") for " << this << endl;
   myIsFixedRange = theUseFixedRange;
 }
 
@@ -1112,6 +1111,7 @@ VISU::ColoredPrs3d_i
   Storable::DataToStream( theStr, "myIteration",      int(GetTimeStampNumber()) );
   Storable::DataToStream( theStr, "myIsTimeStampFixed", int(myIsTimeStampFixed) );
 
+  Storable::DataToStream( theStr, "myResultEntry",    GetCResult()->GetEntry() );
   Storable::DataToStream( theStr, "myHolderEntry",    myHolderEntry );
 
   Storable::DataToStream( theStr, "myScalarMode",     int(GetScalarMode()) );