X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMToolsGUI%2FGEOMToolsGUI_TransparencyDlg.cxx;h=2de71038a5664439c55d384711ea28ee212658e1;hb=882dc8f6ee23cedf50cf3c718fb864dec115b35e;hp=c3f06d704ce8775871699a2afe6b0841d5eb37e3;hpb=392885c1a8d50369708bbe5e6b44033ed8b8ba51;p=modules%2Fgeom.git diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx index c3f06d704..2de71038a 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx @@ -1,24 +1,25 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2011 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 +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. // -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// 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 @@ -27,6 +28,7 @@ #include #include #include +#include #include #include @@ -47,6 +49,7 @@ #include #include #include +#include #include #include @@ -59,7 +62,6 @@ #include -using namespace std; //================================================================================= // class : GEOMBase_TransparencyDlg() @@ -96,8 +98,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 ); @@ -106,8 +108,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 ); @@ -120,8 +122,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 +158,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))); } @@ -202,16 +205,16 @@ void GEOMToolsGUI_TransparencyDlg::ClickOnHelp() app->onHelpContextModule(aGeomGUI ? app->moduleName(aGeomGUI->moduleName()) : QString(""), myHelpFileName); } else { - QString platform; + QString platform; #ifdef WIN32 - platform = "winapplication"; + platform = "winapplication"; #else - platform = "application"; + platform = "application"; #endif SUIT_MessageBox::warning(0, QObject::tr("WRN_WARNING"), - QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName), - QObject::tr("BUT_OK")); + QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName), + QObject::tr("BUT_OK")); } } @@ -224,6 +227,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 @@ -231,7 +243,7 @@ void GEOMToolsGUI_TransparencyDlg::ValueHasChanged() //================================================================================= 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 ) @@ -239,6 +251,12 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency() LightApp_SelectionMgr* aSelMgr = app->selectionMgr(); if ( !aSelMgr ) return; + + SalomeApp_Study* aStudy = dynamic_cast(app->activeStudy()); + + if(!aStudy) + return; + SALOME_ListIO selected; aSelMgr->selectedObjects( selected ); if ( selected.IsEmpty() ) @@ -247,19 +265,19 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency() Handle(SALOME_InteractiveObject) FirstIOS = selected.First(); if ( FirstIOS.IsNull() ) return; - + 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( window ); if ( !vtkVW ) return; SVTK_View* aView = vtkVW->getView(); - if ( myFirstInit ) { + 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; @@ -268,20 +286,22 @@ 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 ) - return; - int transp = int( 100 - ( aisShape->Transparency() * 100.0 ) + 0.5); + aisShape = gb->ConvertIOinGEOMAISShape( FirstIOS, true ); + if( aisShape.IsNull() ) + return; + int transp = int( aisShape->Transparency() * 100.0 + 0.5); mySlider->setValue(transp); ValueHasChanged(); return; @@ -293,13 +313,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 ) { - ic->SetTransparency( aisShape, newValue, false ); - ic->Redisplay( aisShape, Standard_False, Standard_True ); + aisShape = gb->ConvertIOinGEOMAISShape( It.Value(), true ); + 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();