X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI.cxx;h=15c9c94cd0a115e8c17fa15033683bc03df3553e;hp=62bc9ff883ea4abe8f989060ab84d78dde95fd07;hb=4fe88e90a7950c1374379297242d9ad57126084f;hpb=b73a5f27ba8842adfaccb96af928745a2db32acc diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 62bc9ff88..15c9c94cd 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -1,22 +1,22 @@ // SMESH SMESHGUI : GUI for SMESH component // // Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// +// 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. +// 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 +// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org // // File : SMESHGUI.cxx @@ -25,8 +25,7 @@ // $Header$ #include "SMESHGUI.h" -#include "SMESHGUI_InitMeshDlg.h" -#include "SMESHGUI_AddSubMeshDlg.h" + #include "SMESHGUI_NodesDlg.h" #include "SMESHGUI_TransparencyDlg.h" #include "SMESHGUI_ClippingDlg.h" @@ -39,7 +38,6 @@ #include "SMESHGUI_Preferences_ScalarBarDlg.h" #include "SMESHGUI_Preferences_SelectionDlg.h" #include "SMESHGUI_Hypotheses.h" -#include "SMESHGUI_HypothesesUtils.h" #include "SMESHGUI_MoveNodesDlg.h" #include "SMESHGUI_AddMeshElementDlg.h" #include "SMESHGUI_EditHypothesesDlg.h" @@ -60,18 +58,47 @@ #include "SMESHGUI_SymmetryDlg.h" #include "SMESHGUI_SewingDlg.h" #include "SMESHGUI_MergeNodesDlg.h" +#include "SMESHGUI_EditMeshDlg.h" #include "SMESHGUI_MeshPatternDlg.h" #include "SMESHGUI_PrecisionDlg.h" #include "SMESHGUI_Selection.h" #include "SMESHGUI_CreatePolyhedralVolumeDlg.h" +#include "SMESHGUI_MeshOp.h" +#include "SMESHGUI_Displayer.h" -#include -#include +#include "SMESHGUI_Utils.h" +#include "SMESHGUI_GEOMGenUtils.h" +#include "SMESHGUI_MeshUtils.h" +#include "SMESHGUI_GroupUtils.h" +#include "SMESHGUI_FilterUtils.h" +#include "SMESHGUI_PatternUtils.h" +#include "SMESHGUI_VTKUtils.h" +#include "SMESHGUI_HypothesesUtils.h" #include "SMESH_Actor.h" #include "SMESH_Object.h" #include "SMESH_TypeFilter.hxx" +#include "SalomeApp_Tools.h" +#include "SalomeApp_Study.h" +#include "LightApp_NameDlg.h" +#include "LightApp_DataOwner.h" +#include "SalomeApp_Application.h" +#include "LightApp_Preferences.h" +#include "LightApp_VTKSelector.h" +#include "LightApp_Operation.h" +#include "LightApp_UpdateFlags.h" + +#include "SalomeApp_ImportOperation.h" + +#include +#include +#include +#include +#include + +#include "OB_Browser.h" + #include "SUIT_Tools.h" #include "SUIT_MessageBox.h" #include "SUIT_ResourceMgr.h" @@ -82,63 +109,28 @@ #include "SUIT_Study.h" #include "SUIT_Session.h" -#include "SALOME_NamingService.hxx" -#include "SALOME_ListIteratorOfListIO.hxx" -#include "SALOME_InteractiveObject.hxx" -#include "SALOME_ListIO.hxx" -#include - -#include "OB_Browser.h" - #include "QtxPopupMgr.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 - -#include - -#include "SMESHGUI_Utils.h" -#include "SMESHGUI_GEOMGenUtils.h" -#include "SMESHGUI_MeshUtils.h" -#include "SMESHGUI_GroupUtils.h" -#include "SMESHGUI_FilterUtils.h" -#include "SMESHGUI_PatternUtils.h" -#include "SMESHGUI_VTKUtils.h" +#include "SALOME_ListIO.hxx" +#include "SALOME_ListIteratorOfListIO.hxx" +#include "SALOME_InteractiveObject.hxx" +#include "SALOME_NamingService.hxx" +#include "SALOME_LifeCycleCORBA.hxx" #include "SALOMEconfig.h" #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) // QT Includes #define INCLUDE_MENUITEM_DEF -#include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include #include -#include #include -#include +// BOOST Includes #include +// VTK Includes #include #include #include @@ -175,7 +167,7 @@ namespace{ { QStringList filter; string myExtension; - + if(theCommandID == 113){ filter.append(QObject::tr("MED files (*.med)")); filter.append(QObject::tr("All files (*)")); @@ -192,7 +184,6 @@ namespace{ if(!filename.isEmpty()) { SUIT_OverrideCursor wc; _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); - theComponentMesh->SetCurrentStudy( _CAST(Study,aStudy)->GetStudy() ); try { SMESH::mesh_array_var aMeshes = new SMESH::mesh_array; @@ -255,7 +246,7 @@ namespace{ void ExportMeshToFile( int theCommandID ) { - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -304,10 +295,11 @@ namespace{ QStringList filters; for ( QMap::const_iterator it = aFilterMap.begin(); it != aFilterMap.end(); ++it ) filters.push_back( it.key() ); - + SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true ); fd->setCaption( aTitle ); fd->setFilters( filters ); + fd->setSelectedFilter( QObject::tr("MED 2.2 (*.med)") ); bool is_ok = false; while(!is_ok){ fd->exec(); @@ -315,7 +307,7 @@ namespace{ aFormat = aFilterMap[fd->selectedFilter()]; is_ok = true; if( !aFilename.isEmpty() - && (aMesh->NbPolygons()>0 or aMesh->NbPolyhedrons()>0) + && (aMesh->NbPolygons()>0 or aMesh->NbPolyhedrons()>0) && aFormat==SMESH::MED_V2_1){ int aRet = SUIT_MessageBox::warn2(SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"), @@ -368,7 +360,7 @@ namespace{ } void SetDisplayEntity(int theCommandID){ - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -403,7 +395,7 @@ namespace{ } void SetDisplayMode(int theCommandID){ - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -523,10 +515,10 @@ namespace{ SMESH::RepaintCurrentView(); } } - + void Control( int theCommandID ) { - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -590,9 +582,14 @@ namespace{ aTitle = QObject::tr( "SKEW_ELEMENTS" ); aControl = SMESH_Actor::eSkew; break; + case 6009: + aTitle = QObject::tr( "SMESH_VOLUME" ); + aControl = SMESH_Actor::eVolume3D; + break; } anActor->SetControlMode(aControl); anActor->GetScalarBarActor()->SetTitle(aTitle.latin1()); + SMESH::RepaintCurrentView(); } } } @@ -609,7 +606,7 @@ namespace{ if( !theIO.IsNull() ) { entry = theIO->getEntry(); - SalomeApp_DataOwner owner( entry ); + LightApp_DataOwner owner( entry ); if ( aTypeFilter.isOk( &owner )) { theOutTypeName = theInTypeName; return true; @@ -647,7 +644,7 @@ namespace{ QString CheckHomogeneousSelection() { //SUIT_Study* aStudy = SMESH::GetActiveStudy(); - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -665,11 +662,12 @@ namespace{ return RefType; } - void OnEditDelete() + + void SMESHGUI::OnEditDelete() { // VSR 17/11/04: check if all objects selected belong to SMESH component --> start - SalomeApp_SelectionMgr* aSel = SMESHGUI::selectionMgr(); - SALOME_ListIO selected; aSel->selectedObjects( selected ); + LightApp_SelectionMgr* aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; aSel->selectedObjects( selected, QString::null, false ); QString aParentComponent = QString::null; for( SALOME_ListIteratorOfListIO anIt( selected ); anIt.More(); anIt.Next() ) @@ -713,6 +711,13 @@ namespace{ if(IObject->hasEntry()){ _PTR(SObject) SO = aStudy->FindObjectID(IObject->getEntry()); + // disable removal of "SMESH" component object + if(SO->FindAttribute(anAttr, "AttributeIOR")){ + anIOR = anAttr; + if ( !strcmp( (char*)anIOR->Value().c_str(), engineIOR().latin1() ) ) + continue; + } + /* Erase child graphical objects */ _PTR(ChildIterator) it = aStudy->NewChildIterator(SO); for(it->InitEx(true); it->More(); it->Next()){ @@ -803,12 +808,13 @@ SalomeApp_Module( "SMESH" ) myComponentSMESH = SMESH::SMESH_Gen::_narrow( comp ); } - myActiveDialogBox = 0 ; - myState = -1 ; + myActiveDialogBox = 0; + myState = -1; + myDisplayer = 0; SMESH::GetFilterManager(); SMESH::GetPattern(); - + /* load resources for all available meshers */ SMESH::InitAvailableHypotheses(); } @@ -821,6 +827,7 @@ SalomeApp_Module( "SMESH" ) SMESHGUI::~SMESHGUI() { SMESH::GetFilterManager()->Destroy(); + SMESH::GetFilterManager() = SMESH::FilterManager::_nil(); } //============================================================================= @@ -828,11 +835,11 @@ SMESHGUI::~SMESHGUI() * */ //============================================================================= -SalomeApp_SelectionMgr* SMESHGUI::selectionMgr() +LightApp_SelectionMgr* SMESHGUI::selectionMgr() { SalomeApp_Application* anApp = dynamic_cast( SUIT_Session::session()->activeApplication() ); if( anApp ) - return dynamic_cast( anApp->selectionMgr() ); + return dynamic_cast( anApp->selectionMgr() ); else return 0; } @@ -1058,12 +1065,12 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) SUIT_ViewWindow* view = application()->desktop()->activeWindow(); SVTK_ViewWindow* vtkwnd = dynamic_cast( view ); - QAction* act = action( theCommandID ); + //QAction* act = action( theCommandID ); switch (theCommandID) { case 33: // DELETE if(checkLock(aStudy)) break; - ::OnEditDelete(); + OnEditDelete(); break; case 113: // IMPORT @@ -1088,7 +1095,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 200: // SCALAR BAR { - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1135,7 +1142,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) SMESH::UpdateView(); SALOME_ListIO l; - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); aSel->setSelectedObjects( l ); break; } @@ -1145,28 +1152,72 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 302: // DISPLAY ONLY { SMESH::EDisplaing anAction; - switch(theCommandID){ + switch (theCommandID) { case 300: anAction = SMESH::eErase; break; case 301: anAction = SMESH::eDisplay; break; case 302: anAction = SMESH::eDisplayOnly; break; } - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); - SALOME_ListIO selected; - if( aSel ) - aSel->selectedObjects( selected ); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO sel_objects, to_process; + if (aSel) + aSel->selectedObjects( sel_objects ); - if ( vtkwnd ) { - SALOME_ListIteratorOfListIO It(selected); + if( theCommandID==302 ) + startOperation( myEraseAll ); + + SALOME_ListIteratorOfListIO anIt( sel_objects ); + for( ; anIt.More(); anIt.Next() ) + { + Handle( SALOME_InteractiveObject ) obj = anIt.Value(); + if( obj->hasEntry() ) + { + _PTR(SObject) SO = activeStudy()->studyDS()->FindObjectID( obj->getEntry() ); + if( SO && QString( SO->GetID().c_str() ) == SO->GetFatherComponent()->GetID().c_str() ) + { //component is selected + _PTR(SComponent) SC( SO->GetFatherComponent() ); + _PTR(ChildIterator) anIter ( activeStudy()->studyDS()->NewChildIterator( SC ) ); + anIter->InitEx( true ); + while( anIter->More() ) + { + _PTR(SObject) valSO ( anIter->Value() ); + _PTR(SObject) refSO; + if( !valSO->ReferencedObject( refSO ) ) + { + QString id = valSO->GetID().c_str(), + comp = SC->ComponentDataType().c_str(), + val = valSO->GetName().c_str(); + + Handle( SALOME_InteractiveObject ) new_obj = + new SALOME_InteractiveObject( id.latin1(), comp.latin1(), val.latin1() ); + to_process.Append( new_obj ); + } + anIter->Next(); + } + continue; + } + } + to_process.Append( obj ); + } + + if (vtkwnd) { + SALOME_ListIteratorOfListIO It( to_process ); for (; It.More(); It.Next()) { Handle(SALOME_InteractiveObject) IOS = It.Value(); if (IOS->hasEntry()) { - SMESH::UpdateView(anAction,IOS->getEntry()); + SMESH::UpdateView(anAction, IOS->getEntry()); + if (anAction == SMESH::eDisplayOnly) + anAction = SMESH::eDisplay; } } } - SALOME_ListIO l1; - aSel->setSelectedObjects( l1 ); + + if (anAction == SMESH::eErase) { + SALOME_ListIO l1; + aSel->setSelectedObjects( l1 ); + } + else + aSel->setSelectedObjects( to_process ); break; } @@ -1181,7 +1232,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) } else { SUIT_MessageBox::warn1(desktop(), - tr("SMESH_WRN_WARNING"), + tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } @@ -1215,10 +1266,11 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 701: // COMPUTE MESH { if(checkLock(aStudy)) break; - if ( vtkwnd ) { - SalomeApp_SelectionMgr *Sel = selectionMgr(); - SALOME_ListIO selected; Sel->selectedObjects( selected ); + LightApp_SelectionMgr *Sel = selectionMgr(); + SALOME_ListIO selected; Sel->selectedObjects( selected ); + + if ( vtkwnd ) { int nbSel = selected.Extent(); if (nbSel != 1){ break; @@ -1227,7 +1279,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) SMESH::SMESH_Mesh_var aMesh; SMESH::SMESH_subMesh_var aSubMesh; Handle(SALOME_InteractiveObject) IObject = selected.First(); - if (IObject->hasEntry()){ + if (IObject->hasEntry()) { _PTR(SObject) aMeshSObj = aStudy->FindObjectID(IObject->getEntry()); GEOM::GEOM_Object_var aShapeObject = SMESH::GetShapeOnMeshOrSubMesh( aMeshSObj ); if ( aShapeObject->_is_nil() ) { @@ -1235,131 +1287,76 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) break; } if( aMeshSObj ) { - SMESH::SMESH_Mesh_var aMesh = SMESH::SObjectToInterface(aMeshSObj); - SMESH::SMESH_subMesh_var aSubMesh = SMESH::SObjectToInterface(aMeshSObj); - - if (!aMesh->_is_nil()){ - GEOM::GEOM_Object_var refShapeObject = SMESH::GetShapeOnMeshOrSubMesh(aMeshSObj); - if (!refShapeObject->_is_nil()) { - if(!GetSMESHGen()->IsReadyToCompute(aMesh,refShapeObject)){ - SUIT_MessageBox::warn1(desktop(), - tr("SMESH_WRN_WARNING"), - tr("SMESH_WRN_MISSING_PARAMETERS"), - tr("SMESH_BUT_OK")); - break; - } - try{ - if (GetSMESHGen()->Compute(aMesh,refShapeObject)) - SMESH::ModifiedMesh(aMeshSObj,true); - // TO Do : change icon of all submeshes - else - SUIT_MessageBox::warn1(desktop(), - tr("SMESH_WRN_WARNING"), - tr("SMESH_WRN_COMPUTE_FAILED"), - tr("SMESH_BUT_OK")); - } - catch(const SALOME::SALOME_Exception & S_ex){ - SalomeApp_Tools::QtCatchCorbaException(S_ex); - } - } - }else if(!aSubMesh->_is_nil()){ + aMesh = SMESH::SObjectToInterface(aMeshSObj); + aSubMesh = SMESH::SObjectToInterface(aMeshSObj); + if ( !aSubMesh->_is_nil() ) aMesh = aSubMesh->GetFather(); - GEOM::GEOM_Object_var refShapeObject = SMESH::GetShapeOnMeshOrSubMesh(aMeshSObj); - if(!refShapeObject->_is_nil()){ - bool compute = GetSMESHGen()->IsReadyToCompute(aMesh,refShapeObject); - if(!compute){ - SUIT_MessageBox::warn1(desktop(), - tr("SMESH_WRN_WARNING"), - tr("SMESH_WRN_MISSING_PARAMETERS"), - tr("SMESH_BUT_OK")); - break; - } - try{ - if ( GetSMESHGen()->Compute(aMesh,refShapeObject) ) - SMESH::ModifiedMesh(aMeshSObj,true); - // TO Do : change icon of all submeshes - else - SUIT_MessageBox::warn1(desktop(), - tr("SMESH_WRN_WARNING"), - tr("SMESH_WRN_COMPUTE_FAILED"), - tr("SMESH_BUT_OK")); - }catch(const SALOME::SALOME_Exception & S_ex){ - SalomeApp_Tools::QtCatchCorbaException(S_ex); - } - } - } + + if (!aMesh->_is_nil()) { +// if(!GetSMESHGen()->IsReadyToCompute(aMesh,aShapeObject)) { +// SUIT_MessageBox::warn1(desktop(), +// tr("SMESH_WRN_WARNING"), +// tr("SMESH_WRN_MISSING_PARAMETERS"), +// tr("SMESH_BUT_OK")); +// break; +// } + SMESH::algo_error_array_var errors = GetSMESHGen()->GetAlgoState(aMesh,aShapeObject); + if ( errors->length() > 0 ) { + SUIT_MessageBox::warn1(desktop(), + tr("SMESH_WRN_WARNING"), + SMESH::GetMessageOnAlgoStateErrors( errors.in() ), + tr("SMESH_BUT_OK")); + break; + } + try{ + if (GetSMESHGen()->Compute(aMesh,aShapeObject)) + SMESH::ModifiedMesh(aMeshSObj,true); + else + SUIT_MessageBox::warn1(desktop(), + tr("SMESH_WRN_WARNING"), + tr("SMESH_WRN_COMPUTE_FAILED"), + tr("SMESH_BUT_OK")); + } + catch(const SALOME::SALOME_Exception & S_ex){ + SalomeApp_Tools::QtCatchCorbaException(S_ex); + } + } } } - CORBA::Long anId = aStudy->StudyId(); - TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,IObject->getEntry()); - if ( automaticUpdate() && aVisualObj){ - aVisualObj->Update(); - SMESH_Actor* anActor = SMESH::FindActorByEntry(IObject->getEntry()); - if(!anActor){ - anActor = SMESH::CreateActor(aStudy,IObject->getEntry()); - if(anActor){ + CORBA::Long anId = aStudy->StudyId(); + TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,IObject->getEntry()); + if ( automaticUpdate() && aVisualObj){ + aVisualObj->Update(); + SMESH_Actor* anActor = SMESH::FindActorByEntry(IObject->getEntry()); + if(!anActor){ + anActor = SMESH::CreateActor(aStudy,IObject->getEntry()); + if(anActor){ SMESH::DisplayActor(view,anActor); //apo SMESH::FitAll(); } } + SMESH::RepaintCurrentView(); } }else{ SUIT_MessageBox::warn1(desktop(), - tr("SMESH_WRN_WARNING"), + tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } updateObjBrowser(); + Sel->setSelectedObjects( selected ); break; } - case 702: // ADD SUB MESH - { - if(checkLock(aStudy)) break; - if( vtkwnd ) { - EmitSignalDeactivateDialog(); - new SMESHGUI_AddSubMeshDlg( this ); - } - else { - SUIT_MessageBox::warn1(desktop(), - tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), - tr("SMESH_BUT_OK")); - } - break; - } - - case 703: // INIT MESH - { - if(checkLock(aStudy)) break; - EmitSignalDeactivateDialog(); - new SMESHGUI_InitMeshDlg( this ); - break; - } - - case 704: // EDIT Hypothesis - { - if(checkLock(aStudy)) break; - EmitSignalDeactivateDialog(); - new SMESHGUI_EditHypothesesDlg( this ); - break; - } - - case 705: // EDIT Global Hypothesis - { - if(checkLock(aStudy)) break; - EmitSignalDeactivateDialog(); - new SMESHGUI_EditHypothesesDlg( this ); - break; - } - - case 706: // EDIT Local Hypothesis - { - if(checkLock(aStudy)) break; - EmitSignalDeactivateDialog(); - new SMESHGUI_EditHypothesesDlg( this ); - break; - } - + case 702: // Create mesh + startOperation( 702 ); + break; + case 703: // Create sub-mesh + startOperation( 703 ); + break; + case 704: // Edit mesh/sub-mesh + startOperation( 704 ); + break; case 407: // DIAGONAL INVERSION case 408: // Delete diagonal { @@ -1501,7 +1498,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) EmitSignalDeactivateDialog(); SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_nil(); - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1528,7 +1525,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) if(checkLock(aStudy)) break; EmitSignalDeactivateDialog(); - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1568,7 +1565,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) aGroup->Add(aVolumes.inout()); } updateObjBrowser(); - + }catch(const SALOME::SALOME_Exception & S_ex){ SalomeApp_Tools::QtCatchCorbaException(S_ex); } @@ -1591,7 +1588,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) if(checkLock(aStudy)) break; EmitSignalDeactivateDialog(); - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1682,7 +1679,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 900: // MESH INFOS { EmitSignalDeactivateDialog(); - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1706,7 +1703,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 902: // STANDARD MESH INFOS { EmitSignalDeactivateDialog(); - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1726,13 +1723,13 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) else new SMESHGUI_StandardMeshInfosDlg( this, "", false); break; - } - + } + case 1100: // EDIT HYPOTHESIS { if(checkLock(aStudy)) break; - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1768,7 +1765,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) if ( checkLock( aStudy ) ) break; - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1786,7 +1783,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) { aName = anAttr; QString newName = QString(aName->Value().c_str()); - newName = SalomeApp_NameDlg::getName( desktop(), newName ); + newName = LightApp_NameDlg::getName( desktop(), newName ); if ( !newName.isEmpty() ) { //old source: aStudy->renameIObject( IObject, newName ); @@ -1797,7 +1794,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) SMESH::IObjectToInterface(IObject); if (!aGroup->_is_nil() ) aGroup->SetName( newName.latin1() ); - + updateObjBrowser(); } } @@ -1811,10 +1808,10 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) if(checkLock(aStudy)) break; SUIT_OverrideCursor wc; - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) - aSel->selectedObjects( selected ); + aSel->selectedObjects( selected, QString::null, false ); SALOME_ListIteratorOfListIO It(selected); for (int i = 0; It.More(); It.Next(), i++) { @@ -1964,7 +1961,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) } break; } - case 4063: // SYMMETRY + case 4063: // SYMMETRY { if(checkLock(aStudy)) break; if(vtkwnd) { @@ -2006,20 +2003,20 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) } break; } - - - case 5000: // HYPOTHESIS - { - if(checkLock(aStudy)) break; - EmitSignalDeactivateDialog(); - new SMESHGUI_CreateHypothesesDlg ( this, "", FALSE, false ); - break; - } - case 5010: // ALGO + case 4066: // MERGE EQUAL ELEMENTS { - if(checkLock(aStudy)) break; - EmitSignalDeactivateDialog(); - new SMESHGUI_CreateHypothesesDlg ( this, "", FALSE, true); + if (checkLock(aStudy)) break; + if (vtkwnd) { + EmitSignalDeactivateDialog(); + new SMESHGUI_EditMeshDlg(this, + "SMESH_MERGE_ELEMENTS_TITLE", + "ICON_DLG_MERGE_ELEMENTS", + 1); // MergeEqualElemets + } else { + SUIT_MessageBox::warn1(desktop(), + tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), + tr("SMESH_BUT_OK")); + } break; } @@ -2050,9 +2047,10 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 6002: case 6003: case 6004: + case 6009: if ( vtkwnd ) { - SalomeApp_SelectionMgr* mgr = selectionMgr(); + LightApp_SelectionMgr* mgr = selectionMgr(); SALOME_ListIO selected; mgr->selectedObjects( selected ); if ( selected.Extent() == 1 && selected.First()->hasEntry() ) { @@ -2077,13 +2075,13 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) else { SUIT_MessageBox::warn1(desktop(), tr( "SMESH_WRN_WARNING" ), - tr( "NOT_A_VTK_VIEWER" ), + tr( "NOT_A_VTK_VIEWER" ), tr( "SMESH_BUT_OK" ) ); } break; case 9010: { - SalomeApp_SelectionMgr* mgr = selectionMgr(); + LightApp_SelectionMgr* mgr = selectionMgr(); SALOME_ListIO selected; mgr->selectedObjects( selected ); if (selected.Extent() == 1) { @@ -2097,7 +2095,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) } case 9011: { - SalomeApp_SelectionMgr* mgr = selectionMgr(); + LightApp_SelectionMgr* mgr = selectionMgr(); SALOME_ListIO selected; mgr->selectedObjects( selected ); if (selected.Extent() == 1) { @@ -2110,6 +2108,8 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) break; } } + + anApp->updateActions(); //SRN: To update a Save button in the toolbar //updateObjBrowser(); return true; } @@ -2241,14 +2241,10 @@ void SMESHGUI::initialize( CAM_Application* app ) createSMESHAction( 126, "EXPORT_UNV" ); createSMESHAction( 33, "DELETE", "ICON_DELETE" ); createSMESHAction( 5105, "SEL_FILTER_LIB" ); - createSMESHAction( 5000, "CREATE_HYPO", "ICON_HYPO" ); - createSMESHAction( 5010, "CREATE_ALG", "ICON_PATTERN_2d" ); createSMESHAction( 701, "COMPUTE", "ICON_COMPUTE" ); - createSMESHAction( 702, "LOCAL_HYPO", "ICON_DLG_ADD_SUBMESH" ); - createSMESHAction( 703, "GLOBAL_HYPO", "ICON_DLG_INIT_MESH" ); - createSMESHAction( 704, "EDIT_HYPO", "ICON_DLG_EDIT_MESH" ); - createSMESHAction( 705, "EDIT_GLOBAL_HYPO","ICON_DLG_EDIT_MESH" ); - createSMESHAction( 706, "EDIT_LOCAL_HYPO", "ICON_DLG_EDIT_MESH" ); + createSMESHAction( 702, "CREATE_MESH", "ICON_DLG_INIT_MESH" ); + createSMESHAction( 703, "CREATE_SUBMESH", "ICON_DLG_ADD_SUBMESH" ); + createSMESHAction( 704, "EDIT_MESHSUBMESH","ICON_DLG_EDIT_MESH" ); createSMESHAction( 801, "CREATE_GROUP", "ICON_SMESH_TREE_GROUP" ); createSMESHAction( 802, "CONSTRUCT_GROUP", "ICON_CONSTRUCT_GROUP" ); createSMESHAction( 803, "EDIT_GROUP", "ICON_EDIT_GROUP" ); @@ -2273,6 +2269,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createSMESHAction( 6017, "ASPECT_3D", "ICON_ASPECT_3D", 0, true ); createSMESHAction( 6018, "LENGTH_2D", "ICON_LENGTH_2D", 0, true ); createSMESHAction( 6019, "CONNECTION_2D", "ICON_CONNECTION_2D", 0, true ); + createSMESHAction( 6009, "VOLUME_3D", "ICON_VOLUME_3D", 0, true ); createSMESHAction( 400, "NODE", "ICON_DLG_NODE" ); createSMESHAction( 401, "EDGE", "ICON_DLG_EDGE" ); createSMESHAction( 4021, "TRIANGLE", "ICON_DLG_TRIANGLE" ); @@ -2289,6 +2286,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createSMESHAction( 4063, "SYM", "ICON_SMESH_SYMMETRY_PLANE" ); createSMESHAction( 4064, "SEW", "ICON_SMESH_SEWING_FREEBORDERS" ); createSMESHAction( 4065, "MERGE", "ICON_SMESH_MERGE_NODES" ); + createSMESHAction( 4066, "MERGE_ELEMENTS", "ICON_DLG_MERGE_ELEMENTS" ); createSMESHAction( 406, "MOVE", "ICON_DLG_MOVE_NODE" ); createSMESHAction( 407, "INV", "ICON_DLG_MESH_DIAGONAL" ); createSMESHAction( 408, "UNION2", "ICON_UNION2TRI" ); @@ -2313,6 +2311,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createSMESHAction( 220, "ALL" ); createSMESHAction( 1100, "EDIT_HYPO" ); createSMESHAction( 1101, "RENAME" ); + createSMESHAction( 1102, "UNASSIGN" ); createSMESHAction( 9010, "NUM_NODES", "", 0, true ); createSMESHAction( 9011, "NUM_ELEMENTS", "", 0, true ); createSMESHAction( 1131, "DISPMODE" ); @@ -2321,7 +2320,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createSMESHAction( 1134, "CLIP" ); createSMESHAction( 1135, "DISP_ENT" ); createSMESHAction( 2000, "CTRL" ); - + createSMESHAction( 300, "ERASE" ); createSMESHAction( 301, "DISPLAY" ); createSMESHAction( 302, "DISPLAY_ONLY" ); @@ -2331,7 +2330,6 @@ void SMESHGUI::initialize( CAM_Application* app ) int fileId = createMenu( tr( "MEN_FILE" ), -1, 1 ), editId = createMenu( tr( "MEN_EDIT" ), -1, 3 ), toolsId = createMenu( tr( "MEN_TOOLS" ), -1, 5, 50 ), - hypoId = createMenu( tr( "MEN_HYPO" ), -1, 50, 10 ), meshId = createMenu( tr( "MEN_MESH" ), -1, 70, 10 ), ctrlId = createMenu( tr( "MEN_CTRL" ), -1, 60, 10 ), modifyId = createMenu( tr( "MEN_MODIFY" ), -1, 40, 10 ), @@ -2360,11 +2358,8 @@ void SMESHGUI::initialize( CAM_Application* app ) createMenu( 5105, toolsId, -1 ); - createMenu( 5000, hypoId, -1 ); - createMenu( 5010, hypoId, -1 ); - - createMenu( 703, meshId, -1 ); createMenu( 702, meshId, -1 ); + createMenu( 703, meshId, -1 ); createMenu( 704, meshId, -1 ); createMenu( separator(), meshId, -1 ); createMenu( 701, meshId, -1 ); @@ -2398,6 +2393,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createMenu( 6016, ctrlId, -1 ); createMenu( separator(), ctrlId, -1 ); createMenu( 6017, ctrlId, -1 ); + createMenu( 6009, ctrlId, -1 ); createMenu( separator(), ctrlId, -1 ); createMenu( 400, addId, -1 ); @@ -2420,6 +2416,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createMenu( 4063, transfId, -1 ); createMenu( 4064, transfId, -1 ); createMenu( 4065, transfId, -1 ); + createMenu( 4066, transfId, -1 ); createMenu( 406, modifyId, -1 ); createMenu( 407, modifyId, -1 ); @@ -2437,14 +2434,13 @@ void SMESHGUI::initialize( CAM_Application* app ) // ----- create toolbars -------------- int meshTb = createTool( tr( "TB_MESH" ) ), - hypoTb = createTool( tr( "TB_HYPO" ) ), ctrlTb = createTool( tr( "TB_CTRL" ) ), addRemTb = createTool( tr( "TB_ADD_REMOVE" ) ), modifyTb = createTool( tr( "TB_MODIFY" ) ), dispModeTb = createTool( tr( "TB_DISP_MODE" ) ); - createTool( 703, meshTb ); createTool( 702, meshTb ); + createTool( 703, meshTb ); createTool( 704, meshTb ); createTool( separator(), meshTb ); createTool( 701, meshTb ); @@ -2457,9 +2453,6 @@ void SMESHGUI::initialize( CAM_Application* app ) createTool( 902, meshTb ); createTool( separator(), meshTb ); - createTool( 5000, hypoTb ); - createTool( 5010, hypoTb ); - createTool( 6001, ctrlTb ); createTool( 6003, ctrlTb ); createTool( 6004, ctrlTb ); @@ -2475,6 +2468,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createTool( 6016, ctrlTb ); createTool( separator(), ctrlTb ); createTool( 6017, ctrlTb ); + createTool( 6009, ctrlTb ); createTool( separator(), ctrlTb ); createTool( 400, addRemTb ); @@ -2497,6 +2491,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createTool( 4063, addRemTb ); createTool( 4064, addRemTb ); createTool( 4065, addRemTb ); + createTool( 4066, addRemTb ); createTool( separator(), addRemTb ); createTool( 406, modifyTb ); @@ -2534,8 +2529,8 @@ void SMESHGUI::initialize( CAM_Application* app ) // popup for object browser - createPopupItem( 705, OB, mesh, "&& isComputable"); // EDIT_GLOBAL_HYPO - createPopupItem( 706, OB, subMesh, "&& isComputable" ); // EDIT_LOCAL_HYPO + createPopupItem( 704, OB, mesh, "&& isComputable"); // EDIT_MESHSUBMESH + createPopupItem( 704, OB, subMesh, "&& isComputable" ); // EDIT_MESHSUBMESH createPopupItem( 803, OB, group ); // EDIT_GROUP popupMgr()->insert( separator(), -1, 0 ); createPopupItem( 701, OB, mesh, "&& isComputable" ); // COMPUTE @@ -2546,12 +2541,14 @@ void SMESHGUI::initialize( CAM_Application* app ) createPopupItem( 801, OB, mesh ); // CREATE_GROUP createPopupItem( 802, OB, subMesh ); // CONSTRUCT_GROUP popupMgr()->insert( separator(), -1, 0 ); - createPopupItem( 1100, OB, hypo ); // EDIT HYPOTHESIS - createPopupItem( 1102, OB, hyp_alg, "&& hasReference" ); // REMOVE HYPOTHESIS / ALGORITHMS - createPopupItem( 1101, OB, mesh_group + " " + hyp_alg ); // RENAME + createPopupItem( 1100, OB, hypo, "" /*"&& $hasReference={false}"*/ ); // EDIT HYPOTHESIS + createPopupItem( 1102, OB, hyp_alg ); // REMOVE HYPOTHESIS / ALGORITHMS + createPopupItem( 1101, OB, mesh_group + " " + hyp_alg, "" /*"&& $hasReference={false}"*/ ); // RENAME popupMgr()->insert( separator(), -1, 0 ); - createPopupItem( 125, OB, mesh ); // EXPORT_MED - createPopupItem( 126, OB, mesh ); // EXPORT_UNV + + QString only_one_non_empty = QString( " && %1=1 && numberOfNodes>0" ).arg( QtxPopupMgr::Selection::defSelCountParam() ); + createPopupItem( 125, OB, mesh, only_one_non_empty ); // EXPORT_MED + createPopupItem( 126, OB, mesh, only_one_non_empty ); // EXPORT_UNV createPopupItem( 33, OB, subMesh + " " + group ); // DELETE popupMgr()->insert( separator(), -1, 0 ); @@ -2579,19 +2576,19 @@ void SMESHGUI::initialize( CAM_Application* app ) hasFaces("({'Face'} in elemTypes)"), hasVolumes("({'Volume'} in elemTypes)"); - QString aSelCount = QString( "%1 = 1" ).arg( QtxPopupMgr::Selection::defSelCountParam() ); QString lc = QtxPopupMgr::Selection::defEquality(); QString aClient = QString( "%1client in {%2}" ).arg( lc ).arg( "'VTKViewer'" ); - QString aType = QString( "%1type in {%2}" ).arg( QtxPopupMgr::Selection::defEquality() ).arg( mesh_group ); - QString aMeshInVTK = aClient + "&&" + aType;// + "&&" + aSelCount; - + QString aType = QString( "%1type in {%2}" ).arg( QtxPopupMgr::Selection::defEquality() ); + aType = aType.arg( mesh_group ); + QString aMeshInVTK = aClient + "&&" + aType; + //------------------------------------------------- // Numbering //------------------------------------------------- anId = popupMgr()->insert( tr( "MEN_NUM" ), -1, -1 ); - + popupMgr()->insert( action( 9010 ), anId, -1 ); - popupMgr()->setRule( action( 9010 ), aMeshInVTK + "&& isVisible &&" + hasNodes, true );//@ + popupMgr()->setRule( action( 9010 ), aMeshInVTK + "&& isVisible &&" + hasNodes, true ); popupMgr()->setRule( action( 9010 ), "{'Point'} in labeledTypes", false ); popupMgr()->insert( action( 9011 ), anId, -1 ); @@ -2738,6 +2735,10 @@ void SMESHGUI::initialize( CAM_Application* app ) popupMgr()->setRule( action( 6017 ), aMeshInVtkHasVolumes, true ); popupMgr()->setRule( action( 6017 ), "controlMode = 'eAspectRatio3D'", false ); + popupMgr()->insert ( action( 6009 ), anId, -1 ); // VOLUME_3D + popupMgr()->setRule( action( 6009 ), aMeshInVtkHasVolumes, true ); + popupMgr()->setRule( action( 6009 ), "controlMode = 'eVolume3D'", false ); + popupMgr()->insert( separator(), anId, -1 ); popupMgr()->insert( action( 201 ), anId, -1 ); // SCALAR_BAR_PROP @@ -2749,21 +2750,24 @@ void SMESHGUI::initialize( CAM_Application* app ) // Display / Erase //------------------------------------------------- aClient = "($client in {'VTKViewer' 'ObjectBrowser'})"; - QString anActiveVTK = QString("activeView = '%1'").arg(VTKViewer_Viewer::Type()); - QString aRule = aClient + " and " + aType + " and " + aSelCount + " and " + anActiveVTK; + QString anActiveVTK = QString("activeView = '%1'").arg(SVTK_Viewer::Type()); + QString aSelCount = QString( "%1 > 0" ).arg( QtxPopupMgr::Selection::defSelCountParam() ); + + QString aRule = "$component={'SMESH'} and ( type='Component' or (" + aClient + " and " + + aType + " and " + aSelCount + " and " + anActiveVTK + " and " + isNotEmpty + " %1 ) )"; popupMgr()->insert( action( 301 ), -1, -1 ); // DISPLAY - popupMgr()->setRule( action( 301 ), aRule + "&&" + isNotEmpty + "&&" + isInvisible, true); + popupMgr()->setRule( action( 301 ), aRule.arg( "and (not isVisible)" ), true); popupMgr()->insert( action( 300 ), -1, -1 ); // ERASE - popupMgr()->setRule( action( 300 ), aRule + "&&" + isNotEmpty + "&& isVisible", true ); + popupMgr()->setRule( action( 300 ), aRule.arg( "and isVisible" ), true ); popupMgr()->insert( action( 302 ), -1, -1 ); // DISPLAY_ONLY - popupMgr()->setRule( action( 302 ), aRule + "&&" + isNotEmpty, true ); + popupMgr()->setRule( action( 302 ), aRule.arg( "" ), true ); popupMgr()->insert( separator(), -1, -1 ); - connect( application(), SIGNAL( viewManagerAdded( SUIT_ViewManager* ) ), - this, SLOT( onViewManagerAdded( SUIT_ViewManager* ) ) ); + connect( application(), SIGNAL( viewManagerActivated( SUIT_ViewManager* ) ), + this, SLOT( onViewManagerActivated( SUIT_ViewManager* ) ) ); } bool SMESHGUI::activateModule( SUIT_Study* study ) @@ -2782,7 +2786,7 @@ bool SMESHGUI::deactivateModule( SUIT_Study* study ) setToolShown( false ); EmitSignalCloseAllDialogs(); - + return SalomeApp_Module::deactivateModule( study ); } @@ -2798,11 +2802,16 @@ void SMESHGUI::OnGUIEvent() SMESH::SMESH_Gen_var SMESHGUI::GetSMESHGen() { + _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); //Document OCAF de l'etude active if ( CORBA::is_nil( myComponentSMESH ) ) { SMESHGUI aGUI; //SRN BugID: IPAL9186: Create an instance of SMESHGUI to initialize myComponentSMESH + if ( aStudy ) + aGUI.myComponentSMESH->SetCurrentStudy(_CAST(Study,aStudy)->GetStudy()); return aGUI.myComponentSMESH; - } + } + if ( aStudy ) + myComponentSMESH->SetCurrentStudy(_CAST(Study,aStudy)->GetStudy()); return myComponentSMESH; } @@ -2831,9 +2840,9 @@ void SMESHGUI::viewManagers( QStringList& list ) const list.append( SVTK_Viewer::Type() ); } -void SMESHGUI::onViewManagerAdded( SUIT_ViewManager* mgr ) +void SMESHGUI::onViewManagerActivated( SUIT_ViewManager* mgr ) { - if ( dynamic_cast( mgr ) ) + if ( dynamic_cast( mgr ) ) SMESH::UpdateSelectionProp( this ); } @@ -2841,46 +2850,54 @@ void SMESHGUI::createPreferences() { int genTab = addPreference( tr( "PREF_TAB_GENERAL" ) ); + int updateGroup = addPreference( tr( "PREF_GROUP_UPDATE" ), genTab ); + addPreference( tr( "PREF_AUTO_UPDATE" ), updateGroup, LightApp_Preferences::Bool, "SMESH", "auto_update" ); + 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" ); + addPreference( tr( "PREF_DISPLAY_ENTITY" ), qaGroup, LightApp_Preferences::Bool, "SMESH", "display_entity" ); + addPreference( tr( "PREF_PRECISION_USE" ), qaGroup, LightApp_Preferences::Bool, "SMESH", "use_precision" ); 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" ); + int prec = addPreference( tr( "PREF_PRECISION_VALUE" ), precGroup, LightApp_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" ); + int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), dispgroup, LightApp_Preferences::Selector, "SMESH", "display_mode" ); QStringList modes; modes.append( "Wireframe" ); modes.append( "Shading" ); - modes.append( "Shrink" ); modes.append( "Nodes" ); + modes.append( "Shrink" ); + QValueList indices; + indices.append( 0 ); + indices.append( 1 ); + indices.append( 2 ); + indices.append( 3 ); setPreferenceProperty( dispmode, "strings", modes ); - + setPreferenceProperty( dispmode, "indexes", indices ); + 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" ); + addPreference( tr( "PREF_COLOR" ), nodeGroup, LightApp_Preferences::Color, "SMESH", "node_color" ); + int nodeSz = addPreference( tr( "PREF_SIZE" ), nodeGroup, LightApp_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 ); + addPreference( tr( "PREF_FILL" ), elemGroup, LightApp_Preferences::Color, "SMESH", "fill_color" ); + addPreference( tr( "PREF_OUTLINE" ), elemGroup, LightApp_Preferences::Color, "SMESH", "outline_color" ); + addPreference( tr( "PREF_BACKFACE" ), elemGroup, LightApp_Preferences::Color, "SMESH", "backface_color" ); + addPreference( "", elemGroup, LightApp_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" ); + int elemW = addPreference( tr( "PREF_WIDTH" ), elemGroup, LightApp_Preferences::IntSpin, "SMESH", "element_width" ); + int shrink = addPreference( tr( "PREF_SHRINK_COEFF" ), elemGroup, LightApp_Preferences::IntSpin, "SMESH", "shrink_coeff" ); setPreferenceProperty( elemW, "min", 1 ); setPreferenceProperty( elemW, "max", 5 ); @@ -2892,33 +2909,33 @@ void SMESHGUI::createPreferences() 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" ); - + addPreference( tr( "PREF_OBJECT_COLOR" ), selGroup, LightApp_Preferences::Color, "SMESH", "selection_object_color" ); + addPreference( tr( "PREF_ELEMENT_COLOR" ), selGroup, LightApp_Preferences::Color, "SMESH", "selection_element_color" ); + int selW = addPreference( tr( "PREF_WIDTH" ), selGroup, LightApp_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" ); + addPreference( tr( "PREF_HIGHLIGHT_COLOR" ), preGroup, LightApp_Preferences::Color, "SMESH", "highlight_color" ); + int preW = addPreference( tr( "PREF_WIDTH" ), preGroup, LightApp_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" ); + addPreference( tr( "PREF_NODES" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_node" ); + addPreference( tr( "PREF_ELEMENTS" ), precSelGroup, LightApp_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" ); + int tfont = addPreference( tr( "SMESH_TITLE" ), fontGr, LightApp_Preferences::Font, "SMESH", "scalar_bar_title_font" ); + addPreference( tr( "SMESH_TITLE" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_title_color" ); + int lfont = addPreference( tr( "SMESH_LABELS" ), fontGr, LightApp_Preferences::Font, "SMESH", "scalar_bar_label_font" ); + addPreference( tr( "SMESH_LABELS" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_label_color" ); QStringList fam; fam.append( tr( "SMESH_FONT_ARIAL" ) ); @@ -2928,35 +2945,35 @@ void SMESHGUI::createPreferences() setPreferenceProperty( tfont, "families", fam ); setPreferenceProperty( tfont, "system", false ); - setPreferenceProperty( tfont, "widget_flags", wflag ); + 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" ); + int numcol = addPreference( tr( "SMESH_NUMBEROFCOLORS" ), colorsLabelsGr, LightApp_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( numcol, "max", 256 ); + + int numlab = addPreference( tr( "SMESH_NUMBEROFLABELS" ), colorsLabelsGr, LightApp_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" ); + int orient = addPreference( tr( "SMESH_ORIENTATION" ), orientGr, LightApp_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 ); + indices.clear(); 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" ); + int xv = addPreference( tr( "SMESH_X_SCALARBAR" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_x" ); + int yv = addPreference( tr( "SMESH_Y_SCALARBAR" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_y" ); + int wv = addPreference( tr( "SMESH_WIDTH" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_width" ); + int hv = addPreference( tr( "SMESH_HEIGHT" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_height" ); setPreferenceProperty( xv, "step", 0.1 ); setPreferenceProperty( xv, "min", 0.0 ); setPreferenceProperty( xv, "max", 1.0 ); @@ -2968,13 +2985,13 @@ void SMESHGUI::createPreferences() setPreferenceProperty( wv, "max", 1.0 ); setPreferenceProperty( hv, "min", 0.0 ); setPreferenceProperty( hv, "max", 1.0 ); - setPreferenceProperty( hv, "step", 0.1 ); + 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" ); + int xh = addPreference( tr( "SMESH_X_SCALARBAR" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_x" ); + int yh = addPreference( tr( "SMESH_Y_SCALARBAR" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_y" ); + int wh = addPreference( tr( "SMESH_WIDTH" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_width" ); + int hh = addPreference( tr( "SMESH_HEIGHT" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_height" ); setPreferenceProperty( xv, "min", 0.0 ); setPreferenceProperty( xv, "max", 1.0 ); setPreferenceProperty( xv, "step", 0.1 ); @@ -2994,4 +3011,97 @@ void SMESHGUI::createPreferences() void SMESHGUI::preferencesChanged( const QString& sect, const QString& name ) { + if( sect=="SMESH" ) + if( name=="selection_object_color" || name=="selection_element_color" || + name=="selection_width" || name=="highlight_color" || name=="highlight_width" || + name=="selection_precision_node" || name=="selection_precision_element" ) + SMESH::UpdateSelectionProp( this ); +} + +//================================================================================ +/*! + * \brief Update something in accordance with update flags + * \param theFlags - update flags +* +* Update viewer or/and object browser etc. in accordance with update flags ( see +* LightApp_UpdateFlags enumeration ). +*/ +//================================================================================ +void SMESHGUI::update( const int flags ) +{ + if ( flags & UF_Viewer | flags & UF_Forced ) + SMESH::UpdateView(); + else + SalomeApp_Module::update( flags ); +} + +//================================================================================ +/*! + * \brief Set default selection mode +* +* SLOT called when operation commited. Sets default selection mode +*/ +//================================================================================ +void SMESHGUI::onOperationCommited( SUIT_Operation* ) +{ + SVTK_ViewWindow* vtkWnd = + dynamic_cast( application()->desktop()->activeWindow() ); + if ( vtkWnd ) + vtkWnd->SetSelectionMode( ActorSelection ); +} + +//================================================================================ +/*! + * \brief Set default selection mode +* +* SLOT called when operation aborted. Sets default selection mode +*/ +//================================================================================ +void SMESHGUI::onOperationAborted( SUIT_Operation* ) +{ + SVTK_ViewWindow* vtkWnd = + dynamic_cast( application()->desktop()->activeWindow() ); + if ( vtkWnd ) + vtkWnd->SetSelectionMode( ActorSelection ); +} + +//================================================================================ +/*! + * \brief Creates operation with given identifier + * \param id - identifier of operation to be started + * \return Pointer on created operation or NULL if operation is not created +* +* Virtual method redefined from the base class creates operation with given id. +* It is called called automatically from startOperation method of base class. +*/ +//================================================================================ +LightApp_Operation* SMESHGUI::createOperation( const int id ) const +{ + LightApp_Operation* op = 0; + // to do : create operation here + switch( id ) + { + case 702: // Create mesh + op = new SMESHGUI_MeshOp( true, true ); + break; + case 703: // Create sub-mesh + op = new SMESHGUI_MeshOp( true, false ); + break; + case 704: // Edit mesh/sub-mesh + op = new SMESHGUI_MeshOp( false ); + break; + default: + break; + } + + if( !op ) + op = SalomeApp_Module::createOperation( id ); + return op; +} + +LightApp_Displayer* SMESHGUI::displayer() +{ + if( !myDisplayer ) + myDisplayer = new SMESHGUI_Displayer( getApp() ); + return myDisplayer; }