X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI.cxx;h=04afcf817bb96d0741411c221cca89162d47bc39;hp=1688eb8bd481694a490cfacc9dfb2e0545f5eeb3;hb=4d8ffa8fc32fd66ae73171f94e8459d59b4fe01a;hpb=656c73ce33943675389576c4b17446b18d530e1e diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 1688eb8bd..04afcf817 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -92,14 +92,16 @@ #include "QtxPopupMgr.h" -#include "SalomeApp_Application.h" -#include "SalomeApp_NameDlg.h" -#include "SalomeApp_DataOwner.h" -#include "SalomeApp_ImportOperation.h" #include "SalomeApp_Tools.h" #include "SalomeApp_Study.h" +#include "SalomeApp_NameDlg.h" +#include "SalomeApp_DataOwner.h" +#include "SalomeApp_Application.h" +#include "SalomeApp_Preferences.h" #include "SalomeApp_VTKSelector.h" +#include "SalomeApp_ImportOperation.h" + #include #include @@ -165,8 +167,6 @@ namespace{ void Control( int theCommandID ); - void SetDisplaySettings(); - // Definitions //============================================================= @@ -240,6 +240,8 @@ namespace{ QObject::tr("SMESH_BUT_OK")); wc.resume(); } + + SMESHGUI::GetSMESHGUI()->updateObjBrowser(); } catch (const SALOME::SALOME_Exception& S_ex){ wc.suspend(); @@ -305,9 +307,26 @@ namespace{ SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true ); fd->setCaption( aTitle ); fd->setFilters( filters ); - fd->exec(); - aFilename = fd->selectedFile(); - aFormat = aFilterMap[fd->selectedFilter()]; + bool is_ok = false; + while(!is_ok){ + fd->exec(); + aFilename = fd->selectedFile(); + aFormat = aFilterMap[fd->selectedFilter()]; + is_ok = true; + if( !aFilename.isEmpty() + && (aMesh->NbPolygons()>0 or aMesh->NbPolyhedrons()>0) + && aFormat==SMESH::MED_V2_1){ + int aRet = SUIT_MessageBox::warn2(SMESHGUI::desktop(), + QObject::tr("SMESH_WRN_WARNING"), + QObject::tr("SMESH_EXPORT_MED_V2_1").arg(anIObject->getName()), + QObject::tr("SMESH_BUT_YES"), + QObject::tr("SMESH_BUT_NO"), + 0,1,0); + if(aRet){ + is_ok = false; + } + } + } delete fd; } if ( !aFilename.isEmpty() ) { @@ -503,53 +522,6 @@ namespace{ SMESH::RepaintCurrentView(); } } - - - void SetDisplaySettings() - { - SUIT_ResourceMgr* mgr = SMESHGUI::resourceMgr(); - if( !mgr ) - return; - - SMESHGUI::GetSMESHGUI()->EmitSignalDeactivateDialog(); - SMESHGUI_Preferences_ColorDlg *aDlg = - new SMESHGUI_Preferences_ColorDlg( SMESHGUI::GetSMESHGUI(), "" ); - - QColor color = mgr->colorValue( "SMESH", "SettingsFillColor", QColor(0, 170, 255) ); - aDlg->SetColor(1, color); - - color = mgr->colorValue( "SMESH", "SettingsOutlineColor", QColor(0, 170, 255) ); - aDlg->SetColor(2, color); - - color = mgr->colorValue( "SMESH", "SettingsNodeColor", Qt::red ); - aDlg->SetColor(3, color); - - color = mgr->colorValue( "SMESH", "SettingsBackFaceColor", Qt::blue ); - aDlg->SetColor(4, color); - - int iVal = mgr->integerValue( "SMESH", "SettingsWidth", 1 ); - aDlg->SetIntValue(1, iVal); - - iVal = mgr->integerValue( "SMESH", "SettingsNodesSize", 3 ); - aDlg->SetIntValue(2, iVal); - - iVal = mgr->integerValue( "SMESH", "SettingsShrinkCoeff", 75 ); - aDlg->SetIntValue(3, iVal); - - if (aDlg->exec()) { - mgr->setValue( "SMESH", "SettingsFillColor", aDlg->GetColor(1) ); - mgr->setValue( "SMESH", "SettingsOutlineColor", aDlg->GetColor(2) ); - mgr->setValue( "SMESH", "SettingsNodeColor", aDlg->GetColor(3) ); - mgr->setValue( "SMESH", "SettingsBackFaceColor", aDlg->GetColor(4) ); - - mgr->setValue( "SMESH", "SettingsWidth", aDlg->GetIntValue(1) ); - mgr->setValue( "SMESH", "SettingsNodesSize", aDlg->GetIntValue(2) ); - mgr->setValue( "SMESH", "SettingsShrinkCoeff", aDlg->GetIntValue(3) ); - } - - delete aDlg; - } - void Control( int theCommandID ) { @@ -772,7 +744,7 @@ namespace{ if(obj){ SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( SMESH::SObjectToObject( obj ) ); SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( SMESH::SObjectToObject( obj ) ); - + QString objType = CheckTypeObject(IObject); if ( !aGroup->_is_nil() ) { // DELETE GROUP SMESH::SMESH_Mesh_var aMesh = aGroup->GetMesh(); aMesh->RemoveGroup( aGroup ); @@ -781,6 +753,10 @@ namespace{ SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather(); aMesh->RemoveSubMesh( aSubMesh ); } + else if ( objType == "Hypothesis" || objType == "Algorithm" ) {// DELETE HYPOTHESIS + SMESH::RemoveHypothesisOrAlgorithmOnMesh(IObject); + aStudyBuilder->RemoveObjectWithChildren( obj ); + } else {// default action: remove SObject from the study // san - it's no use opening a transaction here until UNDO/REDO is provided in SMESH //SUIT_Operation *op = new SALOMEGUI_ImportOperation(myActiveStudy); @@ -802,46 +778,10 @@ namespace{ } } -//============================================================================= -/*! - * - */ -//============================================================================= -class CustomItem : public QCustomMenuItem -{ -public: - CustomItem(const QString& s, const QFont& f) : myString(s), myFont(f) {} - ~CustomItem() {} - - void paint(QPainter* p, const QColorGroup& cg, bool act, bool /*enabled*/, int x, int y, int w, int h) - { - p->save(); - p->fillRect( x, y, w, h, act ? cg.highlight() : cg.mid() ); - p->setPen( act ? cg.highlightedText() : cg.buttonText() ); - p->setFont( myFont ); - p->drawText( x, y, w, h, AlignHCenter | AlignVCenter | ShowPrefix | DontClip | SingleLine, myString ); - p->restore(); - } - - QSize sizeHint() - { - return QFontMetrics( myFont ).size( AlignHCenter | AlignVCenter | ShowPrefix | DontClip | SingleLine, myString ); - } - - bool fullSpan() const - { - return true; - } - -private: - QString myString; - QFont myFont; -}; - extern "C" { Standard_EXPORT CAM_Module* createModule() { - return SMESHGUI::GetSMESHGUI(); + return new SMESHGUI(); } } @@ -853,7 +793,7 @@ SMESH::SMESH_Gen_var SMESHGUI::myComponentSMESH = SMESH::SMESH_Gen::_nil(); */ //============================================================================= SMESHGUI::SMESHGUI() : - SalomeApp_Module( "SMESH" ) +SalomeApp_Module( "SMESH" ) { if ( CORBA::is_nil( myComponentSMESH ) ) { @@ -896,6 +836,15 @@ SalomeApp_SelectionMgr* SMESHGUI::selectionMgr() return 0; } +bool SMESHGUI::automaticUpdate() +{ + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + if ( !resMgr ) + return false; + + return resMgr->booleanValue( "SMESH", "auto_update", false ); +} + //============================================================================= /*! * @@ -913,24 +862,32 @@ SUIT_ResourceMgr* SMESHGUI::resourceMgr() //============================================================================= SMESHGUI* SMESHGUI::GetSMESHGUI() { - static SMESHGUI* aSMESHGUI = NULL; - if( !aSMESHGUI ) - aSMESHGUI = new SMESHGUI(); - - if(_PTR(Study) aStudy = SMESH::GetActiveStudyDocument()) - GetSMESHGen()->SetCurrentStudy( _CAST(Study,aStudy)->GetStudy() ); + SMESHGUI* smeshMod = 0; + SalomeApp_Application* app = dynamic_cast(SUIT_Session::session()->activeApplication()); + if ( app ) + { + CAM_Module* module = app->module( "Mesh" ); + smeshMod = dynamic_cast( module ); + } - SUIT_ResourceMgr* mgr = resourceMgr(); - if( mgr ) - /* Automatic Update flag */ - aSMESHGUI->myAutomaticUpdate = ( mgr->stringValue( "SMESH", "AutomaticUpdate" ).compare( "true" ) == 0 ); + if ( smeshMod && smeshMod->application() && smeshMod->application()->activeStudy() ) + { + SalomeApp_Study* study = dynamic_cast( smeshMod->application()->activeStudy() ); + if ( study ) + { + _PTR(Study) aStudy = study->studyDS(); + if ( aStudy ) + GetSMESHGen()->SetCurrentStudy( _CAST(Study,aStudy)->GetStudy() ); + } + } - return aSMESHGUI; + return smeshMod; } extern "C" { - Standard_EXPORT SMESHGUI* GetComponentGUI() { + Standard_EXPORT SMESHGUI* GetComponentGUI() + { return SMESHGUI::GetSMESHGUI(); } } @@ -1334,8 +1291,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) } CORBA::Long anId = aStudy->StudyId(); TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,IObject->getEntry()); - cout<<"myAutomaticUpdate - "<Update(); SMESH_Actor* anActor = SMESH::FindActorByEntry(IObject->getEntry()); if(!anActor){ @@ -1352,6 +1308,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } + updateObjBrowser(); break; } @@ -1623,6 +1580,13 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 803: // EDIT GROUP { + if ( !vtkwnd ) + { + SUIT_MessageBox::warn1( desktop(), tr( "SMESH_WRN_WARNING" ), + tr( "NOT_A_VTK_VIEWER" ),tr( "SMESH_BUT_OK" ) ); + break; + } + if(checkLock(aStudy)) break; EmitSignalDeactivateDialog(); @@ -1675,6 +1639,13 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 811: // Intersect groups case 812: // Cut groups { + if ( !vtkwnd ) + { + SUIT_MessageBox::warn1( desktop(), tr( "SMESH_WRN_WARNING" ), + tr( "NOT_A_VTK_VIEWER" ),tr( "SMESH_BUT_OK" ) ); + break; + } + if ( checkLock( aStudy ) ) break; @@ -1691,6 +1662,13 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 813: // Delete groups with their contents { + if ( !vtkwnd ) + { + SUIT_MessageBox::warn1( desktop(), tr( "SMESH_WRN_WARNING" ), + tr( "NOT_A_VTK_VIEWER" ),tr( "SMESH_BUT_OK" ) ); + break; + } + if ( checkLock( aStudy ) ) break; @@ -1749,120 +1727,6 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) break; } - case 1001: // AUTOMATIC UPDATE PREFERENCES - { - if (act->isOn()) { - mgr->setValue( "SMESH", "AutomaticUpdate", true ); - myAutomaticUpdate = true; - } - else { - mgr->setValue( "SMESH", "AutomaticUpdate", false ); - myAutomaticUpdate = false; - } - break; - } - - case 1003: // MESH PREFERENCES - { - ::SetDisplaySettings(); - break; - } - - case 1005: - { - SMESHGUI_Preferences_ScalarBarDlg::ScalarBarPreferences( this ); - break; - } - - case 10070: - { - ( new SMESHGUI_PrecisionDlg( this ) )->exec(); - break; - } - - case 10071: - { - if (act->isOn()) { - mgr->setValue( "SMESH", "DispayEntity", true ); - } - else { - mgr->setValue( "SMESH", "DispayEntity", false ); - } - break; - } - case 1006: - { - SMESHGUI_Preferences_SelectionDlg* aDlg = - new SMESHGUI_Preferences_SelectionDlg( this ); - - QColor aColor = mgr->colorValue( "SMESH", "SettingsPreSelectColor", Qt::cyan ); - aDlg->SetColor(1, aColor); - - aColor = mgr->colorValue( "SMESH", "SettingsItemSelectColor", Qt::yellow ); - aDlg->SetColor(2, aColor); - - aColor = mgr->colorValue( "SMESH", "SettingsSelectColor", Qt::white ); - aDlg->SetColor(3, aColor); - - aDlg->SetWidth(1, mgr->integerValue( "SMESH", "SettingsPreSelectWidth", 5 ) ); - aDlg->SetWidth(2, mgr->integerValue( "SMESH", "SettingsItemSelectWidth", 5 ) ); - aDlg->SetPrecision(1, mgr->doubleValue( "SMESH", "SettingsNodeSelectTol", 0.025 ) ); - aDlg->SetPrecision(2, mgr->doubleValue( "SMESH", "SettingsElementsSelectTol", 0.001 ) ); - - if (aDlg->exec()) { - QColor aPreColor = aDlg->GetColor(1), - aSelColor = aDlg->GetColor(2), - aHiColor = aDlg->GetColor(3); - int aPreWidth = aDlg->GetWidth(1), - aSelWidth = aDlg->GetWidth(2); - double aTolNodes = aDlg->GetPrecision(1), - aTolItems = aDlg->GetPrecision(2); - - mgr->setValue( "SMESH", "SettingsPreSelectColor", aPreColor ); - mgr->setValue( "SMESH", "SettingsItemSelectColor", aSelColor ); - mgr->setValue( "SMESH", "SettingsSelectColor", aHiColor ); - - mgr->setValue( "SMESH", "SettingsPreSelectWidth", aPreWidth ); - mgr->setValue( "SMESH", "SettingsItemSelectWidth", aSelWidth ); - mgr->setValue( "SMESH", "SettingsNodeSelectTol", aTolNodes ); - mgr->setValue( "SMESH", "SettingsElementsSelectTol", aTolItems ); - - // update current study settings - SMESH::UpdateSelectionProp( this ); - - if( vtkwnd ) { - // update VTK viewer properties - SVTK_RenderWindowInteractor* anInteractor = - dynamic_cast( vtkwnd->getRWInteractor() ); - if (anInteractor) { - anInteractor->SetSelectionProp(aSelColor.red()/255., aSelColor.green()/255., - aSelColor.blue()/255., aSelWidth); - anInteractor->SetSelectionTolerance(aTolNodes, aTolItems); - SVTK_InteractorStyle* aStyle = - dynamic_cast( anInteractor->GetInteractorStyle() ); - - if (aStyle) - aStyle->setPreselectionProp(aPreColor.red()/255., aPreColor.green()/255., - aPreColor.blue()/255., aPreWidth); - } - // update actors - vtkRenderer* aRenderer = vtkwnd->getRenderer(); - vtkActorCollection *aCollection = aRenderer->GetActors(); - aCollection->InitTraversal(); - while(vtkActor *anAct = aCollection->GetNextActor()){ - if(SMESH_Actor *anActor = dynamic_cast(anAct)){ - anActor->SetHighlightColor(aHiColor.red()/255., aHiColor.green()/255., - aHiColor.blue()/255.); - anActor->SetPreHighlightColor(aPreColor.red()/255., aPreColor.green()/255., - aPreColor.blue()/255.); - } - } - } - } - - break; - } - case 1100: // EDIT HYPOTHESIS { if(checkLock(aStudy)) break; @@ -1894,6 +1758,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) } } } + updateObjBrowser( true ); break; } @@ -2243,43 +2108,8 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) } break; } - case 10001: // DISPLAY MODE PREFERENCE - { - // Wireframe - act->setOn( true ); - action( 10002 )->setOn( false ); - action( 10004 )->setOn( false ); - action( 10003 )->setOn( true ); - mgr->setValue( "SMESH", "DisplayMode", "Wireframe"); - break; - } - case 10002: - { - act->setOn( true ); - action( 10001 )->setOn( false ); - action( 10004 )->setOn( false ); - action( 10003 )->setOn( true ); - mgr->setValue( "SMESH", "DisplayMode", "Shading"); - break; - } - case 10003: - { - mgr->setValue( "SMESH", "Shrink", act->isOn() ); - break; - } - case 10004: - { - act->setOn( true ); - action( 10001 )->setOn( false ); - action( 10002 )->setOn( false ); - action( 10003 )->setOn( false ); - mgr->setValue( "SMESH", "DisplayMode", "Nodes" ); - break; - } - } - - updateObjBrowser(); + //updateObjBrowser(); return true; } @@ -2313,81 +2143,6 @@ bool SMESHGUI::OnKeyPress( QKeyEvent * pe, SUIT_ViewWindow * wnd ) return true; } -//============================================================================= -/*! - * - */ -//============================================================================= -bool SMESHGUI::SetSettings(SUIT_Desktop* parent) -{ - SMESHGUI::GetSMESHGUI(); - - SUIT_ResourceMgr* mgr = resourceMgr(); - if( !mgr ) - return false; - - // Display mode - QString DisplayMode = "Shading"; - if ( mgr->hasValue("SMESH","DisplayMode") ) - DisplayMode = mgr->stringValue("SMESH","DisplayMode"); - else - mgr->setValue("SMESH","DisplayMode", "Shading"); - - bool Shrink = false; - if ( mgr->hasValue("SMESH","Shrink") ) - Shrink = mgr->stringValue("SMESH","Shrink") == "yes"; - - if (DisplayMode == "Wireframe") { - // wireframe - action( 10004 )->setOn( false ); - action( 10002 )->setOn( false ); - action( 10001 )->setOn( true ); - action( 10003 )->setOn( true ); - } - else if (DisplayMode == "Nodes") { - // poins - action( 10004 )->setOn( true ); - action( 10002 )->setOn( false ); - action( 10001 )->setOn( false ); - action( 10003 )->setOn( false ); - } - else { - // default is shading - action( 10004 )->setOn( false ); - action( 10002 )->setOn( true ); - action( 10001 )->setOn( false ); - action( 10003 )->setOn( true ); - } - - action( 10003 )->setOn( Shrink ); - - // Automatic Update - if ( mgr->booleanValue( "SMESH","AutomaticUpdate", false ) ) { - action( 1001 )->setOn( true ); - myAutomaticUpdate = true; - } - else { - action( 1001 )->setOn( false ); - myAutomaticUpdate = false; - } - - if ( mgr->booleanValue( "SMESH","DispayEntity", false ) ) - action( 10071 )->setOn( true ); - else - action( 10071 )->setOn( false ); - - // Selection - SMESH::UpdateSelectionProp( this ); - - // menus disable - action( 111 )->setEnabled( false ); // IMPORT DAT - - //action( 112 )->setEnabled( false ); - //parent->menuBar()->setItemEnabled(112, false); // IMPORT UNV - - return true; -} - //============================================================================= /*! Method: BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO) * Purpose: ensures that the actor for the given exists in the active VTK view @@ -2415,7 +2170,7 @@ void SMESHGUI::createSMESHAction( const int id, const QString& po_id, const QStr if ( icon_id.length() ) pix = resMgr->loadPixmap( "SMESH", tr( icon_id ) ); else - pix = resMgr->loadPixmap( "SMESH", tr( QString( "ICO_" )+po_id ) ); + pix = resMgr->loadPixmap( "SMESH", tr( QString( "ICO_" )+po_id ), false ); if ( !pix.isNull() ) icon = QIconSet( pix ); @@ -2466,6 +2221,11 @@ void SMESHGUI::initialize( CAM_Application* app ) { SalomeApp_Module::initialize( app ); +// SUIT_ResourceMgr* mgr = app->resourceMgr(); +// if ( mgr ) + /* Automatic Update flag */ +// myAutomaticUpdate = mgr->booleanValue( "SMESH", "AutomaticUpdate", myAutomaticUpdate ); + // ----- create actions -------------- createSMESHAction( 111, "DAT", "", (CTRL+Key_B) ); @@ -2539,16 +2299,6 @@ void SMESHGUI::initialize( CAM_Application* app ) createSMESHAction( 414, "REVOLUTION", "ICON_REVOLUTION" ); createSMESHAction( 415, "MAP", "ICON_MAP" ); createSMESHAction( 416, "EXTRUSION_ALONG", "ICON_EXTRUSION_ALONG" ); - createSMESHAction( 10001, "WIRE", "ICON_WIRE", 0, true ); - createSMESHAction( 10002, "SHADE", "ICON_SHADE", 0, true ); - createSMESHAction( 10003, "SHRINK", "ICON_SHRINK", 0, true ); - createSMESHAction( 10004, "NODES", "ICON_POINTS", 0, true ); - createSMESHAction( 1001, "AUTO_UPD", "", 0, true ); - createSMESHAction( 1003, "COLORS" ); - createSMESHAction( 1005, "SCALAR_BAR" ); - createSMESHAction( 1006, "SELECTION" ); - createSMESHAction( 10070, "PRECISION", "", 0, true ); - createSMESHAction( 10071, "DISP_ENT", "", 0, true ); createSMESHAction( 200, "RESET" ); createSMESHAction( 201, "SCALAR_BAR_PROP" ); createSMESHAction( 211, "WIRE", "ICON_WIRE", 0, true ); @@ -2584,23 +2334,16 @@ void SMESHGUI::initialize( CAM_Application* app ) meshId = createMenu( tr( "MEN_MESH" ), -1, 70, 10 ), ctrlId = createMenu( tr( "MEN_CTRL" ), -1, 60, 10 ), modifyId = createMenu( tr( "MEN_MODIFY" ), -1, 40, 10 ), - prefId = createMenu( tr( "MEN_PREF" ), -1, 4, 10 ), viewId = createMenu( tr( "MEN_VIEW" ), -1, 2 ); createMenu( separator(), fileId ); int importId = createMenu( tr( "MEN_IMPORT" ), fileId, 11, 10 ), exportId = createMenu( tr( "MEN_EXPORT" ), fileId, 12, 10 ), - addId = createMenu( tr( "MEN_ADD" ), modifyId, 402 ), removeId = createMenu( tr( "MEN_REMOVE" ), modifyId, 403 ), renumId = createMenu( tr( "MEN_RENUM" ), modifyId, 404 ), - transfId = createMenu( tr( "MEN_TRANSF" ), modifyId, 405 ), - - meshPrefId = createMenu( tr( "MEN_MESH" ), prefId, 100 ), - - dispModeId = createMenu( tr( "MEN_DISPMODE" ), meshPrefId, 1000 ), - qualityId = createMenu( tr( "MEN_QUALITY" ), meshPrefId, 1007 ); + transfId = createMenu( tr( "MEN_TRANSF" ), modifyId, 405 ); createMenu( 111, importId, -1 ); createMenu( 112, importId, -1 ); @@ -2689,25 +2432,6 @@ void SMESHGUI::initialize( CAM_Application* app ) createMenu( 414, modifyId, -1 ); createMenu( 415, modifyId, -1 ); - createMenu( 10001, dispModeId, -1 ); - createMenu( 10002, dispModeId, -1 ); - createMenu( 10004, dispModeId, -1 ); - createMenu( 10003, dispModeId, -1 ); - - createMenu( 1001, prefId, -1 ); - createMenu( separator(), prefId, -1 ); - createMenu( 1003, prefId, -1 ); - createMenu( separator(), prefId, -1 ); - createMenu( 1005, prefId, -1 ); - createMenu( separator(), prefId, -1 ); - createMenu( 1006, prefId, -1 ); - createMenu( separator(), prefId, -1 ); - - createMenu( 10070, qualityId, -1 ); - createMenu( 10071, qualityId, -1 ); - - createMenu( separator(), prefId, -1 ); - createMenu( 214, viewId, -1 ); // ----- create toolbars -------------- @@ -2864,13 +2588,13 @@ void SMESHGUI::initialize( CAM_Application* app ) // Numbering //------------------------------------------------- anId = popupMgr()->insert( tr( "MEN_NUM" ), -1, -1 ); - + popupMgr()->insert( action( 9010 ), anId, -1 ); - popupMgr()->setRule( action( 9010 ), aMeshInVTK + "&&" + hasNodes, true ); + popupMgr()->setRule( action( 9010 ), aMeshInVTK + "&& isVisible &&" + hasNodes, true );//@ popupMgr()->setRule( action( 9010 ), "{'Point'} in labeledTypes", false ); popupMgr()->insert( action( 9011 ), anId, -1 ); - popupMgr()->setRule( action( 9011 ), aMeshInVTK + "&&" + hasElems, true ); + popupMgr()->setRule( action( 9011 ), aMeshInVTK + "&& isVisible &&" + hasElems, true ); popupMgr()->setRule( action( 9011 ), "{'Cell'} in labeledTypes", false ); popupMgr()->insert( separator(), -1, -1 ); @@ -2906,21 +2630,21 @@ void SMESHGUI::initialize( CAM_Application* app ) anId = popupMgr()->insert( tr( "MEN_DISP_ENT" ), -1, -1 ); popupMgr()->insert( action( 217 ), anId, -1 ); // EDGES - popupMgr()->setRule( action( 217 ), aDiffElemsInVTK + "&&" + hasEdges, true ); + popupMgr()->setRule( action( 217 ), aDiffElemsInVTK + "&& isVisible &&" + hasEdges, true ); popupMgr()->setRule( action( 217 ), "{'Edge'} in entityMode", false ); popupMgr()->insert( action( 218 ), anId, -1 ); // FACES - popupMgr()->setRule( action( 218 ), aDiffElemsInVTK + "&&" + hasFaces, true ); + popupMgr()->setRule( action( 218 ), aDiffElemsInVTK + "&& isVisible &&" + hasFaces, true ); popupMgr()->setRule( action( 218 ), "{'Face'} in entityMode", false ); popupMgr()->insert( action( 219 ), anId, -1 ); // VOLUMES - popupMgr()->setRule( action( 219 ), aDiffElemsInVTK + "&&" + hasVolumes, true ); + popupMgr()->setRule( action( 219 ), aDiffElemsInVTK + "&& isVisible &&" + hasVolumes, true ); popupMgr()->setRule( action( 219 ), "{'Volume'} in entityMode", false ); popupMgr()->insert( separator(), anId, -1 ); popupMgr()->insert( action( 220 ), anId, -1 ); // ALL - popupMgr()->setRule( action( 220 ), aDiffElemsInVTK + "&& not( elemTypes in entityMode )", true ); + popupMgr()->setRule( action( 220 ), aDiffElemsInVTK + "&& isVisible && not( elemTypes in entityMode )", true ); //------------------------------------------------- // Color / Size @@ -3024,7 +2748,8 @@ void SMESHGUI::initialize( CAM_Application* app ) // Display / Erase //------------------------------------------------- aClient = "($client in {'VTKViewer' 'ObjectBrowser'})"; - QString aRule = aClient + " and " + aType + " and " + aSelCount; + QString anActiveVTK = QString("activeView = '%1'").arg(VTKViewer_Viewer::Type()); + QString aRule = aClient + " and " + aType + " and " + aSelCount + " and " + anActiveVTK; popupMgr()->insert( action( 301 ), -1, -1 ); // DISPLAY popupMgr()->setRule( action( 301 ), aRule + "&&" + isNotEmpty + "&&" + isInvisible, true); @@ -3046,7 +2771,6 @@ bool SMESHGUI::activateModule( SUIT_Study* study ) setMenuShown( true ); setToolShown( true ); - SetSettings( desktop() ); return res; } @@ -3073,6 +2797,11 @@ void SMESHGUI::OnGUIEvent() SMESH::SMESH_Gen_var SMESHGUI::GetSMESHGen() { + if ( CORBA::is_nil( myComponentSMESH ) ) + { + SMESHGUI aGUI; //SRN BugID: IPAL9186: Create an instance of SMESHGUI to initialize myComponentSMESH + return aGUI.myComponentSMESH; + } return myComponentSMESH; } @@ -3103,6 +2832,165 @@ void SMESHGUI::viewManagers( QStringList& list ) const void SMESHGUI::onViewManagerAdded( SUIT_ViewManager* mgr ) { - if( dynamic_cast( mgr ) ) + if ( dynamic_cast( mgr ) ) SMESH::UpdateSelectionProp( this ); } + +void SMESHGUI::createPreferences() +{ + int genTab = addPreference( tr( "PREF_TAB_GENERAL" ) ); + + int qaGroup = addPreference( tr( "PREF_GROUP_QUALITY" ), genTab ); + addPreference( tr( "PREF_DISPLAY_ENTITY" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "display_entity" ); + addPreference( tr( "PREF_AUTO_UPDATE" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "auto_update" ); + + int precGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), genTab ); + setPreferenceProperty( precGroup, "columns", 1 ); + + addPreference( tr( "PREF_PRECISION_USE" ), precGroup, SalomeApp_Preferences::Bool ); + int prec = addPreference( tr( "PREF_PRECISION_VALUE" ), precGroup, SalomeApp_Preferences::IntSpin, "SMESH", "controls_precision" ); + + setPreferenceProperty( prec, "min", 0 ); + setPreferenceProperty( prec, "max", 16 ); + + int dispgroup = addPreference( tr( "PREF_DISPLAY_MODE" ), genTab ); + int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), dispgroup, SalomeApp_Preferences::Selector, "SMESH", "display_mode" ); + QStringList modes; + modes.append( "Wireframe" ); + modes.append( "Shading" ); + modes.append( "Shrink" ); + modes.append( "Nodes" ); + setPreferenceProperty( dispmode, "strings", modes ); + + int meshTab = addPreference( tr( "PREF_TAB_MESH" ) ); + int nodeGroup = addPreference( tr( "PREF_GROUP_NODES" ), meshTab ); + + addPreference( tr( "PREF_COLOR" ), nodeGroup, SalomeApp_Preferences::Color, "SMESH", "node_color" ); + int nodeSz = addPreference( tr( "PREF_SIZE" ), nodeGroup, SalomeApp_Preferences::IntSpin, "SMESH", "node_size" ); + + setPreferenceProperty( nodeSz, "min", 1 ); + setPreferenceProperty( nodeSz, "max", 5 ); + + int elemGroup = addPreference( tr( "PREF_GROUP_ELEMENTS" ), meshTab ); + + addPreference( tr( "PREF_FILL" ), elemGroup, SalomeApp_Preferences::Color, "SMESH", "fill_color" ); + addPreference( tr( "PREF_OUTLINE" ), elemGroup, SalomeApp_Preferences::Color, "SMESH", "outline_color" ); + addPreference( tr( "PREF_BACKFACE" ), elemGroup, SalomeApp_Preferences::Color, "SMESH", "backface_color" ); + addPreference( "", elemGroup, SalomeApp_Preferences::Space ); + + int elemW = addPreference( tr( "PREF_WIDTH" ), elemGroup, SalomeApp_Preferences::IntSpin, "SMESH", "element_width" ); + int shrink = addPreference( tr( "PREF_SHRINK_COEFF" ), elemGroup, SalomeApp_Preferences::IntSpin, "SMESH", "shrink_coeff" ); + + setPreferenceProperty( elemW, "min", 1 ); + setPreferenceProperty( elemW, "max", 5 ); + + setPreferenceProperty( shrink, "min", 0 ); + setPreferenceProperty( shrink, "max", 100 ); + + int selTab = addPreference( tr( "PREF_TAB_SELECTION" ) ); + + int selGroup = addPreference( tr( "PREF_GROUP_SELECTION" ), selTab ); + + addPreference( tr( "PREF_OBJECT_COLOR" ), selGroup, SalomeApp_Preferences::Color, "SMESH", "selection_object_color" ); + addPreference( tr( "PREF_ELEMENT_COLOR" ), selGroup, SalomeApp_Preferences::Color, "SMESH", "selection_element_color" ); + int selW = addPreference( tr( "PREF_WIDTH" ), selGroup, SalomeApp_Preferences::IntSpin, "SMESH", "selection_width" ); + + setPreferenceProperty( selW, "min", 1 ); + setPreferenceProperty( selW, "max", 5 ); + + int preGroup = addPreference( tr( "PREF_GROUP_PRESELECTION" ), selTab ); + + addPreference( tr( "PREF_HIGHLIGHT_COLOR" ), preGroup, SalomeApp_Preferences::Color, "SMESH", "highlight_color" ); + int preW = addPreference( tr( "PREF_WIDTH" ), preGroup, SalomeApp_Preferences::IntSpin, "SMESH", "highlight_width" ); + + setPreferenceProperty( preW, "min", 1 ); + setPreferenceProperty( preW, "max", 5 ); + + int precSelGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), selTab ); + + addPreference( tr( "PREF_NODES" ), precSelGroup, SalomeApp_Preferences::Double, "SMESH", "selection_precision_node" ); + addPreference( tr( "PREF_ELEMENTS" ), precSelGroup, SalomeApp_Preferences::Double, "SMESH", "selection_precision_element" ); + + int sbarTab = addPreference( tr( "SMESH_SCALARBAR" ) ); + int fontGr = addPreference( tr( "SMESH_FONT_SCALARBAR" ), sbarTab ); + + int tfont = addPreference( tr( "SMESH_TITLE" ), fontGr, SalomeApp_Preferences::Font, "SMESH", "scalar_bar_title_font" ); + addPreference( tr( "SMESH_TITLE" ), fontGr, SalomeApp_Preferences::Color, "SMESH", "scalar_bar_title_color" ); + int lfont = addPreference( tr( "SMESH_LABELS" ), fontGr, SalomeApp_Preferences::Font, "SMESH", "scalar_bar_label_font" ); + addPreference( tr( "SMESH_LABELS" ), fontGr, SalomeApp_Preferences::Color, "SMESH", "scalar_bar_label_color" ); + + QStringList fam; + fam.append( tr( "SMESH_FONT_ARIAL" ) ); + fam.append( tr( "SMESH_FONT_COURIER" ) ); + fam.append( tr( "SMESH_FONT_TIMES" ) ); + int wflag = ( QtxListResourceEdit::FontItem::All & ( ~( QtxListResourceEdit::FontItem::Size | QtxListResourceEdit::FontItem::UserSize ) ) ); + + setPreferenceProperty( tfont, "families", fam ); + setPreferenceProperty( tfont, "system", false ); + setPreferenceProperty( tfont, "widget_flags", wflag ); + setPreferenceProperty( lfont, "families", fam ); + setPreferenceProperty( lfont, "system", false ); + setPreferenceProperty( lfont, "widget_flags", wflag ); + + int colorsLabelsGr = addPreference( tr( "SMESH_LABELS_COLORS_SCALARBAR" ), sbarTab ); + + int numcol = addPreference( tr( "SMESH_NUMBEROFCOLORS" ), colorsLabelsGr, SalomeApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_colors" ); + setPreferenceProperty( numcol, "min", 2 ); + setPreferenceProperty( numcol, "max", 256 ); + + int numlab = addPreference( tr( "SMESH_NUMBEROFLABELS" ), colorsLabelsGr, SalomeApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_labels" ); + setPreferenceProperty( numlab, "min", 2 ); + setPreferenceProperty( numlab, "max", 65 ); + + int orientGr = addPreference( tr( "SMESH_ORIENTATION" ), sbarTab ); + int orient = addPreference( tr( "SMESH_ORIENTATION" ), orientGr, SalomeApp_Preferences::Selector, "SMESH", "scalar_bar_orientation" ); + QStringList orients; + orients.append( tr( "SMESH_VERTICAL" ) ); + orients.append( tr( "SMESH_HORIZONTAL" ) ); + QValueList indices; indices.append( 0 ); indices.append( 1 ); + setPreferenceProperty( orient, "strings", orients ); + setPreferenceProperty( orient, "indexes", indices ); + + int posVSizeGr = addPreference( tr( "SMESH_POSITION_SIZE_SCALARBAR" ) + " " + tr( "SMESH_VERTICAL" ), sbarTab ); + int xv = addPreference( tr( "SMESH_X_SCALARBAR" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_x" ); + int yv = addPreference( tr( "SMESH_Y_SCALARBAR" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_y" ); + int wv = addPreference( tr( "SMESH_WIDTH" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_width" ); + int hv = addPreference( tr( "SMESH_HEIGHT" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_height" ); + setPreferenceProperty( xv, "step", 0.1 ); + setPreferenceProperty( xv, "min", 0.0 ); + setPreferenceProperty( xv, "max", 1.0 ); + setPreferenceProperty( yv, "step", 0.1 ); + setPreferenceProperty( yv, "min", 0.0 ); + setPreferenceProperty( yv, "max", 1.0 ); + setPreferenceProperty( wv, "step", 0.1 ); + setPreferenceProperty( wv, "min", 0.0 ); + setPreferenceProperty( wv, "max", 1.0 ); + setPreferenceProperty( hv, "min", 0.0 ); + setPreferenceProperty( hv, "max", 1.0 ); + setPreferenceProperty( hv, "step", 0.1 ); + + int posHSizeGr = addPreference( tr( "SMESH_POSITION_SIZE_SCALARBAR" ) + " " + tr( "SMESH_HORIZONTAL" ), sbarTab ); + int xh = addPreference( tr( "SMESH_X_SCALARBAR" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_x" ); + int yh = addPreference( tr( "SMESH_Y_SCALARBAR" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_y" ); + int wh = addPreference( tr( "SMESH_WIDTH" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_width" ); + int hh = addPreference( tr( "SMESH_HEIGHT" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_height" ); + setPreferenceProperty( xv, "min", 0.0 ); + setPreferenceProperty( xv, "max", 1.0 ); + setPreferenceProperty( xv, "step", 0.1 ); + setPreferenceProperty( xh, "min", 0.0 ); + setPreferenceProperty( xh, "max", 1.0 ); + setPreferenceProperty( xh, "step", 0.1 ); + setPreferenceProperty( yh, "min", 0.0 ); + setPreferenceProperty( yh, "max", 1.0 ); + setPreferenceProperty( yh, "step", 0.1 ); + setPreferenceProperty( wh, "min", 0.0 ); + setPreferenceProperty( wh, "max", 1.0 ); + setPreferenceProperty( wh, "step", 0.1 ); + setPreferenceProperty( hh, "min", 0.0 ); + setPreferenceProperty( hh, "max", 1.0 ); + setPreferenceProperty( hh, "step", 0.1 ); +} + +void SMESHGUI::preferencesChanged( const QString& sect, const QString& name ) +{ +}