Fix of transparency on Mandriva2010: it didn't worked because of the returned 'testRe...

[modules/geom.git] / src / GEOMToolsGUI / GEOMToolsGUI_TransparencyDlg.cxx

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
index 08c943795e8d65c3d3b4d1559798f7ff7eb44767..92f56b4fb2557aeded9e384b3ee10331557c9220 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : GEOMToolsGUI_TransparencyDlg.cxx
 // Author : Lucien PIGNOLONI
@@ -47,6 +48,7 @@
 #include <SalomeApp_Application.h>
 #include <LightApp_Application.h>
 #include <LightApp_SelectionMgr.h>
+#include <SalomeApp_Study.h>
 
 #include <QLabel>
 #include <QPushButton>
@@ -59,7 +61,6 @@
 
 #include <AIS_InteractiveContext.hxx>
 
-using namespace std;
 
 //=================================================================================
 // class    : GEOMBase_TransparencyDlg()
@@ -120,8 +121,9 @@ GEOMToolsGUI_TransparencyDlg::GEOMToolsGUI_TransparencyDlg( QWidget* parent )
   mySlider->setSingleStep( 1 );
   mySlider->setPageStep( 10 );
   //mySlider->setValue( 5 );
+  mySlider->setTracking(false);
 
-  mySlider->setTickPosition( QSlider::TicksLeft );
+  mySlider->setTickPosition( QSlider::TicksAbove );
   GroupC1Layout->addWidget( mySlider, 1, 0, 1, 3 );
 
   /*************************************************************************/
@@ -155,7 +157,7 @@ GEOMToolsGUI_TransparencyDlg::GEOMToolsGUI_TransparencyDlg( QWidget* parent )
   connect(buttonOk,   SIGNAL(clicked()), this, SLOT(ClickOnOk()));
   connect(buttonHelp, SIGNAL(clicked()), this, SLOT(ClickOnHelp()));
   connect(mySlider,   SIGNAL(valueChanged(int)), this, SLOT(SetTransparency()));
-  connect(mySlider,   SIGNAL(sliderMoved(int)),  this, SLOT(ValueHasChanged()));
+  connect(mySlider,   SIGNAL(sliderMoved(int)),  this, SLOT(SliderHasMoved(int)));
 }
 
 
@@ -224,6 +226,15 @@ void GEOMToolsGUI_TransparencyDlg::ValueHasChanged()
   myValueLab->setText( QString("%1%").arg( mySlider->value() ) );
 }
 
+//=================================================================================
+// function : SliderHasMoved()
+// purpose  : Called when value of slider change
+//=================================================================================
+void GEOMToolsGUI_TransparencyDlg::SliderHasMoved(int value)
+{
+  myValueLab->setText( QString("%1%").arg( value ) );
+}
+
 //=================================================================================
 // function : SetTransparency()
 // purpose  : Called when value of slider change
@@ -239,6 +250,12 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency()
   LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
   if ( !aSelMgr )
     return;
+  
+  SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(app->activeStudy());
+  
+  if(!aStudy)
+    return;
+  
   SALOME_ListIO selected;
   aSelMgr->selectedObjects( selected );
   if ( selected.IsEmpty() )
@@ -251,7 +268,7 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency()
   SUIT_ViewWindow* window = app->desktop()->activeWindow();
   bool isOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() );
   bool isVTK = ( window && window->getViewManager()->getType() == SVTK_Viewer::Type() );
-
+  int aMgrId = window->getViewManager()->getGlobalId();
   if ( isVTK ) {
     SVTK_ViewWindow* vtkVW = dynamic_cast<SVTK_ViewWindow*>( window );
     if ( !vtkVW )
@@ -268,18 +285,20 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency()
     SUIT_OverrideCursor();
     for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
       aView->SetTransparency( It.Value(), newValue );
+      aStudy->setObjectProperty( aMgrId , It.Value()->getEntry(), TRANSPARENCY_PROP , newValue );
     }
+    GeometryGUI::Modified();
     aView->Repaint();
   } // if ( isVTK )
         
   else if ( isOCC ) {
     GEOMBase* gb = new GEOMBase();
-    Standard_Boolean found;
     Handle(GEOM_AISShape) aisShape;
     if ( myFirstInit ) {
+      mySlider->setValue(mySlider->maximum());
       myFirstInit = false;
-      aisShape = gb->ConvertIOinGEOMAISShape( FirstIOS, found );
-      if( !found )
+      aisShape = gb->ConvertIOinGEOMAISShape( FirstIOS );
+      if( aisShape.IsNull() )
         return;
       int transp = int( 100 - ( aisShape->Transparency() * 100.0 ) + 0.5);
       mySlider->setValue(transp);
@@ -293,13 +312,15 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency()
       return;
     Handle(AIS_InteractiveContext) ic = vm->getAISContext();
     for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
-      aisShape = gb->ConvertIOinGEOMAISShape( It.Value(), found );
-      if ( found ) {
+      aisShape = gb->ConvertIOinGEOMAISShape( It.Value() );
+      if ( !aisShape.IsNull() ) {
         ic->SetTransparency( aisShape, newValue, false );
         ic->Redisplay( aisShape, Standard_False, Standard_True );
+       aStudy->setObjectProperty( aMgrId , It.Value()->getEntry(), TRANSPARENCY_PROP , newValue );
       }
     } // for...
     ic->UpdateCurrentViewer();
+    GeometryGUI::Modified();
   } // if ( isOCC )
 
   ValueHasChanged();