Merge from BR_WIN_INDUS_514 branch 21/03/2011 (Windows industrialization)

diff --git a/doc/salome/gui/GEOM/images/neo-transparency.png b/doc/salome/gui/GEOM/images/neo-transparency.png
index bff078966b45ea79ef3640cd4c16040a452c55f7..0a2946d17b289ba95a8582307576eb733b7278c3 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-transparency.png and b/doc/salome/gui/GEOM/images/neo-transparency.png differ

diff --git a/doc/salome/gui/GEOM/input/transparency.doc b/doc/salome/gui/GEOM/input/transparency.doc
index c7c0a3ea9b065dc93424858cc8a65605c1db876a..1bb550cbf0b3add4d232ce6a4f212f138948945d 100644 (file)
--- a/doc/salome/gui/GEOM/input/transparency.doc
+++ b/doc/salome/gui/GEOM/input/transparency.doc
@@ -3,14 +3,18 @@
 \page transparency_page Transparency
 
 \n You can change the transparency of a shape in the range between 0%
-(absolutely transparent and thus invisible) and 100% (absolutely opaque)
+(absolutely opaque) and 100% (absolutely transparent and thus invisible) 
 in the following dialog box.
 
 \image html neo-transparency.png
 
-or using a <b>TUI Command:</b> <em>gg.setTransparency(ID, Double)</em>
+or using a <b>TUI Command:</b> <em>gg.setTransparency(ID, Value)</em>
 
-\n <b>Examples:</b>
+where
+- <em>ID</em> is an object ID (entry)
+- <em>Value</em> is a transparency value in range [0-1]; 0 means fully opaque, 1 means fully transparent
+
+<b>Examples:</b>
 
 \image html colorsn.png
 <center><em>Opaque</em></center>

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
index adea69bd2c1df3d1fede52435501d497baf6f624..2c0de6cbeeaabbd5123f7d945a06549190f207c5 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
@@ -97,8 +97,8 @@ GEOMToolsGUI_TransparencyDlg::GEOMToolsGUI_TransparencyDlg( QWidget* parent )
   GroupC1Layout->setMargin( 11 );
   
   QLabel* TextLabelTransparent = new QLabel( tr( "GEOM_TRANSPARENCY_TRANSPARENT" ), GroupC1 );
-  TextLabelTransparent->setAlignment( Qt::AlignRight );
-  GroupC1Layout->addWidget( TextLabelTransparent, 0, 0 );
+  TextLabelTransparent->setAlignment( Qt::AlignLeft );
+  GroupC1Layout->addWidget( TextLabelTransparent, 0, 2 );
   
   myValueLab = new QLabel( GroupC1 );
   myValueLab->setAlignment( Qt::AlignCenter );
@@ -107,8 +107,8 @@ GEOMToolsGUI_TransparencyDlg::GEOMToolsGUI_TransparencyDlg( QWidget* parent )
   GroupC1Layout->addWidget( myValueLab, 0, 1 );
 
   QLabel* TextLabelOpaque = new QLabel( tr( "GEOM_TRANSPARENCY_OPAQUE" ), GroupC1 );
-  TextLabelOpaque->setAlignment( Qt::AlignLeft );
-  GroupC1Layout->addWidget( TextLabelOpaque, 0, 2 );
+  TextLabelOpaque->setAlignment( Qt::AlignRight );
+  GroupC1Layout->addWidget( TextLabelOpaque, 0, 0 );
   //GroupC1Layout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
   
   mySlider = new QSlider( Qt::Horizontal, GroupC1 );
@@ -242,7 +242,7 @@ void GEOMToolsGUI_TransparencyDlg::SliderHasMoved(int value)
 //=================================================================================
 void GEOMToolsGUI_TransparencyDlg::SetTransparency()
 {
-  float newValue = ( 100 - mySlider->value() ) / 100.;
+  float newValue = mySlider->value() / 100.;
 
   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
   if ( !app )
@@ -276,7 +276,7 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency()
     SVTK_View* aView = vtkVW->getView();
     if ( myFirstInit ) {        
       myFirstInit = false;
-      int transp = int (100 - ((aView->GetTransparency(FirstIOS))*100.0) + 0.5);
+      int transp = int ((aView->GetTransparency(FirstIOS))*100.0 + 0.5);
       mySlider->setValue(transp);
       ValueHasChanged();
       return;
@@ -300,7 +300,7 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency()
       aisShape = gb->ConvertIOinGEOMAISShape( FirstIOS, true );
       if( aisShape.IsNull() )
         return;
-      int transp = int( 100 - ( aisShape->Transparency() * 100.0 ) + 0.5);
+      int transp = int( aisShape->Transparency() * 100.0 + 0.5);
       mySlider->setValue(transp);
       ValueHasChanged();
       return;