From a46f24d18dca062f3e5f2d984765bd5e725a1174 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 18 Aug 2009 07:28:56 +0000 Subject: [PATCH] Issue 20189: EDF 972 VISU : Shrink coef --- doc/salome/gui/VISU/images/line_width.png | Bin 0 -> 6837 bytes doc/salome/gui/VISU/images/shrink_factor.png | Bin 0 -> 7707 bytes .../VISU/input/viewing_3d_presentations.doc | 13 +- resources/SalomeApp.xml | 1 + src/VISUGUI/Makefile.am | 3 + src/VISUGUI/VISU_msg_en.ts | 19 ++ src/VISUGUI/VisuGUI.cxx | 33 ++- src/VISUGUI/VisuGUI.h | 1 + src/VISUGUI/VisuGUI_ActionsDef.h | 1 + src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx | 255 ++++++++++++++++++ src/VISUGUI/VisuGUI_ShrinkFactorDlg.h | 76 ++++++ src/VISU_I/VISU_Prs3d_i.cc | 5 +- 12 files changed, 399 insertions(+), 8 deletions(-) create mode 100644 doc/salome/gui/VISU/images/line_width.png create mode 100644 doc/salome/gui/VISU/images/shrink_factor.png create mode 100644 src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx create mode 100644 src/VISUGUI/VisuGUI_ShrinkFactorDlg.h diff --git a/doc/salome/gui/VISU/images/line_width.png b/doc/salome/gui/VISU/images/line_width.png new file mode 100644 index 0000000000000000000000000000000000000000..15e40a7d0a9f5c191d6dc767a4b1a8491ed32f7e GIT binary patch literal 6837 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 Z{rB;dZBwgL%ykq%Lq$iqLec8|e*x2q{vQAU literal 0 HcmV?d00001 diff --git a/doc/salome/gui/VISU/images/shrink_factor.png b/doc/salome/gui/VISU/images/shrink_factor.png new file mode 100644 index 0000000000000000000000000000000000000000..cbc4f9530ff8d7236320e96f94f731cc580d210a GIT binary patch literal 7707 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 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/VISU/input/viewing_3d_presentations.doc b/doc/salome/gui/VISU/input/viewing_3d_presentations.doc index 36c13e88..a82e5eb5 100644 --- a/doc/salome/gui/VISU/input/viewing_3d_presentations.doc +++ b/doc/salome/gui/VISU/input/viewing_3d_presentations.doc @@ -105,7 +105,6 @@ arcs.
  • \b Properties
    • -\image html viewing13.png
    • \b Opacity - allows to set the value of opacity of the presentation between 0 (transparent) and 100 (opaque). @@ -117,8 +116,20 @@ opaque mode as long as the opacity level is equal 100% and in transparent mode when opacity level is lower that 100% (note that they become invisible when the level is equal 0%).
      • + +\image html viewing13.png +
    • Line Width - allows to set the width of lines representing edges of the presentation between 1 (thin) and 100 (thick).
      • + +\image html line_width.png + +
    • Shrink Factor - allows to set the shrink factor of the presentation +to be used in \b Shrink mode. Possible values are ranged between 20 and +100, default value is 80.
      • + +\image html shrink_factor.png +
    • Edge Color - allows to set the color of lines representing edges of the presentation displayed in Surfaceframe mode.
    diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index 3aee730b..f35f3f11 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -39,6 +39,7 @@ + diff --git a/src/VISUGUI/Makefile.am b/src/VISUGUI/Makefile.am index 5a39eccf..86a1d09d 100644 --- a/src/VISUGUI/Makefile.am +++ b/src/VISUGUI/Makefile.am @@ -65,6 +65,7 @@ salomeinclude_HEADERS= \ VisuGUI_SetupPlot2dDlg.h \ VisuGUI_BuildProgressDlg.h \ VisuGUI_TransparencyDlg.h \ + VisuGUI_ShrinkFactorDlg.h \ VisuGUI_Timer.h \ VisuGUI_Slider.h \ VisuGUI_InputPane.h \ @@ -112,6 +113,7 @@ dist_libVISU_la_SOURCES= \ VisuGUI_BuildProgressDlg.cxx \ VisuGUI_Table3dDlg.cxx \ VisuGUI_TransparencyDlg.cxx \ + VisuGUI_ShrinkFactorDlg.cxx \ VisuGUI_Timer.cxx \ VisuGUI_Slider.cxx \ VisuGUI_Sweep.cxx \ @@ -159,6 +161,7 @@ MOC_FILES= \ VisuGUI_BuildProgressDlg_moc.cxx \ VisuGUI_Table3dDlg_moc.cxx \ VisuGUI_TransparencyDlg_moc.cxx \ + VisuGUI_ShrinkFactorDlg_moc.cxx \ VisuGUI_Slider_moc.cxx \ VisuGUI_Sweep_moc.cxx \ VisuGUI_InputPane_moc.cxx \ diff --git a/src/VISUGUI/VISU_msg_en.ts b/src/VISUGUI/VISU_msg_en.ts index 1d07e3b4..986a8221 100644 --- a/src/VISUGUI/VISU_msg_en.ts +++ b/src/VISUGUI/VISU_msg_en.ts @@ -409,6 +409,10 @@ number of time stamps or number of components is not the same! MAX_ARC_ANGLE Maximum angle + + VISU_SHRINK_FACTOR + Shrink Factor + VISU_USE_SHADING Use Shading @@ -1173,6 +1177,10 @@ Please, refer to the documentation. MEN_LINE_WIDTH Line Width + + MEN_SHRINK_FACTOR + Shrink Factor + MEN_MERGE_SCALAR_BARS Merge Scalar Range @@ -4125,4 +4133,15 @@ Please, refer to the QT documentation. Color + + VisuGUI_ShrinkFactorDlg + + SHRINKFACTOR_TITLE + Change Shrink Factor + + + SHRINKFACTOR_VALUE + Shrink Factor: + + diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index 8c724922..8ea7c889 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -116,6 +116,7 @@ #include "VisuGUI_Displayer.h" #include "VisuGUI_BuildProgressDlg.h" #include "VisuGUI_TransparencyDlg.h" +#include "VisuGUI_ShrinkFactorDlg.h" #include "VisuGUI_CacheDlg.h" #include "VisuGUI_Table3dDlg.h" #include "VisuGUI_ClippingPanel.h" @@ -1391,6 +1392,15 @@ VisuGUI delete CursorDlg; } +//---------------------------------------------------------------------------- +void +VisuGUI +::OnChangeShrinkFactor() +{ + VisuGUI_ShrinkFactorDlg* aDialog = new VisuGUI_ShrinkFactorDlg( this ); + aDialog->show(); +} + //---------------------------------------------------------------------------- void VisuGUI @@ -2622,6 +2632,10 @@ VisuGUI tr("MEN_LINE_WIDTH"), "", 0, aParent, false, this, SLOT(OnChangeLines())); + createAction( VISU_SHRINK_FACTOR, tr("MEN_SHRINK_FACTOR"), QIcon(), + tr("MEN_SHRINK_FACTOR"), "", 0, aParent, false, + this, SLOT(OnChangeShrinkFactor())); + createAction( VISU_EDIT_SCALARMAP, tr("MEN_EDIT_PRS"), QIcon(), tr("MEN_EDIT_PRS"), "", 0, aParent, false, @@ -2958,11 +2972,12 @@ VisuGUI // "Properties" submenu parentId = mgr->insert( tr( "MEN_PROPERTIES" ), -1, -1 ); - mgr->insert( action( VISU_CELL_COLOR ), parentId, -1, -1 ); // cell color - mgr->insert( action( VISU_EDGE_COLOR ), parentId, -1, -1 ); // edge color - mgr->insert( action( VISU_COLOR ) , parentId, -1, -1 ); // color - mgr->insert( action( VISU_OPACITY ) , parentId, -1, -1 ); // opacity - mgr->insert( action( VISU_LINE_WIDTH ), parentId, -1, -1 ); // line width + mgr->insert( action( VISU_CELL_COLOR ), parentId, -1, -1 ); // cell color + mgr->insert( action( VISU_EDGE_COLOR ), parentId, -1, -1 ); // edge color + mgr->insert( action( VISU_COLOR ) , parentId, -1, -1 ); // color + mgr->insert( action( VISU_OPACITY ) , parentId, -1, -1 ); // opacity + mgr->insert( action( VISU_LINE_WIDTH ), parentId, -1, -1 ); // line width + mgr->insert( action( VISU_SHRINK_FACTOR ), parentId, -1, -1 ); // shrink factor mgr->insert( separator(), -1, -1, -1 ); @@ -3139,6 +3154,7 @@ VisuGUI "or (type='VISU::TDEFORMEDSHAPE' and hasActor=1))" ); mgr->setRule( action( VISU_OPACITY ), aRule + " and hasActor=1" ); mgr->setRule( action( VISU_LINE_WIDTH ), aRule + aLineType + " and hasActor=1" ); + mgr->setRule( action( VISU_SHRINK_FACTOR ), aRule + aShrinkType + " and isShrunk=1" ); // rename command QString aCurveAll = "'VISU::TTABLE' 'VISU::TCURVE' 'VISU::TCONTAINER' 'VISU::POINTMAP3D'"; @@ -3977,11 +3993,16 @@ void VisuGUI::createPreferences() setPreferenceProperty( maxAngle, "min", 1 ); setPreferenceProperty( maxAngle, "max", 90 ); + int shrFac = addPreference( tr( "VISU_SHRINK_FACTOR" ), representGr, LightApp_Preferences::IntSpin, "VISU", "shrink_factor" ); + setPreferenceProperty( shrFac, "min", 20 ); + setPreferenceProperty( shrFac, "max", 100 ); + sp = addPreference( "", representGr, LightApp_Preferences::Space ); + setPreferenceProperty( sp, "hstretch", 0 ); + setPreferenceProperty( sp, "vstretch", 0 ); addPreference( tr( "VISU_EDGE_COLOR" ), representGr, LightApp_Preferences::Color, "VISU", "edge_color" ); addPreference( "", representGr, LightApp_Preferences::Space ); - addPreference( tr( "VISU_USE_SHADING" ), representGr, LightApp_Preferences::Bool, "VISU", "represent_shading" ); sp = addPreference( "", representGr, LightApp_Preferences::Space ); setPreferenceProperty( sp, "hstretch", 0 ); diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h index dff83e2f..e5fa4866 100644 --- a/src/VISUGUI/VisuGUI.h +++ b/src/VISUGUI/VisuGUI.h @@ -153,6 +153,7 @@ protected slots: void OnChangeWireframeColor(); void OnChangeOpacity(); void OnChangeLines(); + void OnChangeShrinkFactor(); void OnShowTable(); void OnShowTablePlot(); diff --git a/src/VISUGUI/VisuGUI_ActionsDef.h b/src/VISUGUI/VisuGUI_ActionsDef.h index e0bc6e7b..be51141e 100644 --- a/src/VISUGUI/VisuGUI_ActionsDef.h +++ b/src/VISUGUI/VisuGUI_ActionsDef.h @@ -92,6 +92,7 @@ #define VISU_EDGE_COLOR 4059 #define VISU_OPACITY 4060 #define VISU_LINE_WIDTH 4061 +#define VISU_SHRINK_FACTOR 40629 #define VISU_EDIT_SCALARMAP 40620 #define VISU_EDIT_DEFORMEDSHAPE 40621 diff --git a/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx b/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx new file mode 100644 index 00000000..32f2b0fc --- /dev/null +++ b/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx @@ -0,0 +1,255 @@ +// Copyright (C) 2007-2008 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 +// +// 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. +// +// 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 +// +// File : VisuGUI_ShrinkFactorDlg.cxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// + +#include "VisuGUI_ShrinkFactorDlg.h" + +#include "VisuGUI.h" +#include "VisuGUI_ViewTools.h" +#include "VisuGUI_Tools.h" +#include "VISU_Actor.h" + +#include "SUIT_Desktop.h" +#include "SUIT_OverrideCursor.h" +#include "SUIT_Session.h" +#include "SUIT_MessageBox.h" +#include "SUIT_ResourceMgr.h" + +#include "SALOME_ListIO.hxx" +#include "SALOME_ListIteratorOfListIO.hxx" +#include "SALOME_InteractiveObject.hxx" + +#include "LightApp_Study.h" +#include "LightApp_SelectionMgr.h" +#include "LightApp_Application.h" + +#include "SVTK_ViewWindow.h" + +// QT Includes +#include +#include +#include +#include +#include +#include + +const int DEFAULT_SHRINK = 80; + +//================================================================================= +// class : VisuGUI_ShrinkFactorDlg() +// purpose : +// +//================================================================================= +VisuGUI_ShrinkFactorDlg::VisuGUI_ShrinkFactorDlg( VisuGUI* theModule, bool modal ) + : QDialog( VISU::GetDesktop( theModule ), Qt::WindowTitleHint | Qt::WindowSystemMenuHint ), + myModule(theModule), + mySelectionMgr( VISU::GetSelectionMgr( theModule ) ), + myViewWindow( VISU::GetActiveViewWindow(theModule) ) +{ + setModal( modal ); + setAttribute( Qt::WA_DeleteOnClose ); + + setWindowTitle( tr( "SHRINKFACTOR_TITLE" ) ); + setSizeGripEnabled( true ); + QVBoxLayout* topLayout = new QVBoxLayout( this ); + topLayout->setSpacing( 6 ); + topLayout->setMargin( 11 ); + + /*************************************************************************/ + GroupC1 = new QGroupBox( this ); + QHBoxLayout* GroupC1Layout = new QHBoxLayout( GroupC1 ); + GroupC1Layout->setSpacing( 6 ); + GroupC1Layout->setMargin( 11 ); + + ValueLab = new QLabel( tr( "SHRINKFACTOR_VALUE" ), GroupC1 ); + ValueSpin = new QSpinBox( GroupC1 ); + ValueSpin->setRange( 20, 100 ); + ValueSpin->setSingleStep( 10 ); + ValueSpin->setMinimumWidth( 70 ); + + GroupC1Layout->addWidget( ValueLab ); + GroupC1Layout->addWidget( ValueSpin ); + + /*************************************************************************/ + QGroupBox* GroupButtons = new QGroupBox( this ); + QHBoxLayout* GroupButtonsLayout = new QHBoxLayout( GroupButtons ); + GroupButtonsLayout->setSpacing( 6 ); + GroupButtonsLayout->setMargin( 11 ); + + buttonOk = new QPushButton( tr( "BUT_CLOSE" ), GroupButtons ); + buttonOk->setAutoDefault( true ); + buttonOk->setDefault( true ); + + buttonHelp = new QPushButton( tr( "BUT_HELP" ), GroupButtons); + buttonHelp->setAutoDefault( true ); + + GroupButtonsLayout->addWidget( buttonOk ); + GroupButtonsLayout->addSpacing( 10 ); + GroupButtonsLayout->addStretch(); + GroupButtonsLayout->addWidget( buttonHelp ); + + topLayout->addWidget( GroupC1 ); + topLayout->addWidget( GroupButtons ); + + // Initial state + onSelectionChanged(); + + // signals and slots connections : after ValueHasChanged() + connect(buttonOk, SIGNAL( clicked() ), this, SLOT( close() ) ); + connect(buttonHelp, SIGNAL( clicked() ), this, SLOT( help() ) ); + connect(ValueSpin, SIGNAL( valueChanged( int ) ), this, SLOT( setShrinkFactor() ) ); + connect(mySelectionMgr, SIGNAL( currentSelectionChanged() ), this, SLOT( onSelectionChanged() ) ); +} + +//================================================================================= +// function : ~VisuGUI_ShrinkFactorDlg() +// purpose : +//================================================================================= +VisuGUI_ShrinkFactorDlg::~VisuGUI_ShrinkFactorDlg() +{ +} + +//======================================================================= +// function : help() +// purpose : +//======================================================================= +void VisuGUI_ShrinkFactorDlg::help() +{ + QString aHelpFileName = "viewing_3d_presentations_page.html#width_shrink_factor_anchor"; + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + if (app) { + VisuGUI* aVisuGUI = dynamic_cast( app->activeModule() ); + app->onHelpContextModule( aVisuGUI ? app->moduleName( aVisuGUI->moduleName() ) : QString(""), aHelpFileName ); + } + else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif + SUIT_MessageBox::warning( this, + tr( "WRN_WARNING" ), + tr( "EXTERNAL_BROWSER_CANNOT_SHOW_PAGE" ). + arg( app->resourceMgr()->stringValue( "ExternalBrowser", platform ) ).arg( aHelpFileName ), + tr( "BUT_OK" ) ); + } +} + +//================================================================================= +// function : setShrinkFactor() +// purpose : Called when value of spin box is changed +// : or the first time as initilisation +//================================================================================= +void VisuGUI_ShrinkFactorDlg::setShrinkFactor() +{ + if ( myViewWindow ) { + SUIT_OverrideCursor wc; + float shrink = ValueSpin->value() / 100.; + + SALOME_ListIO aList; + mySelectionMgr->selectedObjects( aList ); + + SALOME_ListIteratorOfListIO anIter( aList ); + for ( ; anIter.More(); anIter.Next() ) { + Handle(SALOME_InteractiveObject) anIO = anIter.Value(); + VISU_Actor* anActor = VISU::FindActor( VISU::GetAppStudy( myModule ), myViewWindow, anIO->getEntry() ); + if ( anActor && anActor->IsShrunkable() ) + anActor->SetShrinkFactor( shrink ); + } + myViewWindow->Repaint(); + } +} + +//================================================================================= +// function : onSelectionChanged() +// purpose : Called when selection is changed +//================================================================================= +void VisuGUI_ShrinkFactorDlg::onSelectionChanged() +{ + bool shrinkable = false; + if ( myViewWindow ) { + int shrink = DEFAULT_SHRINK; + + SALOME_ListIO aList; + mySelectionMgr->selectedObjects( aList ); + + if ( aList.Extent() == 1 ) { + Handle(SALOME_InteractiveObject) FirstIOS = aList.First(); + if ( !FirstIOS.IsNull() ) { + VISU_Actor* anActor = VISU::FindActor( VISU::GetAppStudy( myModule ), myViewWindow, FirstIOS->getEntry() ); + if ( anActor ) { + shrinkable = anActor->IsShrunkable(); + if ( shrinkable ) + shrink = int( anActor->GetShrinkFactor() * 100. + 0.5 ); + } + } + } + else if ( aList.Extent() > 1 ) { + SALOME_ListIteratorOfListIO It( aList ); + int setShr = -1; + for ( ; It.More(); It.Next() ) { + Handle(SALOME_InteractiveObject) IO = It.Value(); + if (!IO.IsNull()) { + VISU_Actor* anActor = VISU::FindActor( VISU::GetAppStudy( myModule ), myViewWindow, IO->getEntry() ); + if ( anActor ) { + bool lshrinkable = anActor->IsShrunkable(); + shrinkable = shrinkable || lshrinkable; + if ( lshrinkable ) { + int shr = int( anActor->GetShrinkFactor() * 100. + 0.5 ); + if ( setShr < 0 ) + setShr = shr; + else if ( setShr != shr ) { + setShr = DEFAULT_SHRINK; + break; + } + } + } + } + } + if ( setShr >= 0 ) + shrink = setShr; + } + ValueSpin->blockSignals( true ); + ValueSpin->setValue( shrink ); + ValueSpin->blockSignals( false ); + } + GroupC1->setEnabled( shrinkable ); +} + +//================================================================================= +// function : keyPressEvent() +// purpose : +//================================================================================= +void VisuGUI_ShrinkFactorDlg::keyPressEvent( QKeyEvent* e ) +{ + QDialog::keyPressEvent( e ); + if ( e->isAccepted() ) + return; + + if ( e->key() == Qt::Key_F1 ) { + e->accept(); + help(); + } +} diff --git a/src/VISUGUI/VisuGUI_ShrinkFactorDlg.h b/src/VISUGUI/VisuGUI_ShrinkFactorDlg.h new file mode 100644 index 00000000..b4bf4b55 --- /dev/null +++ b/src/VISUGUI/VisuGUI_ShrinkFactorDlg.h @@ -0,0 +1,76 @@ +// Copyright (C) 2007-2008 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 +// +// 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. +// +// 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 +// +// File : VisuGUI_ShrinkFactorDlg.h +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// + +#ifndef VISUGUI_SHRINKFACTORDLG_H +#define VISUGUI_SHRINKFACTORDLG_H + +// QT Includes +#include + +class QLabel; +class QPushButton; +class QSpinBox; +class QGroupBox; +class LightApp_SelectionMgr; +class SalomeApp_Module; +class SVTK_Selector; +class SVTK_ViewWindow; +class VisuGUI; + +//================================================================================= +// class : VisuGUI_ShrinkFactorDlg +// purpose : +//================================================================================= +class VisuGUI_ShrinkFactorDlg : public QDialog +{ + Q_OBJECT + +public: + VisuGUI_ShrinkFactorDlg( VisuGUI* = 0, + bool modal = false ); + + ~VisuGUI_ShrinkFactorDlg(); + +private: + void keyPressEvent( QKeyEvent* ); + +private : + LightApp_SelectionMgr* mySelectionMgr; + SVTK_ViewWindow* myViewWindow; + const SalomeApp_Module* myModule; + + QGroupBox* GroupC1; + QPushButton* buttonOk; + QPushButton* buttonHelp; + QLabel* ValueLab; + QSpinBox* ValueSpin; + +public slots: + void help(); + void setShrinkFactor(); + void onSelectionChanged(); +}; + +#endif // VISUGUI_SHRINKFACTORDLG_H diff --git a/src/VISU_I/VISU_Prs3d_i.cc b/src/VISU_I/VISU_Prs3d_i.cc index 7b010add..fdc4ef08 100644 --- a/src/VISU_I/VISU_Prs3d_i.cc +++ b/src/VISU_I/VISU_Prs3d_i.cc @@ -32,6 +32,7 @@ #include "VISU_Actor.h" #include "SALOME_Event.h" +#include "SUIT_ResourceMgr.h" #include #include @@ -485,6 +486,8 @@ VISU::Prs3d_i ::CreateActor(VISU_Actor* theActor) { try{ + SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr(); + Handle(SALOME_InteractiveObject) anIO = GetIO(); if(!anIO.IsNull() && anIO->hasEntry()){ theActor->setIO(anIO); @@ -494,7 +497,7 @@ VISU::Prs3d_i CheckDataSet(); theActor->SetPrs3d(this); - theActor->SetShrinkFactor(); + theActor->SetShrinkFactor(aResourceMgr->integerValue("VISU", "shrink_factor", 80)/100.); theActor->SetPosition(myOffset[0],myOffset[1],myOffset[2]); theActor->SetPipeLine(GetActorPipeLine()); if(theActor->GetPipeLine() != GetPipeLine()){ -- 2.39.2