]> SALOME platform Git repositories - modules/visu.git/commitdiff
Salome HOME
Restore selection WP1_2_3_20-12-2006_bug_fixing
authorouv <ouv@opencascade.com>
Wed, 20 Dec 2006 11:24:14 +0000 (11:24 +0000)
committerouv <ouv@opencascade.com>
Wed, 20 Dec 2006 11:24:14 +0000 (11:24 +0000)
src/VISUGUI/VisuGUI_InputPane.cxx
src/VISUGUI/VisuGUI_Prs3dTools.h
src/VISU_I/VISU_ColoredPrs3d_i.cc

index 589a0d2ea677bb136621de9e1ab23976fbfe86c2..f20c92f39c0f328072a34ab13b16cd459359d6e1 100644 (file)
@@ -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 )
index 203064993ddfd181b4fa882c4b2a6a1ae67d934c..abcdac8425e343d900a98ea7c5f6cec9d4a46cd8 100644 (file)
@@ -82,8 +82,8 @@ namespace VISU
                      false ); // in edition mode
        QApplication::restoreOverrideCursor();
       }
-      RestoreSelection(theModule, NULL/*thePrs3d*/);
       delete aDlg;
+      RestoreSelection(theModule, NULL/*thePrs3d*/);
     }
   }
 
index ba7a4eeca3a2ddb4328d99741a1f6a665f3127ea..acebf2cfe19bba33dc5bcd4e10c0afaf38ae03ec 100644 (file)
@@ -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()) );