X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI.cxx;h=349eb3ec4bbe6bded65ffa9b4e08992647849d3e;hp=49baea8a3950b61dee8fbd43bdb2d0594156aab5;hb=287d1c47201de439b4f52eae1f79a03ad110cd97;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 49baea8a3..349eb3ec4 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -3,11 +3,11 @@ // Copyright (C) 2003 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 +// 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 @@ -15,7 +15,7 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org // @@ -25,6 +25,7 @@ // $Header$ #include "SMESHGUI.h" + #include "SMESHGUI_InitMeshDlg.h" #include "SMESHGUI_AddSubMeshDlg.h" #include "SMESHGUI_NodesDlg.h" @@ -34,11 +35,11 @@ #include "SMESHGUI_RemoveNodesDlg.h" #include "SMESHGUI_RemoveElementsDlg.h" #include "SMESHGUI_MeshInfosDlg.h" +#include "SMESHGUI_StandardMeshInfosDlg.h" #include "SMESHGUI_Preferences_ColorDlg.h" #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" @@ -52,124 +53,140 @@ #include "SMESHGUI_SmoothingDlg.h" #include "SMESHGUI_RenumberingDlg.h" #include "SMESHGUI_ExtrusionDlg.h" +#include "SMESHGUI_ExtrusionAlongPathDlg.h" #include "SMESHGUI_RevolutionDlg.h" #include "SMESHGUI_TranslationDlg.h" #include "SMESHGUI_RotationDlg.h" #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 "VTKViewer_ViewFrame.h" -#include "VTKViewer_InteractorStyleSALOME.h" -#include "VTKViewer_RenderWindowInteractor.h" - -#include "SMESH_Actor.h" -#include "SMESH_Object.h" - -#include "QAD.h" -#include "QAD_Tools.h" -#include "QAD_Config.h" -#include "QAD_Settings.h" -#include "QAD_RightFrame.h" -#include "QAD_MessageBox.h" -#include "QAD_Resource.h" -#include "QAD_FileDlg.h" -#include "QAD_Desktop.h" -#include "QAD_ResourceMgr.h" -#include "QAD_WaitCursor.h" - -#include "SALOME_NamingService.hxx" -#include "SALOME_ListIteratorOfListIO.hxx" -#include "SALOME_InteractiveObject.hxx" - -#include "SALOMEGUI_Desktop.h" -#include "SALOMEGUI_NameDlg.h" -#include "SALOMEGUI_ImportOperation.h" -#include "SALOMEGUI_QtCatchCorbaException.hxx" +#include "SMESHGUI_Selection.h" +#include "SMESHGUI_CreatePolyhedralVolumeDlg.h" +#include "SMESHGUI_MeshOp.h" #include "SMESHGUI_Utils.h" -#include "SMESHGUI_SMESHGenUtils.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 "SalomeApp_NameDlg.h" +#include "SalomeApp_DataOwner.h" +#include "SalomeApp_Application.h" +#include "SalomeApp_Preferences.h" +#include "SalomeApp_VTKSelector.h" +#include "SalomeApp_Operation.h" +#include "SalomeApp_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" +#include "SUIT_FileDlg.h" +#include "SUIT_Desktop.h" +#include "SUIT_ResourceMgr.h" +#include "SUIT_OverrideCursor.h" +#include "SUIT_Study.h" +#include "SUIT_Session.h" + +#include "QtxPopupMgr.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 #include +#include #include "utilities.h" +#include "SALOMEDS_Study.hxx" +#include "SALOMEDSClient_StudyBuilder.hxx" +#include "SALOMEDSClient_SComponent.hxx" + using namespace std; namespace{ // Decalarations //============================================================= - void ImportMeshesFromFile(QAD_Desktop * parent, - SMESH::SMESH_Gen_ptr theComponentMesh, + void ImportMeshesFromFile(SMESH::SMESH_Gen_ptr theComponentMesh, int theCommandID); - void ExportMeshToFile(QAD_Desktop * parent, int theCommandID); + void ExportMeshToFile(int theCommandID); - void SetViewMode(int theCommandID); + void SetDisplayMode(int theCommandID); - void Control( int theCommandID ); + void SetDisplayEntity(int theCommandID); - void SetDisplaySettings(); + void Control( int theCommandID ); // Definitions //============================================================= - void ImportMeshesFromFile(QAD_Desktop * parent, - SMESH::SMESH_Gen_ptr theComponentMesh, + void ImportMeshesFromFile(SMESH::SMESH_Gen_ptr theComponentMesh, int theCommandID) { - QString filter; + QStringList filter; string myExtension; if(theCommandID == 113){ - filter = QObject::tr("MED files (*.med)"); + filter.append(QObject::tr("MED files (*.med)")); + filter.append(QObject::tr("All files (*)")); }else if (theCommandID == 112){ - filter = QObject::tr("IDEAS files (*.unv)"); + filter.append(QObject::tr("IDEAS files (*.unv)")); }else if (theCommandID == 111){ - filter = QObject::tr("DAT files (*.dat)"); + filter.append(QObject::tr("DAT files (*.dat)")); } - QString filename = QAD_FileDlg::getFileName(parent, + QString filename = SUIT_FileDlg::getFileName(SMESHGUI::desktop(), "", filter, QObject::tr("Import mesh"), true); if(!filename.isEmpty()) { - QAD_WaitCursor wc; - SALOMEDS::Study_var aStudy = SMESH::GetActiveStudyDocument(); + SUIT_OverrideCursor wc; + _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); + theComponentMesh->SetCurrentStudy( _CAST(Study,aStudy)->GetStudy() ); try { SMESH::mesh_array_var aMeshes = new SMESH::mesh_array; @@ -185,13 +202,13 @@ namespace{ SMESH::DriverMED_ReadStatus res; aMeshes = theComponentMesh->CreateMeshesFromMED(filename.latin1(),res); if ( res != SMESH::DRS_OK ) { - wc.stop(); - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + wc.suspend(); + SUIT_MessageBox::warn1(SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"), QObject::tr(QString("SMESH_DRS_%1").arg(res)), QObject::tr("SMESH_BUT_OK")); aMeshes->length( 0 ); - wc.start(); + wc.resume(); } break; } @@ -199,10 +216,10 @@ namespace{ bool isEmpty = false; for ( int i = 0, iEnd = aMeshes->length(); i < iEnd; i++ ) { - SALOMEDS::SObject_var aMeshSO = SMESH::FindSObject( aMeshes[i] ); - if ( !aMeshSO->_is_nil() ) { - SALOMEDS::StudyBuilder_var aBuilder = aStudy->NewBuilder(); - SALOMEDS::AttributePixMap_var aPixmap = SALOMEDS::AttributePixMap::_narrow( aBuilder->FindOrCreateAttribute( aMeshSO, "AttributePixMap" ) ); + _PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshes[i] ); + if ( aMeshSO ) { + _PTR(StudyBuilder) aBuilder = aStudy->NewBuilder(); + _PTR(AttributePixMap) aPixmap = aBuilder->FindOrCreateAttribute( aMeshSO, "AttributePixMap" ); aPixmap->SetPixMap("ICON_SMESH_TREE_MESH_IMPORTED"); if ( theCommandID == 112 ) // mesh names aren't taken from the file for UNV import SMESH::SetName( aMeshSO, QFileInfo(filename).fileName() ); @@ -211,41 +228,52 @@ namespace{ } if ( isEmpty ) { - wc.stop(); - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + wc.suspend(); + SUIT_MessageBox::warn1(SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"), QObject::tr("SMESH_DRS_EMPTY"), QObject::tr("SMESH_BUT_OK")); - wc.start(); + wc.resume(); } + + SMESHGUI::GetSMESHGUI()->updateObjBrowser(); } catch (const SALOME::SALOME_Exception& S_ex){ - wc.stop(); - QtCatchCorbaException(S_ex); - wc.start(); + wc.suspend(); + SalomeApp_Tools::QtCatchCorbaException(S_ex); + wc.resume(); } } } - void ExportMeshToFile(QAD_Desktop * parent, int theCommandID) + void ExportMeshToFile( int theCommandID ) { - SALOME_Selection *aSel = SALOME_Selection::Selection(SMESH::GetActiveStudy()->getSelection()); - if(aSel->IObjectCount()){ - Handle(SALOME_InteractiveObject) anIObject = aSel->firstIObject(); + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + if(selected.Extent()){ + Handle(SALOME_InteractiveObject) anIObject = selected.First(); SMESH::SMESH_Mesh_var aMesh = SMESH::IObjectToInterface(anIObject); if ( !aMesh->_is_nil() ) { QString aFilter, aTitle = QObject::tr("Export mesh"); + QMap aFilterMap; switch ( theCommandID ) { + case 125: case 122: - aFilter = QObject::tr("MED files (*.med)"); + aFilterMap.insert( QObject::tr("MED 2.1 (*.med)"), SMESH::MED_V2_1 ); + aFilterMap.insert( QObject::tr("MED 2.2 (*.med)"), SMESH::MED_V2_2 ); break; + case 124: case 121: aFilter = QObject::tr("DAT files (*.dat)"); break; + case 126: case 123: { if(aMesh->NbPyramids()){ - int aRet = QAD_MessageBox::warn2(QAD_Application::getDesktop(), + int aRet = SUIT_MessageBox::warn2(SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"), QObject::tr("SMESH_EXPORT_UNV").arg(anIObject->getName()), QObject::tr("SMESH_BUT_YES"), @@ -259,21 +287,59 @@ namespace{ default: return; }} - - QString aFilename = QAD_FileDlg::getFileName(parent, "", aFilter, aTitle, false); + + QString aFilename; + SMESH::MED_VERSION aFormat; + + if ( theCommandID != 122 && theCommandID != 125 ) + aFilename = SUIT_FileDlg::getFileName(SMESHGUI::desktop(), "", aFilter, aTitle, false); + else + { + 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 ); + 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() ) { // Check whether the file already exists and delete it if yes QFile aFile( aFilename ); if ( aFile.exists() ) aFile.remove(); - QAD_WaitCursor wc; + SUIT_OverrideCursor wc; switch ( theCommandID ) { + case 125: case 122: - aMesh->ExportMED( aFilename.latin1(), true ); // currently, automatic groups are always created + aMesh->ExportToMED( aFilename.latin1(), false, aFormat ); // currently, automatic groups are never created break; + case 124: case 121: aMesh->ExportDAT( aFilename.latin1() ); break; + case 126: case 123: aMesh->ExportUNV( aFilename.latin1() ); break; @@ -283,25 +349,72 @@ namespace{ } } } - } - - void SetViewMode(int theCommandID){ - SALOME_Selection *Sel = SALOME_Selection::Selection(SMESH::GetActiveStudy()->getSelection()); - if(Sel->IObjectCount() >= 1){ + } + + inline void InverseEntityMode(unsigned int& theOutputMode, + unsigned int theMode) + { + bool anIsNotPresent = ~theOutputMode & theMode; + if(anIsNotPresent) + theOutputMode |= theMode; + else + theOutputMode &= ~theMode; + } + + void SetDisplayEntity(int theCommandID){ + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + if(selected.Extent() >= 1){ + SALOME_ListIteratorOfListIO It( selected ); + for(; It.More(); It.Next()){ + Handle(SALOME_InteractiveObject) IObject = It.Value(); + if(IObject->hasEntry()){ + if(SMESH_Actor *anActor = SMESH::FindActorByEntry(IObject->getEntry())){ + unsigned int aMode = anActor->GetEntityMode(); + switch(theCommandID){ + case 217: + InverseEntityMode(aMode,SMESH_Actor::eEdges); + break; + case 218: + InverseEntityMode(aMode,SMESH_Actor::eFaces); + break; + case 219: + InverseEntityMode(aMode,SMESH_Actor::eVolumes); + break; + case 220: + aMode = SMESH_Actor::eAllEntity; + break; + } + if(aMode) + anActor->SetEntityMode(aMode); + } + } + } + } + } + + void SetDisplayMode(int theCommandID){ + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + if(selected.Extent() >= 1){ switch(theCommandID){ case 1134:{ SMESHGUI::GetSMESHGUI()->EmitSignalDeactivateDialog(); - SMESHGUI_ClippingDlg *aDlg = - new SMESHGUI_ClippingDlg(QAD_Application::getDesktop(),"",false); + new SMESHGUI_ClippingDlg( SMESHGUI::GetSMESHGUI(), "", false ); return; } case 1133:{ SMESHGUI::GetSMESHGUI()->EmitSignalDeactivateDialog(); - SMESHGUI_TransparencyDlg *aDlg = - new SMESHGUI_TransparencyDlg(QAD_Application::getDesktop(),"",false); + new SMESHGUI_TransparencyDlg( SMESHGUI::GetSMESHGUI(), "", false ); return; }} - SALOME_ListIteratorOfListIO It(Sel->StoredIObjects()); + SALOME_ListIteratorOfListIO It( selected ); for(; It.More(); It.Next()){ Handle(SALOME_InteractiveObject) IObject = It.Value(); if(IObject->hasEntry()){ @@ -314,7 +427,7 @@ namespace{ anActor->SetRepresentation(SMESH_Actor::eSurface); break; case 213: - if(anActor->IsShrunk()) + if(anActor->IsShrunk()) anActor->UnShrink(); else anActor->SetShrink(); @@ -329,36 +442,36 @@ namespace{ int c1 = int (color[1] * 255); int c2 = int (color[2] * 255); QColor c(c0, c1, c2); - + float edgecolor[3]; anActor->GetEdgeColor(edgecolor[0], edgecolor[1], edgecolor[2]); c0 = int (edgecolor[0] * 255); c1 = int (edgecolor[1] * 255); c2 = int (edgecolor[2] * 255); QColor e(c0, c1, c2); - + float backfacecolor[3]; anActor->GetBackSufaceColor(backfacecolor[0], backfacecolor[1], backfacecolor[2]); c0 = int (backfacecolor[0] * 255); c1 = int (backfacecolor[1] * 255); c2 = int (backfacecolor[2] * 255); QColor b(c0, c1, c2); - + float nodecolor[3]; anActor->GetNodeColor(nodecolor[0], nodecolor[1], nodecolor[2]); c0 = int (nodecolor[0] * 255); c1 = int (nodecolor[1] * 255); c2 = int (nodecolor[2] * 255); QColor n(c0, c1, c2); - + int Edgewidth = (int)anActor->GetLineWidth(); if(Edgewidth == 0) Edgewidth = 1; int intValue = int(anActor->GetNodeSize()); float Shrink = anActor->GetShrinkFactor(); - - SMESHGUI_Preferences_ColorDlg *aDlg = - new SMESHGUI_Preferences_ColorDlg(QAD_Application::getDesktop(),""); + + SMESHGUI_Preferences_ColorDlg *aDlg = + new SMESHGUI_Preferences_ColorDlg( SMESHGUI::GetSMESHGUI(), "" ); aDlg->SetColor(1, c); aDlg->SetColor(2, e); aDlg->SetColor(3, n); @@ -373,27 +486,27 @@ namespace{ QColor backfacecolor = aDlg->GetColor(4); /* actor color and backface color */ anActor->SetSufaceColor(float (color.red()) / 255., - float (color.green()) / 255., + float (color.green()) / 255., float (color.blue()) / 255.); - anActor->SetBackSufaceColor(float (backfacecolor.red()) / 255., + anActor->SetBackSufaceColor(float (backfacecolor.red()) / 255., float (backfacecolor.green()) / 255., float (backfacecolor.blue()) / 255.); - + /* edge color */ anActor->SetEdgeColor(float (edgecolor.red()) / 255., float (edgecolor.green()) / 255., float (edgecolor.blue()) / 255.); - + /* Shrink factor and size edges */ anActor->SetShrinkFactor(aDlg->GetIntValue(3) / 100.); anActor->SetLineWidth(aDlg->GetIntValue(1)); - + /* Nodes color and size */ anActor->SetNodeColor(float (nodecolor.red()) / 255., float (nodecolor.green()) / 255., float (nodecolor.blue()) / 255.); anActor->SetNodeSize(aDlg->GetIntValue(2)); - + delete aDlg; } break; @@ -404,98 +517,16 @@ namespace{ SMESH::RepaintCurrentView(); } } - - - void SetDisplaySettings() - { - SMESHGUI::GetSMESHGUI()->EmitSignalDeactivateDialog(); - SMESHGUI_Preferences_ColorDlg *aDlg = - new SMESHGUI_Preferences_ColorDlg(QAD_Application::getDesktop(), ""); - - QColor color; - QString SCr, SCg, SCb; - SCr = QAD_CONFIG->getSetting("SMESH:SettingsFillColorRed"); - SCg = QAD_CONFIG->getSetting("SMESH:SettingsFillColorGreen"); - SCb = QAD_CONFIG->getSetting("SMESH:SettingsFillColorBlue"); - if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty()) - color = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt()); - else color = QColor(0, 170, 255); - aDlg->SetColor(1, color); - - SCr = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorRed"); - SCg = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen"); - SCb = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue"); - if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty()) - color = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt()); - else color = QColor(0, 170, 255); - aDlg->SetColor(2, color); - - SCr = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorRed"); - SCg = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorGreen"); - SCb = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorBlue"); - if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty()) - color = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt()); - else color = Qt::red; - aDlg->SetColor(3, color); - - QString SBr = QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorRed"); - QString SBg = QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorGreen"); - QString SBb = QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorBlue"); - if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty()) - color = QColor(SBr.toInt(), SBg.toInt(), SBb.toInt()); - else color = Qt::blue; - aDlg->SetColor(4, color); - - QString intValue = QAD_CONFIG->getSetting("SMESH:SettingsWidth"); - if (intValue.isEmpty()) intValue = "1"; - aDlg->SetIntValue(1, intValue.toInt()); - intValue = QAD_CONFIG->getSetting("SMESH:SettingsNodesSize"); - if (intValue.isEmpty()) intValue = "3"; - aDlg->SetIntValue(2, intValue.toInt()); - intValue = QAD_CONFIG->getSetting("SMESH:SettingsShrinkCoeff"); - if (intValue.isEmpty()) intValue = "75"; - aDlg->SetIntValue(3, intValue.toInt()); - - if (aDlg->exec()) { - QColor colorFill = aDlg->GetColor(1); - QAD_CONFIG->addSetting("SMESH:SettingsFillColorRed", colorFill.red()); - QAD_CONFIG->addSetting("SMESH:SettingsFillColorGreen", colorFill.green()); - QAD_CONFIG->addSetting("SMESH:SettingsFillColorBlue", colorFill.blue()); - - QColor colorOutline = aDlg->GetColor(2); - QAD_CONFIG->addSetting("SMESH:SettingsOutlineColorRed", colorOutline.red()); - QAD_CONFIG->addSetting("SMESH:SettingsOutlineColorGreen", colorOutline.green()); - QAD_CONFIG->addSetting("SMESH:SettingsOutlineColorBlue", colorOutline.blue()); - - QColor colorNode = aDlg->GetColor(3); - QAD_CONFIG->addSetting("SMESH:SettingsNodeColorRed", colorNode.red()); - QAD_CONFIG->addSetting("SMESH:SettingsNodeColorGreen", colorNode.green()); - QAD_CONFIG->addSetting("SMESH:SettingsNodeColorBlue", colorNode.blue()); - - QColor colorBackFace = aDlg->GetColor(4); - QAD_CONFIG->addSetting("SMESH:SettingsBackFaceColorRed", colorBackFace.red()); - QAD_CONFIG->addSetting("SMESH:SettingsBackFaceColorGreen", colorBackFace.green()); - QAD_CONFIG->addSetting("SMESH:SettingsBackFaceColorBlue", colorBackFace.blue()); - - int width = aDlg->GetIntValue(1); - QAD_CONFIG->addSetting("SMESH:SettingsWidth", width); - - int nodes_size = aDlg->GetIntValue(2); - QAD_CONFIG->addSetting("SMESH:SettingsNodesSize", nodes_size); - - int shrink_coeff = aDlg->GetIntValue(3); - QAD_CONFIG->addSetting("SMESH:SettingsShrinkCoeff", shrink_coeff); - } - - delete aDlg; - } - void Control( int theCommandID ) { - SALOME_Selection *Sel = SALOME_Selection::Selection( SMESH::GetActiveStudy()->getSelection() ); - if(Sel){ - Handle(SALOME_InteractiveObject) anIO = Sel->firstIObject(); + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + if( !selected.IsEmpty() ){ + Handle(SALOME_InteractiveObject) anIO = selected.First(); if(!anIO.IsNull()){ QString aTitle; SMESH_Actor::eControl aControl = SMESH_Actor::eNone; @@ -503,7 +534,11 @@ namespace{ switch ( theCommandID ){ case 6001: aTitle = QObject::tr( "LENGTH_EDGES" ); - aControl = SMESH_Actor::eLengthEdges; + aControl = SMESH_Actor::eLength; + break; + case 6018: + aTitle = QObject::tr( "LENGTH2D_EDGES" ); + aControl = SMESH_Actor::eLength2D; break; case 6002: aTitle = QObject::tr( "FREE_EDGES" ); @@ -517,6 +552,10 @@ namespace{ aTitle = QObject::tr( "MULTI_BORDERS" ); aControl = SMESH_Actor::eMultiConnection; break; + case 6019: + aTitle = QObject::tr( "MULTI2D_BORDERS" ); + aControl = SMESH_Actor::eMultiConnection2D; + break; case 6011: aTitle = QObject::tr( "AREA_ELEMENTS" ); aControl = SMESH_Actor::eArea; @@ -529,6 +568,10 @@ namespace{ aTitle = QObject::tr( "ASPECTRATIO_ELEMENTS" ); aControl = SMESH_Actor::eAspectRatio; break; + case 6017: + aTitle = QObject::tr( "ASPECTRATIO_3D_ELEMENTS" ); + aControl = SMESH_Actor::eAspectRatio3D; + break; case 6014: aTitle = QObject::tr( "MINIMUMANGLE_ELEMENTS" ); aControl = SMESH_Actor::eMinimumAngle; @@ -544,11 +587,12 @@ namespace{ } anActor->SetControlMode(aControl); anActor->GetScalarBarActor()->SetTitle(aTitle.latin1()); + SMESH::RepaintCurrentView(); } } } } - + bool CheckOIType(const Handle(SALOME_InteractiveObject) & theIO, MeshObjectType theType, @@ -556,25 +600,31 @@ namespace{ QString & theOutTypeName) { SMESH_TypeFilter aTypeFilter( theType ); - if ( aTypeFilter.IsOk( theIO )) { - theOutTypeName = theInTypeName; - return true; + QString entry; + if( !theIO.IsNull() ) + { + entry = theIO->getEntry(); + SalomeApp_DataOwner owner( entry ); + if ( aTypeFilter.isOk( &owner )) { + theOutTypeName = theInTypeName; + return true; + } } return false; } - + QString CheckTypeObject(const Handle(SALOME_InteractiveObject) & theIO) { - SALOMEDS::Study_var aStudy = SMESH::GetActiveStudyDocument(); - SALOMEDS::SObject_var aSObj = aStudy->FindObjectID(theIO->getEntry()); - if (!aSObj->_is_nil()) { - SALOMEDS::SComponent_var aSComp = aSObj->GetFatherComponent(); - CORBA::String_var anID = aSComp->GetID(); + _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); + _PTR(SObject) aSObj = aStudy->FindObjectID(theIO->getEntry()); + if (aSObj) { + _PTR(SComponent) aSComp = aSObj->GetFatherComponent(); + CORBA::String_var anID = aSComp->GetID().c_str(); if (!strcmp(anID.in(),theIO->getEntry())) return "Component"; } - + QString aTypeName; if ( CheckOIType ( theIO, HYPOTHESIS, "Hypothesis", aTypeName ) || @@ -584,25 +634,21 @@ namespace{ CheckOIType ( theIO, GROUP, "Group", aTypeName ) ) return aTypeName; - + return "NoType"; } QString CheckHomogeneousSelection() { - QAD_Study* aStudy = SMESH::GetActiveStudy(); - SALOME_Selection *aSel = SALOME_Selection::Selection(aStudy->getSelection()); - /* copy the list */ - SALOME_ListIO List; - SALOME_ListIteratorOfListIO Itinit(aSel->StoredIObjects()); - for (; Itinit.More(); Itinit.Next()) - { - List.Append(Itinit.Value()); - } - - QString RefType = CheckTypeObject(aSel->firstIObject()); - SALOME_ListIteratorOfListIO It(List); + //SUIT_Study* aStudy = SMESH::GetActiveStudy(); + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + QString RefType = CheckTypeObject(selected.First()); + SALOME_ListIteratorOfListIO It(selected); for (; It.More(); It.Next()) { Handle(SALOME_InteractiveObject) IObject = It.Value(); @@ -610,75 +656,99 @@ namespace{ if (Type.compare(RefType) != 0) return "Heterogeneous Selection"; } - - aSel->ClearIObjects(); - SALOME_ListIteratorOfListIO It1(List); - for (; It1.More(); It1.Next()) - { - int res = aSel->AddIObject(It1.Value()); - if (res == -1) - aStudy->highlight(It1.Value(), false); - if (res == 0) - aStudy->highlight(It1.Value(), true); - } + return RefType; } - void OnEditDelete() + + void SMESHGUI::OnEditDelete() { - if (QAD_MessageBox::warn2 - (QAD_Application::getDesktop(), + // 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 ); + + QString aParentComponent = QString::null; + for( SALOME_ListIteratorOfListIO anIt( selected ); anIt.More(); anIt.Next() ) + { + QString cur = anIt.Value()->getComponentDataType(); + if( aParentComponent.isNull() ) + aParentComponent = cur; + else if( !aParentComponent.isEmpty() && aParentComponent!=cur ) + aParentComponent = ""; + } + + if ( aParentComponent != SMESHGUI::GetSMESHGUI()->name() ) { + SUIT_MessageBox::warn1 ( SMESHGUI::desktop(), + QObject::tr("ERR_ERROR"), + QObject::tr("NON_SMESH_OBJECTS_SELECTED").arg( SMESHGUI::GetSMESHGUI()->moduleName() ), + QObject::tr("BUT_OK") ); + return; + } + // VSR 17/11/04: check if all objects selected belong to SMESH component <-- finish + if (SUIT_MessageBox::warn2 + (SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"), QObject::tr("SMESH_REALLY_DELETE"), QObject::tr("SMESH_BUT_YES"), QObject::tr("SMESH_BUT_NO"), 1, 0, 0) != 1) return; - QAD_Study* anActiveStudy = SMESH::GetActiveStudy(); - int nbSf = anActiveStudy->getStudyFramesCount(); - - SALOMEDS::Study_var aStudy = SMESH::GetActiveStudyDocument(); - SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); - SALOMEDS::GenericAttribute_var anAttr; - SALOMEDS::AttributeIOR_var anIOR; - - SALOME_Selection *Sel = SALOME_Selection::Selection(anActiveStudy->getSelection()); - SALOME_ListIteratorOfListIO It(Sel->StoredIObjects()); + SalomeApp_Application* anApp = dynamic_cast( SUIT_Session::session()->activeApplication() ); + SUIT_ViewManager* vm = anApp->activeViewManager(); + int nbSf = vm->getViewsCount(); + + _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); + _PTR(StudyBuilder) aStudyBuilder = aStudy->NewBuilder(); + _PTR(GenericAttribute) anAttr; + _PTR(AttributeIOR) anIOR; + + SALOME_ListIteratorOfListIO It(selected); + + aStudyBuilder->NewCommand(); // There is a transaction for(; It.More(); It.Next()){ Handle(SALOME_InteractiveObject) IObject = It.Value(); if(IObject->hasEntry()){ - SALOMEDS::SObject_var SO = aStudy->FindObjectID(IObject->getEntry()); - + _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 */ - SALOMEDS::ChildIterator_var it = aStudy->NewChildIterator(SO); - for(; it->More(); it->Next()){ - SALOMEDS::SObject_var CSO = it->Value(); + _PTR(ChildIterator) it = aStudy->NewChildIterator(SO); + for(it->InitEx(true); it->More(); it->Next()){ + _PTR(SObject) CSO = it->Value(); if(CSO->FindAttribute(anAttr, "AttributeIOR")){ - anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr); - + anIOR = anAttr; + + QPtrVector aViews = vm->getViews(); for(int i = 0; i < nbSf; i++){ - QAD_StudyFrame *sf = anActiveStudy->getStudyFrame(i); - CORBA::String_var anEntry = CSO->GetID(); + SUIT_ViewWindow *sf = aViews[i]; + CORBA::String_var anEntry = CSO->GetID().c_str(); if(SMESH_Actor* anActor = SMESH::FindActorByEntry(sf,anEntry.in())){ SMESH::RemoveActor(sf,anActor); } } } } - + /* Erase main graphical object */ + QPtrVector aViews = vm->getViews(); for(int i = 0; i < nbSf; i++){ - QAD_StudyFrame *sf = anActiveStudy->getStudyFrame(i); + SUIT_ViewWindow *sf = aViews[i]; if(SMESH_Actor* anActor = SMESH::FindActorByEntry(sf,IObject->getEntry())){ SMESH::RemoveActor(sf,anActor); } } - + // Remove object(s) from data structures - SALOMEDS::SObject_var obj = aStudy->FindObjectID(IObject->getEntry()); - if(!obj->_is_nil()){ - SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow(obj->GetObject()); - SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(obj->GetObject()); - + _PTR(SObject) obj = aStudy->FindObjectID(IObject->getEntry()); + 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 ); @@ -687,76 +757,96 @@ 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 - //QAD_Operation *op = new SALOMEGUI_ImportOperation(myActiveStudy); + //SUIT_Operation *op = new SALOMEGUI_ImportOperation(myActiveStudy); //op->start(); aStudyBuilder->RemoveObjectWithChildren( obj ); //op->finish(); } } - + } /* IObject->hasEntry() */ } /* more/next */ - + aStudyBuilder->CommitCommand(); + /* Clear any previous selection */ - Sel->ClearIObjects(); - anActiveStudy->updateObjBrowser(); - } + SALOME_ListIO l1; + aSel->setSelectedObjects( l1 ); + SMESHGUI::GetSMESHGUI()->updateObjBrowser(); + } +} +extern "C" { + Standard_EXPORT CAM_Module* createModule() + { + return new SMESHGUI(); + } } +SMESH::SMESH_Gen_var SMESHGUI::myComponentSMESH = SMESH::SMESH_Gen::_nil(); + //============================================================================= /*! * */ //============================================================================= -class CustomItem:public QCustomMenuItem +SMESHGUI::SMESHGUI() : +SalomeApp_Module( "SMESH" ) { - public: - CustomItem(const QString & s, const QFont & f):string(s), font(f) - { - }; - ~CustomItem() + if ( CORBA::is_nil( myComponentSMESH ) ) { + SALOME_LifeCycleCORBA* ls = new SALOME_LifeCycleCORBA( getApp()->namingService() ); + Engines::Component_var comp = ls->FindOrLoad_Component( "FactoryServer", "SMESH" ); + myComponentSMESH = SMESH::SMESH_Gen::_narrow( comp ); } - void paint(QPainter * p, const QColorGroup & /*cg */ , bool /*act */ , - bool /*enabled */ , int x, int y, int w, int h) - { - p->setFont(font); - p->drawText(x, y, w, h, - AlignHCenter | AlignVCenter | ShowPrefix | DontClip, string); - } + myActiveDialogBox = 0 ; + myState = -1 ; - QSize sizeHint() - { - return QFontMetrics(font). - size(AlignHCenter | AlignVCenter | ShowPrefix | DontClip, string); - } - private: - QString string; - QFont font; -}; + SMESH::GetFilterManager(); + SMESH::GetPattern(); + + /* load resources for all available meshers */ + SMESH::InitAvailableHypotheses(); +} //============================================================================= /*! * */ //============================================================================= -SMESHGUI::SMESHGUI( const QString& theName, QObject* theParent ) : - SALOMEGUI( theName, theParent ) +SMESHGUI::~SMESHGUI() { - myActiveDialogBox = 0 ; - myState = -1 ; + SMESH::GetFilterManager()->Destroy(); +} - SMESH::GetSMESHGen(); - SMESH::GetFilterManager(); - SMESH::GetPattern(); +//============================================================================= +/*! + * + */ +//============================================================================= +SalomeApp_SelectionMgr* SMESHGUI::selectionMgr() +{ + SalomeApp_Application* anApp = dynamic_cast( SUIT_Session::session()->activeApplication() ); + if( anApp ) + return dynamic_cast( anApp->selectionMgr() ); + else + return 0; +} - /* load resources for all available meshers */ - SMESH::InitAvailableHypotheses(); +bool SMESHGUI::automaticUpdate() +{ + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + if ( !resMgr ) + return false; + + return resMgr->booleanValue( "SMESH", "auto_update", false ); } //============================================================================= @@ -764,9 +854,9 @@ SMESHGUI::SMESHGUI( const QString& theName, QObject* theParent ) : * */ //============================================================================= -SMESHGUI::~SMESHGUI() +SUIT_ResourceMgr* SMESHGUI::resourceMgr() { - SMESH::GetFilterManager()->Destroy(); + return dynamic_cast( SUIT_Session::session()->resourceMgr() ); } //============================================================================= @@ -776,19 +866,32 @@ SMESHGUI::~SMESHGUI() //============================================================================= SMESHGUI* SMESHGUI::GetSMESHGUI() { - static SMESHGUI aSMESHGUI; - aSMESHGUI.myActiveStudy = SMESH::GetActiveStudy(); - SMESH::GetSMESHGen()->SetCurrentStudy( SMESH::GetActiveStudyDocument() ); + SMESHGUI* smeshMod = 0; + SalomeApp_Application* app = dynamic_cast(SUIT_Session::session()->activeApplication()); + if ( app ) + { + CAM_Module* module = app->module( "Mesh" ); + smeshMod = dynamic_cast( module ); + } - /* Automatic Update flag */ - aSMESHGUI.myAutomaticUpdate = ( QAD_CONFIG->getSetting( "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 SALOMEGUI* GetComponentGUI() { + Standard_EXPORT SMESHGUI* GetComponentGUI() + { return SMESHGUI::GetSMESHGUI(); } } @@ -800,8 +903,7 @@ extern "C" //============================================================================= void SMESHGUI::SetState(int aState) { - this->myState = aState; - return; + myState = aState; } //============================================================================= @@ -811,8 +913,7 @@ void SMESHGUI::SetState(int aState) //============================================================================= void SMESHGUI::ResetState() { - this->myState = -1; - return; + myState = -1; } //============================================================================= @@ -822,8 +923,7 @@ void SMESHGUI::ResetState() //============================================================================= void SMESHGUI::EmitSignalDeactivateDialog() { - emit this->SignalDeactivateActiveDialog(); - return; + emit SignalDeactivateActiveDialog(); } //============================================================================= @@ -833,8 +933,7 @@ void SMESHGUI::EmitSignalDeactivateDialog() //============================================================================= void SMESHGUI::EmitSignalStudyFrameChanged() { - emit this->SignalStudyFrameChanged(); - return; + emit SignalStudyFrameChanged(); } //============================================================================= @@ -845,7 +944,6 @@ void SMESHGUI::EmitSignalStudyFrameChanged() void SMESHGUI::EmitSignalCloseAllDialogs() { emit SignalCloseAllDialogs(); - return; } //============================================================================= @@ -855,7 +953,7 @@ void SMESHGUI::EmitSignalCloseAllDialogs() //============================================================================= QDialog *SMESHGUI::GetActiveDialogBox() { - return this->myActiveDialogBox; + return myActiveDialogBox; } //============================================================================= @@ -865,7 +963,7 @@ QDialog *SMESHGUI::GetActiveDialogBox() //============================================================================= void SMESHGUI::SetActiveDialogBox(QDialog * aDlg) { - this->myActiveDialogBox = (QDialog *) aDlg; + myActiveDialogBox = (QDialog *) aDlg; return; } @@ -874,19 +972,13 @@ void SMESHGUI::SetActiveDialogBox(QDialog * aDlg) * */ //============================================================================= -QAD_Study *SMESHGUI::GetActiveStudy() -{ - return this->myActiveStudy; -} - -//============================================================================= -/*! - * - */ -//============================================================================= -QAD_Desktop *SMESHGUI::GetDesktop() +SUIT_Desktop* SMESHGUI::desktop() { - return QAD_Application::getDesktop(); + SalomeApp_Application* app = dynamic_cast( SUIT_Session::session()->activeApplication() ); + if( app ) + return app->desktop(); + else + return 0; } //============================================================================= @@ -894,23 +986,13 @@ QAD_Desktop *SMESHGUI::GetDesktop() * */ //============================================================================= -bool SMESHGUI::ActiveStudyChanged(QAD_Desktop* parent) +SalomeApp_Study* SMESHGUI::activeStudy() { - MESSAGE("SMESHGUI::activeStudyChanged init."); - QAD_Study* prevStudy = myActiveStudy; - /* Create or retrieve an object SMESHGUI */ - MESSAGE("Active study changed : prev study =" << prevStudy); - SMESHGUI::GetSMESHGUI(); - EmitSignalStudyFrameChanged(); - MESSAGE("Active study changed : active study =" << myActiveStudy); - if ( prevStudy != myActiveStudy ) { - EmitSignalCloseAllDialogs(); - MESSAGE("Active study changed : SMESHGUI nullified" << endl); - //smeshGUI = 0; - SMESH::UpdateSelectionProp(); - } - MESSAGE("SMESHGUI::activeStudyChanged done."); - return true; + SUIT_Application* app = SUIT_Session::session()->activeApplication(); + if( app ) + return dynamic_cast( app->activeStudy() ); + else + return NULL; } //============================================================================= @@ -923,7 +1005,7 @@ bool SMESHGUI::DefineDlgPosition(QWidget * aDlg, int &x, int &y) /* Here the position is on the bottom right corner - 10 */ // aDlg->resize(QSize().expandedTo(aDlg->minimumSizeHint())); aDlg->adjustSize(); - QAD_Desktop *PP = QAD_Application::getDesktop(); + SUIT_Desktop *PP = desktop(); x = abs(PP->x() + PP->size().width() - aDlg->size().width() - 10); y = abs(PP->y() + PP->size().height() - aDlg->size().height() - 10); return true; @@ -934,14 +1016,14 @@ bool SMESHGUI::DefineDlgPosition(QWidget * aDlg, int &x, int &y) * */ //============================================================================= -static int isStudyLocked(const SALOMEDS::Study_var& theStudy){ +static int isStudyLocked(_PTR(Study) theStudy){ return theStudy->GetProperties()->IsLocked(); } -static bool checkLock(const SALOMEDS::Study_var& theStudy) { +static bool checkLock(_PTR(Study) theStudy) { if (isStudyLocked(theStudy)) { - QAD_MessageBox::warn1 ( (QWidget*)QAD_Application::getDesktop(), - QObject::tr("WRN_WARNING"), + SUIT_MessageBox::warn1 ( SMESHGUI::desktop(), + QObject::tr("WRN_WARNING"), QObject::tr("WRN_STUDY_LOCKED"), QObject::tr("BUT_OK") ); return true; @@ -951,12 +1033,12 @@ static bool checkLock(const SALOMEDS::Study_var& theStudy) { //======================================================================= //function : CheckActiveStudyLocked -//purpose : +//purpose : //======================================================================= -bool SMESHGUI::ActiveStudyLocked() +bool SMESHGUI::isActiveStudyLocked() { - SALOMEDS::Study_var aStudy = myActiveStudy->getStudyDocument(); + _PTR(Study) aStudy = activeStudy()->studyDS(); return checkLock( aStudy ); } @@ -965,38 +1047,57 @@ bool SMESHGUI::ActiveStudyLocked() * */ //============================================================================= -bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) +bool SMESHGUI::OnGUIEvent( int theCommandID ) { - SALOMEDS::Study_var aStudy = SMESH::GetActiveStudyDocument(); //Document OCAF de l'etude active + SalomeApp_Application* anApp = dynamic_cast( application() ); + if( !anApp ) + return false; + + _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); //Document OCAF de l'etude active + SUIT_ResourceMgr* mgr = resourceMgr(); + if( !mgr ) + return false; + + SUIT_ViewWindow* view = application()->desktop()->activeWindow(); + SVTK_ViewWindow* vtkwnd = dynamic_cast( view ); + + //QAction* act = action( theCommandID ); switch (theCommandID) { case 33: // DELETE if(checkLock(aStudy)) break; - ::OnEditDelete(); + OnEditDelete(); break; - + case 113: // IMPORT case 112: case 111: { if(checkLock(aStudy)) break; - ::ImportMeshesFromFile(parent,SMESH::GetSMESHGen(),theCommandID); + ::ImportMeshesFromFile(GetSMESHGen(),theCommandID); break; } case 122: // EXPORT MED case 121: case 123: + case 124: + case 125: + case 126: { - ::ExportMeshToFile(parent, theCommandID); + ::ExportMeshToFile(theCommandID); break; } case 200: // SCALAR BAR { - SALOME_Selection *Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() ); - if( Sel && Sel->IObjectCount() ) { - Handle(SALOME_InteractiveObject) anIO = Sel->firstIObject(); + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + if( selected.Extent() ) { + Handle(SALOME_InteractiveObject) anIO = selected.First(); if( anIO->hasEntry() ) { if( SMESH_Actor* anActor = SMESH::FindActorByEntry( anIO->getEntry() ) ) { anActor->SetControlMode( SMESH_Actor::eNone ); @@ -1007,27 +1108,38 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) } case 201: { - SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() ); - SMESHGUI_Preferences_ScalarBarDlg::ScalarBarProperties( parent, Sel ); + SMESHGUI_Preferences_ScalarBarDlg::ScalarBarProperties( this ); break; } case 1134: // Clipping case 1133: // Tranparency case 1132: // Colors / Size - case 215: - case 213: - case 212: - case 211: - { - ::SetViewMode(theCommandID); - break; - } + + // Display Mode + case 215: // Nodes + case 213: // Nodes + case 212: // Nodes + case 211: // Nodes + ::SetDisplayMode(theCommandID); + break; + + // Display Entity + case 217: // Edges + case 218: // Faces + case 219: // Volumes + case 220: // All Entity + ::SetDisplayEntity(theCommandID); + break; case 214: // UPDATE { if(checkLock(aStudy)) break; SMESH::UpdateView(); + + SALOME_ListIO l; + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + aSel->setSelectedObjects( l ); break; } @@ -1036,36 +1148,49 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) 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; } - - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { - SALOME_ListIteratorOfListIO It(Sel->StoredIObjects()); + + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if (aSel) + aSel->selectedObjects( selected ); + + if (vtkwnd) { + SALOME_ListIteratorOfListIO It (selected); 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; } } } - Sel->ClearIObjects(); + + if (anAction == SMESH::eErase) { + SALOME_ListIO l1; + aSel->setSelectedObjects( l1 ); + } + else + aSel->setSelectedObjects( selected ); break; } case 400: // NODES { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + + if ( vtkwnd ) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_NodesDlg *aDlg = new SMESHGUI_NodesDlg(parent, "", Sel); + + new SMESHGUI_NodesDlg(this); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); @@ -1075,100 +1200,101 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) case 2151: // FILTER { - if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) + if ( vtkwnd ) { EmitSignalDeactivateDialog(); - SMESHGUI_FilterDlg *aDlg = new SMESHGUI_FilterDlg( parent, SMESH::EDGE ); + new SMESHGUI_FilterDlg( this, SMESH::EDGE ); } break; } - + case 406: // MOVE NODE { - if ( myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK ) + if ( !vtkwnd ) { - QAD_MessageBox::warn1( GetDesktop(), tr( "SMESH_WRN_WARNING" ), + SUIT_MessageBox::warn1( desktop(), tr( "SMESH_WRN_WARNING" ), tr( "NOT_A_VTK_VIEWER" ),tr( "SMESH_BUT_OK" ) ); break; } - + if(checkLock(aStudy)) break; - SALOME_Selection *Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() ); - SMESHGUI_MoveNodesDlg *aDlg = new SMESHGUI_MoveNodesDlg( parent, Sel ); + new SMESHGUI_MoveNodesDlg(this); break; } - - case 701: // COMPUTE MESH + + case 701: // COMPUTE MESH { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - int nbSel = Sel->IObjectCount(); + if ( vtkwnd ) { + SalomeApp_SelectionMgr *Sel = selectionMgr(); + SALOME_ListIO selected; Sel->selectedObjects( selected ); + + int nbSel = selected.Extent(); if (nbSel != 1){ break; } SMESH::SMESH_Mesh_var aMesh; SMESH::SMESH_subMesh_var aSubMesh; - Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject(); + Handle(SALOME_InteractiveObject) IObject = selected.First(); if (IObject->hasEntry()){ - SALOMEDS::SObject_var aMeshSObj = aStudy->FindObjectID(IObject->getEntry()); + _PTR(SObject) aMeshSObj = aStudy->FindObjectID(IObject->getEntry()); GEOM::GEOM_Object_var aShapeObject = SMESH::GetShapeOnMeshOrSubMesh( aMeshSObj ); if ( aShapeObject->_is_nil() ) { // imported mesh break; } - if(!aMeshSObj->_is_nil()) { + 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(!SMESH::GetSMESHGen()->IsReadyToCompute(aMesh,refShapeObject)){ - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + 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 (SMESH::GetSMESHGen()->Compute(aMesh,refShapeObject)) + if (GetSMESHGen()->Compute(aMesh,refShapeObject)) SMESH::ModifiedMesh(aMeshSObj,true); // TO Do : change icon of all submeshes else - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_COMPUTE_FAILED"), tr("SMESH_BUT_OK")); } catch(const SALOME::SALOME_Exception & S_ex){ - QtCatchCorbaException(S_ex); + SalomeApp_Tools::QtCatchCorbaException(S_ex); } } }else if(!aSubMesh->_is_nil()){ aMesh = aSubMesh->GetFather(); GEOM::GEOM_Object_var refShapeObject = SMESH::GetShapeOnMeshOrSubMesh(aMeshSObj); if(!refShapeObject->_is_nil()){ - bool compute = SMESH::GetSMESHGen()->IsReadyToCompute(aMesh,refShapeObject); + bool compute = GetSMESHGen()->IsReadyToCompute(aMesh,refShapeObject); if(!compute){ - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_MISSING_PARAMETERS"), tr("SMESH_BUT_OK")); break; } try{ - if ( SMESH::GetSMESHGen()->Compute(aMesh,refShapeObject) ) + if ( GetSMESHGen()->Compute(aMesh,refShapeObject) ) SMESH::ModifiedMesh(aMeshSObj,true); // TO Do : change icon of all submeshes else - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_COMPUTE_FAILED"), tr("SMESH_BUT_OK")); }catch(const SALOME::SALOME_Exception & S_ex){ - QtCatchCorbaException(S_ex); + SalomeApp_Tools::QtCatchCorbaException(S_ex); } } } @@ -1176,116 +1302,73 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) } CORBA::Long anId = aStudy->StudyId(); TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,IObject->getEntry()); - if(myAutomaticUpdate && aVisualObj){ + if ( automaticUpdate() && aVisualObj){ aVisualObj->Update(); SMESH_Actor* anActor = SMESH::FindActorByEntry(IObject->getEntry()); if(!anActor){ anActor = SMESH::CreateActor(aStudy,IObject->getEntry()); if(anActor){ - SMESH::DisplayActor(myActiveStudy->getActiveStudyFrame(),anActor); //apo + SMESH::DisplayActor(view,anActor); //apo SMESH::FitAll(); } } + SMESH::RepaintCurrentView(); } }else{ - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } + updateObjBrowser(); break; } - case 702: // ADD SUB MESH + 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 { - if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { - EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_AddSubMeshDlg *aDlg = new SMESHGUI_AddSubMeshDlg(parent, "", Sel); - } - else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), - tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), - tr("SMESH_BUT_OK")); - } - break; - } - - case 703: // INIT MESH - { - if(checkLock(aStudy)) break; - EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_InitMeshDlg *aDlg = new SMESHGUI_InitMeshDlg(parent, "", Sel); - break; - } - - case 704: // EDIT Hypothesis - { - if(checkLock(aStudy)) break; - EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg(parent, "", Sel); - break; - } - - case 705: // EDIT Global Hypothesis - { - if(checkLock(aStudy)) break; - EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg(parent, "", Sel); - break; - } - - case 706: // EDIT Local Hypothesis - { - if(checkLock(aStudy)) break; - EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg(parent, "", Sel); - break; - } - - case 407: // DIAGONAL INVERSION - case 408: // Delete diagonal - { - if ( myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK ) - { - QAD_MessageBox::warn1( GetDesktop(), tr( "SMESH_WRN_WARNING" ), - tr( "NOT_A_VTK_VIEWER" ),tr( "SMESH_BUT_OK" ) ); - break; + if ( !vtkwnd ) + { + SUIT_MessageBox::warn1( desktop(), tr( "SMESH_WRN_WARNING" ), + tr( "NOT_A_VTK_VIEWER" ),tr( "SMESH_BUT_OK" ) ); + break; } if ( checkLock( aStudy ) ) break; - - SALOME_Selection *aSel = - SALOME_Selection::Selection( myActiveStudy->getSelection() ); + /*Standard_Boolean aRes; SMESH::SMESH_Mesh_var aMesh = SMESH::IObjectToInterface(IObject); if ( aMesh->_is_nil() ) { - QAD_MessageBox::warn1(GetDesktop(), tr( "SMESH_WRN_WARNING" ), + SUIT_MessageBox::warn1(GetDesktop(), tr( "SMESH_WRN_WARNING" ), tr( "SMESH_BAD_SELECTION" ), tr( "SMESH_BUT_OK" ) ); break; } */ EmitSignalDeactivateDialog(); if ( theCommandID == 407 ) - new SMESHGUI_TrianglesInversionDlg( parent, aSel ); + new SMESHGUI_TrianglesInversionDlg(this); else - new SMESHGUI_UnionOfTwoTrianglesDlg( parent, aSel ); + new SMESHGUI_UnionOfTwoTrianglesDlg(this); break; } case 409: // Change orientation case 410: // Union of triangles case 411: // Cutting of quadrangles { - if ( myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK ) + if ( !vtkwnd ) { - QAD_MessageBox::warn1( GetDesktop(), tr( "SMESH_WRN_WARNING" ), + SUIT_MessageBox::warn1( desktop(), tr( "SMESH_WRN_WARNING" ), tr( "NOT_A_VTK_VIEWER" ),tr( "SMESH_BUT_OK" ) ); break; } @@ -1293,17 +1376,14 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) if ( checkLock( aStudy ) ) break; - SALOME_Selection *aSel = - SALOME_Selection::Selection( myActiveStudy->getSelection() ); - EmitSignalDeactivateDialog(); - SMESHGUI_MultiEditDlg* aDlg; + SMESHGUI_MultiEditDlg* aDlg = NULL; if ( theCommandID == 409 ) - aDlg = new SMESHGUI_ChangeOrientationDlg( parent, aSel ); + aDlg = new SMESHGUI_ChangeOrientationDlg(this); else if ( theCommandID == 410 ) - aDlg = new SMESHGUI_UnionOfTrianglesDlg( parent, aSel ); + aDlg = new SMESHGUI_UnionOfTrianglesDlg(this); else - aDlg = new SMESHGUI_CuttingOfQuadsDlg( parent, aSel ); + aDlg = new SMESHGUI_CuttingOfQuadsDlg(this); int x, y ; DefineDlgPosition( aDlg, x, y ); @@ -1314,13 +1394,12 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) case 412: // Smoothing { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if( vtkwnd ) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_SmoothingDlg *aDlg = new SMESHGUI_SmoothingDlg(parent, "", Sel); + new SMESHGUI_SmoothingDlg( this ); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } @@ -1328,29 +1407,26 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) } case 413: // Extrusion { - if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if (checkLock(aStudy)) break; + if (vtkwnd) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_ExtrusionDlg *aDlg = new SMESHGUI_ExtrusionDlg(parent, "", Sel); - } - else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), - tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), - tr("SMESH_BUT_OK")); + new SMESHGUI_ExtrusionDlg ( this ); + } else { + SUIT_MessageBox::warn1(desktop(), + tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), + tr("SMESH_BUT_OK")); } break; } case 414: // Revolution { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if( vtkwnd ) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_RevolutionDlg *aDlg = new SMESHGUI_RevolutionDlg(parent, "", Sel); + new SMESHGUI_RevolutionDlg( this ); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } @@ -1360,49 +1436,84 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) { if ( checkLock( aStudy ) ) break; - if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) + if ( vtkwnd ) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection( - myActiveStudy->getSelection() ); - new SMESHGUI_MeshPatternDlg( parent, Sel ); + new SMESHGUI_MeshPatternDlg( this ); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } break; } + case 416: // Extrusion along a path + { + if (checkLock(aStudy)) break; + if (vtkwnd) { + EmitSignalDeactivateDialog(); + new SMESHGUI_ExtrusionAlongPathDlg( this ); + } else { + SUIT_MessageBox::warn1(desktop(), + tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), + tr("SMESH_BUT_OK")); + } + break; + } case 801: // CREATE 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(); SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_nil(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - int nbSel = Sel->IObjectCount(); + + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + int nbSel = selected.Extent(); if (nbSel == 1) { // check if mesh is selected - aMesh = SMESH::GetMeshByIO(Sel->firstIObject()); + aMesh = SMESH::GetMeshByIO( selected.First() ); } - SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg(parent, "", Sel, aMesh); + SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg( this, "", aMesh); aDlg->show(); break; } case 802: // CONSTRUCT 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(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - int nbSel = Sel->IObjectCount(); + + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + int nbSel = selected.Extent(); if (nbSel == 1) { // check if submesh is selected - Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject(); + Handle(SALOME_InteractiveObject) IObject = selected.First(); if (IObject->hasEntry()) { - SALOMEDS::SObject_var aSObj = aStudy->FindObjectID(IObject->getEntry()); - if(!aSObj->_is_nil()) { - SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(aSObj->GetObject()); + _PTR(SObject) aSObj = aStudy->FindObjectID(IObject->getEntry()); + if( aSObj ) { + SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( SMESH::SObjectToObject( aSObj ) ); if (!aSubMesh->_is_nil()) { try { SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather(); @@ -1414,24 +1525,25 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) // create group for each type o elements QString aName = IObject->getName(); if (aNodes->length() > 0) { - SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::NODE, aName); + SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::NODE, aName + "_Nodes"); aGroup->Add(aNodes.inout()); } if (aEdges->length() > 0) { - SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::EDGE, aName); + SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::EDGE, aName + "_Edges"); aGroup->Add(aEdges.inout()); } if (aFaces->length() > 0) { - SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::FACE, aName); + SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::FACE, aName + "_Faces"); aGroup->Add(aFaces.inout()); } if (aVolumes->length() > 0) { - SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::VOLUME, aName); + SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::VOLUME, aName + "_Volumes"); aGroup->Add(aVolumes.inout()); } - myActiveStudy->updateObjBrowser(true); + updateObjBrowser(); + }catch(const SALOME::SALOME_Exception & S_ex){ - QtCatchCorbaException(S_ex); + SalomeApp_Tools::QtCatchCorbaException(S_ex); } } } @@ -1442,11 +1554,22 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) 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(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SALOME_ListIO IOs; IOs = Sel->StoredIObjects(); // list copy - SALOME_ListIteratorOfListIO It (IOs); + + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + SALOME_ListIteratorOfListIO It (selected); int nbSelectedGroups = 0; for ( ; It.More(); It.Next() ) { @@ -1454,13 +1577,13 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) SMESH::IObjectToInterface(It.Value()); if (!aGroup->_is_nil()) { nbSelectedGroups++; - SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg(parent, "", Sel, aGroup); + SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg( this, "", aGroup); aDlg->show(); } } if (nbSelectedGroups == 0) { - SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg(parent, "", Sel, SMESH::SMESH_Group::_nil()); + SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg( this, "", SMESH::SMESH_Group::_nil()); aDlg->show(); } break; @@ -1490,207 +1613,107 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) 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; EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection( - myActiveStudy->getSelection() ); int aMode; if ( theCommandID == 810 ) aMode = SMESHGUI_GroupOpDlg::UNION; else if ( theCommandID == 811 ) aMode = SMESHGUI_GroupOpDlg::INTERSECT; else aMode = SMESHGUI_GroupOpDlg::CUT; - ( new SMESHGUI_GroupOpDlg( parent, Sel, aMode ) )->show(); + ( new SMESHGUI_GroupOpDlg( this, aMode ) )->show(); break; } 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; EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection( - myActiveStudy->getSelection() ); - ( new SMESHGUI_DeleteGroupDlg( parent, Sel ) )->show(); + new SMESHGUI_DeleteGroupDlg( this ); break; } case 900: // MESH INFOS { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = - SALOME_Selection::Selection(myActiveStudy->getSelection()); - if ( Sel->IObjectCount() > 1 ) { // a dlg for each IO - SALOME_ListIO IOs; IOs = Sel->StoredIObjects(); // list copy - SALOME_ListIteratorOfListIO It (IOs); + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + if ( selected.Extent() > 1 ) { // a dlg for each IO + SALOME_ListIO IOs; + SALOME_ListIteratorOfListIO It (selected); for ( ; It.More(); It.Next() ) { - Sel->ClearIObjects(); - Sel->AddIObject( It.Value() ); - SMESHGUI_MeshInfosDlg *aDlg = new SMESHGUI_MeshInfosDlg(parent, "", false); + IOs.Clear(); IOs.Append( It.Value() ); + aSel->setSelectedObjects( IOs ); + new SMESHGUI_MeshInfosDlg(this, "", false); } // restore selection - Sel->ClearIObjects(); - for (It.Initialize( IOs ) ; It.More(); It.Next() ) - Sel->AddIObject( It.Value() ); + aSel->setSelectedObjects( selected ); } else - SMESHGUI_MeshInfosDlg *aDlg = new SMESHGUI_MeshInfosDlg(parent, "", false); - break; - } - - case 1001: // AUTOMATIC UPDATE PREFERENCES - { - parent->menuBar()->setItemChecked(1001, !parent->menuBar()->isItemChecked(1001)); - if (parent->menuBar()->isItemChecked(1001)) { - QAD_CONFIG->addSetting("SMESH:AutomaticUpdate", "true"); - myAutomaticUpdate = true; - } - else { - QAD_CONFIG->addSetting("SMESH:AutomaticUpdate", "false"); - myAutomaticUpdate = false; - } + new SMESHGUI_MeshInfosDlg(this, "", false); break; } - case 1003: // MESH PREFERENCES + case 902: // STANDARD MESH INFOS { - ::SetDisplaySettings(); - break; - } - - case 1005: - { - SMESHGUI_Preferences_ScalarBarDlg::ScalarBarPreferences( parent ); - break; - } - - case 1007: - { - ( new SMESHGUI_PrecisionDlg( parent ) )->exec(); - break; - } - - case 1006: - { - SMESHGUI_Preferences_SelectionDlg* aDlg = - new SMESHGUI_Preferences_SelectionDlg(parent); - - QColor aColor; - QString SCr, SCg, SCb; - SCr = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorRed"); - SCg = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorGreen"); - SCb = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorBlue"); - if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty()) - aColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt()); - else aColor = Qt::cyan; - aDlg->SetColor(1, aColor); - - SCr = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorRed"); - SCg = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorGreen"); - SCb = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorBlue"); - if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty()) - aColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt()); - else aColor = Qt::yellow; - aDlg->SetColor(2, aColor); - - SCr = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorRed"); - SCg = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorGreen"); - SCb = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorBlue"); - if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty()) - aColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt()); - else aColor = Qt::white; - aDlg->SetColor(3, aColor); - - QString SW1 = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectWidth"); - if (SW1.isEmpty()) SW1 = "5"; - aDlg->SetWidth(1, SW1.toInt()); - - QString SW2 = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectWidth"); - if (SW2.isEmpty()) SW2 = "5"; - aDlg->SetWidth(2, SW2.toInt()); - - QString SP1 = QAD_CONFIG->getSetting("SMESH:SettingsNodeSelectTol"); - if (SP1.isEmpty()) SP1 = "0.025"; - aDlg->SetPrecision(1, SP1.toDouble()); - - QString SP2 = QAD_CONFIG->getSetting("SMESH:SettingsElementsSelectTol"); - if (SP2.isEmpty()) SP2 = "0.001"; - aDlg->SetPrecision(2, SP2.toDouble()); - - if (aDlg->exec()) { - QColor aPreColor = aDlg->GetColor(1); - QAD_CONFIG->addSetting("SMESH:SettingsPreSelectColorRed", aPreColor.red()); - QAD_CONFIG->addSetting("SMESH:SettingsPreSelectColorGreen", aPreColor.green()); - QAD_CONFIG->addSetting("SMESH:SettingsPreSelectColorBlue", aPreColor.blue()); - - QColor aSelColor = aDlg->GetColor(2); - QAD_CONFIG->addSetting("SMESH:SettingsItemSelectColorRed", aSelColor.red()); - QAD_CONFIG->addSetting("SMESH:SettingsItemSelectColorGreen", aSelColor.green()); - QAD_CONFIG->addSetting("SMESH:SettingsItemSelectColorBlue", aSelColor.blue()); - - QColor aHiColor = aDlg->GetColor(3); - QAD_CONFIG->addSetting("SMESH:SettingsSelectColorRed", aHiColor.red()); - QAD_CONFIG->addSetting("SMESH:SettingsSelectColorGreen", aHiColor.green()); - QAD_CONFIG->addSetting("SMESH:SettingsSelectColorBlue", aHiColor.blue()); - - int aPreWidth = aDlg->GetWidth(1); - QAD_CONFIG->addSetting("SMESH:SettingsPreSelectWidth", aPreWidth); - int aSelWidth = aDlg->GetWidth(2); - QAD_CONFIG->addSetting("SMESH:SettingsItemSelectWidth", aSelWidth); - - double aTolNodes = aDlg->GetPrecision(1); - QAD_CONFIG->addSetting("SMESH:SettingsNodeSelectTol", aTolNodes); - double aTolItems = aDlg->GetPrecision(2); - QAD_CONFIG->addSetting("SMESH:SettingsElementsSelectTol", aTolItems); - - // update current study settings - SMESH::UpdateSelectionProp(); - - QAD_StudyFrame* studyFrame = myActiveStudy->getActiveStudyFrame(); - if (studyFrame->getTypeView() == VIEW_VTK) { - VTKViewer_ViewFrame* aViewFrame = SMESH::GetVtkViewFrame(studyFrame); - // update VTK viewer properties - VTKViewer_RenderWindowInteractor* anInteractor = aViewFrame->getRWInteractor(); - if (anInteractor) { - anInteractor->SetSelectionProp(aSelColor.red()/255., aSelColor.green()/255., - aSelColor.blue()/255., aSelWidth); - anInteractor->SetSelectionTolerance(aTolNodes, aTolItems); - VTKViewer_InteractorStyleSALOME* aStyle = anInteractor->GetInteractorStyleSALOME(); - if (aStyle) - aStyle->setPreselectionProp(aPreColor.red()/255., aPreColor.green()/255., - aPreColor.blue()/255., aPreWidth); - } - // update actors - vtkRenderer* aRenderer = aViewFrame->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.); - } - } - } + EmitSignalDeactivateDialog(); + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + if ( selected.Extent() > 1 ) { // a dlg for each IO + SALOME_ListIO IOs; + SALOME_ListIteratorOfListIO It (selected); + for ( ; It.More(); It.Next() ) { + IOs.Clear(); + IOs.Append( It.Value() ); + aSel->setSelectedObjects( IOs ); + new SMESHGUI_StandardMeshInfosDlg( this, "", false); + } + // restore selection + aSel->setSelectedObjects( selected ); } - + else + new SMESHGUI_StandardMeshInfosDlg( this, "", false); break; - } - + } + case 1100: // EDIT HYPOTHESIS { if(checkLock(aStudy)) break; - SALOME_Selection *Sel = - SALOME_Selection::Selection(myActiveStudy->getSelection()); - int nbSel = Sel->IObjectCount(); + + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + int nbSel = selected.Extent(); if (nbSel == 1) { - SMESH::SMESH_Hypothesis_var Hyp = SMESH::IObjectToInterface(Sel->firstIObject()); + SMESH::SMESH_Hypothesis_var Hyp = SMESH::IObjectToInterface(selected.First()); /* Look for all mesh objects that have this hypothesis affected in order to flag as ModifiedMesh */ /* At end below '...->updateObjBrowser(true)' will change icon of mesh objects */ @@ -1709,6 +1732,7 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) } } } + updateObjBrowser( true ); break; } @@ -1716,65 +1740,76 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) { if ( checkLock( aStudy ) ) break; - - SALOME_Selection *Sel = - SALOME_Selection::Selection( myActiveStudy->getSelection() ); - - SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() ); + + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + SALOME_ListIteratorOfListIO It( selected ); for ( ; It.More(); It.Next() ) { Handle(SALOME_InteractiveObject) IObject = It.Value(); - SALOMEDS::SObject_var obj = aStudy->FindObjectID( IObject->getEntry() ); - SALOMEDS::GenericAttribute_var anAttr; - SALOMEDS::AttributeName_var aName; - if ( !obj->_is_nil() ) + _PTR(SObject) obj = aStudy->FindObjectID( IObject->getEntry() ); + _PTR(GenericAttribute) anAttr; + _PTR(AttributeName) aName; + if ( obj ) { if ( obj->FindAttribute(anAttr, "AttributeName") ) { - aName = SALOMEDS::AttributeName::_narrow( anAttr ); - QString newName = QString(aName->Value()); - newName = SALOMEGUI_NameDlg::getName( QAD_Application::getDesktop(), newName ); + aName = anAttr; + QString newName = QString(aName->Value().c_str()); + newName = SalomeApp_NameDlg::getName( desktop(), newName ); if ( !newName.isEmpty() ) { - myActiveStudy->renameIObject( IObject, newName ); + //old source: aStudy->renameIObject( IObject, newName ); + aName->SetValue( newName.latin1() ); // if current object is group update group's name SMESH::SMESH_GroupBase_var aGroup = SMESH::IObjectToInterface(IObject); if (!aGroup->_is_nil() ) aGroup->SetName( newName.latin1() ); + + updateObjBrowser(); } } } } break; } - + case 1102: // REMOVE HYPOTHESIS / ALGORITHMS { if(checkLock(aStudy)) break; - QAD_WaitCursor wc; - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SALOME_ListIteratorOfListIO It(Sel->StoredIObjects()); + SUIT_OverrideCursor wc; + + SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + if( aSel ) + aSel->selectedObjects( selected ); + + SALOME_ListIteratorOfListIO It(selected); for (int i = 0; It.More(); It.Next(), i++) { Handle(SALOME_InteractiveObject) IObject = It.Value(); SMESH::RemoveHypothesisOrAlgorithmOnMesh(IObject); } - Sel->ClearIObjects(); - myActiveStudy->updateObjBrowser(true); + SALOME_ListIO l1; + aSel->setSelectedObjects( l1 ); + updateObjBrowser(); break; } case 401: // GEOM::EDGE case 4021: // TRIANGLE case 4022: // QUAD + case 4023: // POLYGON case 4031: // TETRA case 4032: // HEXA { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if ( vtkwnd ) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); SMDSAbs_ElementType type = SMDSAbs_Edge; int nbNodes = 2; switch (theCommandID) { @@ -1784,31 +1819,46 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) type = SMDSAbs_Face; nbNodes = 4; break; case 4031: // TETRA type = SMDSAbs_Volume; nbNodes = 4; break; + case 4023: // POLYGON + type = SMDSAbs_Face; nbNodes = 5; break; // 5 - identificator for POLYGON case 4032: // HEXA type = SMDSAbs_Volume; nbNodes = 8; break; + case 4033: // POLYHEDRE + type = SMDSAbs_Volume; nbNodes = 9; break; // 9 - identificator for POLYHEDRE default:; } - SMESHGUI_AddMeshElementDlg *aDlg = - new SMESHGUI_AddMeshElementDlg(parent, "", Sel, type, nbNodes); + new SMESHGUI_AddMeshElementDlg( this, "", type, nbNodes); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), + tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), + tr("SMESH_BUT_OK")); + } + break; + } + case 4033: // POLYHEDRON + { + if(checkLock(aStudy)) break; + if ( vtkwnd ) { + EmitSignalDeactivateDialog(); + new SMESHGUI_CreatePolyhedralVolumeDlg(this, "", FALSE ); + } + else { + SUIT_MessageBox::warn1(SMESHGUI::desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } break; } - case 4041: // REMOVES NODES { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if ( vtkwnd ) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_RemoveNodesDlg *aDlg = new SMESHGUI_RemoveNodesDlg(parent, "", Sel); + new SMESHGUI_RemoveNodesDlg(this); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } @@ -1817,14 +1867,13 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) case 4042: // REMOVES ELEMENTS { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if( vtkwnd ) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_RemoveElementsDlg *aDlg = new SMESHGUI_RemoveElementsDlg(parent, "", Sel); + new SMESHGUI_RemoveElementsDlg(this); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } @@ -1833,14 +1882,13 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) case 4051: // RENUMBERING NODES { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if( vtkwnd ) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_RenumberingDlg *aDlg = new SMESHGUI_RenumberingDlg(parent, "", Sel, 0); + new SMESHGUI_RenumberingDlg( this, "", 0); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } @@ -1849,14 +1897,13 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) case 4052: // RENUMBERING ELEMENTS { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if ( vtkwnd ) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_RenumberingDlg *aDlg = new SMESHGUI_RenumberingDlg(parent, "", Sel, 1); + new SMESHGUI_RenumberingDlg( this, "", 1); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } @@ -1865,13 +1912,12 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) case 4061: // TRANSLATION { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if ( vtkwnd ) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_TranslationDlg *aDlg = new SMESHGUI_TranslationDlg(parent, "", Sel); + new SMESHGUI_TranslationDlg( this ); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } @@ -1880,13 +1926,12 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) case 4062: // ROTATION { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if( vtkwnd ) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_RotationDlg *aDlg = new SMESHGUI_RotationDlg(parent, "", Sel); + new SMESHGUI_RotationDlg( this ); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } @@ -1895,13 +1940,12 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) case 4063: // SYMMETRY { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if(vtkwnd) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_SymmetryDlg *aDlg = new SMESHGUI_SymmetryDlg(parent, "", Sel); + new SMESHGUI_SymmetryDlg( this ); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } @@ -1910,13 +1954,12 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) case 4064: // SEWING { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if(vtkwnd) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_SewingDlg *aDlg = new SMESHGUI_SewingDlg(parent, "", Sel); + new SMESHGUI_SewingDlg( this ); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } @@ -1925,37 +1968,34 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) case 4065: // MERGE NODES { if(checkLock(aStudy)) break; - if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + if(vtkwnd) { EmitSignalDeactivateDialog(); - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - SMESHGUI_MergeNodesDlg *aDlg = new SMESHGUI_MergeNodesDlg(parent, "", Sel); + new SMESHGUI_MergeNodesDlg( this ); } else { - QAD_MessageBox::warn1(QAD_Application::getDesktop(), + SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); } break; } - - - case 5000: // HYPOTHESIS - { - if(checkLock(aStudy)) break; - EmitSignalDeactivateDialog(); - SMESHGUI_CreateHypothesesDlg *aDlg = - new SMESHGUI_CreateHypothesesDlg (parent, "", FALSE, false); - break; - } - case 5010: // ALGO + case 4066: // MERGE EQUAL ELEMENTS { - if(checkLock(aStudy)) break; - EmitSignalDeactivateDialog(); - SMESHGUI_CreateHypothesesDlg *aDlg = - new SMESHGUI_CreateHypothesesDlg (parent, "", 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; } - + case 5105: // Library of selection filters { static QValueList aTypes; @@ -1966,26 +2006,32 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) aTypes.append( SMESH::FACE ); aTypes.append( SMESH::VOLUME ); } - new SMESHGUI_FilterLibraryDlg( parent, aTypes, SMESHGUI_FilterLibraryDlg::EDIT ); + new SMESHGUI_FilterLibraryDlg( this, SMESH::GetDesktop( this ), aTypes, SMESHGUI_FilterLibraryDlg::EDIT ); } break; - case 6016: // CONTROLS + case 6017: // CONTROLS + case 6016: case 6015: case 6014: case 6013: case 6012: case 6011: case 6001: + case 6018: + case 6019: case 6002: case 6003: - case 6004: - if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - if ( Sel->IObjectCount() == 1 && Sel->firstIObject()->hasEntry() ) { - SALOMEDS::SObject_var SO = aStudy->FindObjectID( Sel->firstIObject()->getEntry() ); - if ( !SO->_is_nil() ) { - CORBA::Object_var aObject = SO->GetObject(); + case 6004: + if ( vtkwnd ) { + + SalomeApp_SelectionMgr* mgr = selectionMgr(); + SALOME_ListIO selected; mgr->selectedObjects( selected ); + + if ( selected.Extent() == 1 && selected.First()->hasEntry() ) { + _PTR(SObject) SO = aStudy->FindObjectID( selected.First()->getEntry() ); + if ( SO ) { + CORBA::Object_var aObject = SMESH::SObjectToObject( SO ); SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( aObject ); SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( aObject ); SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( aObject ); @@ -1995,14 +2041,14 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) } } } - QAD_MessageBox::warn1(GetDesktop(), + SUIT_MessageBox::warn1(desktop(), tr( "SMESH_WRN_WARNING" ), - tr( "SMESH_BAD_SELECTION" ), + tr( "SMESH_BAD_SELECTION" ), tr( "SMESH_BUT_OK" ) ); break; } else { - QAD_MessageBox::warn1(GetDesktop(), + SUIT_MessageBox::warn1(desktop(), tr( "SMESH_WRN_WARNING" ), tr( "NOT_A_VTK_VIEWER" ), tr( "SMESH_BUT_OK" ) ); @@ -2010,9 +2056,11 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) break; case 9010: { - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - if (Sel->IObjectCount() == 1) { - Handle(SALOME_InteractiveObject) anIObject = Sel->firstIObject(); + SalomeApp_SelectionMgr* mgr = selectionMgr(); + SALOME_ListIO selected; mgr->selectedObjects( selected ); + + if (selected.Extent() == 1) { + Handle(SALOME_InteractiveObject) anIObject = selected.First(); if(anIObject->hasEntry()) if(SMESH_Actor *anActor = SMESH::FindActorByEntry(anIObject->getEntry())){ anActor->SetPointsLabeled( !anActor->GetPointsLabeled() ); @@ -2022,9 +2070,11 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) } case 9011: { - SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection()); - if (Sel->IObjectCount() == 1) { - Handle(SALOME_InteractiveObject) anIObject = Sel->firstIObject(); + SalomeApp_SelectionMgr* mgr = selectionMgr(); + SALOME_ListIO selected; mgr->selectedObjects( selected ); + + if (selected.Extent() == 1) { + Handle(SALOME_InteractiveObject) anIObject = selected.First(); if(anIObject->hasEntry()) if(SMESH_Actor *anActor = SMESH::FindActorByEntry(anIObject->getEntry())){ anActor->SetCellsLabeled( !anActor->GetCellsLabeled() ); @@ -2032,44 +2082,10 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) } break; } - case 10001: // DISPLAY MODE PREFERENCE - { - // Wireframe - parent->menuBar()->setItemChecked(10001, true); - parent->menuBar()->setItemChecked(10002, false); - parent->menuBar()->setItemChecked(10004, false); - parent->menuBar()->setItemEnabled(10003, true); - QAD_CONFIG->addSetting("SMESH:DisplayMode", "Wireframe"); - break; - } - case 10002: - { - parent->menuBar()->setItemChecked(10002, true); - parent->menuBar()->setItemChecked(10001, false); - parent->menuBar()->setItemChecked(10004, false); - parent->menuBar()->setItemEnabled(10003, true); - QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shading"); - break; - } - case 10003: - { - parent->menuBar()->setItemChecked(10003,!parent->menuBar()->isItemChecked(10003)); - QAD_CONFIG->addSetting("SMESH:Shrink", parent->menuBar()->isItemChecked(10003) ? "yes" : "no"); - break; - } - case 10004: - { - parent->menuBar()->setItemChecked(10001, false); - parent->menuBar()->setItemChecked(10004, true); - parent->menuBar()->setItemChecked(10002, false); - parent->menuBar()->setItemEnabled(10003, false); - QAD_CONFIG->addSetting("SMESH:DisplayMode", "Nodes"); - break; - } - } - myActiveStudy->updateObjBrowser(true); + anApp->updateActions(); //SRN: To update a Save button in the toolbar + //updateObjBrowser(); return true; } @@ -2078,8 +2094,7 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent) * */ //============================================================================= -bool SMESHGUI::OnMousePress(QMouseEvent * pe, QAD_Desktop * parent, - QAD_StudyFrame * studyFrame) +bool SMESHGUI::OnMousePress( QMouseEvent * pe, SUIT_ViewWindow * wnd ) { return false; } @@ -2089,8 +2104,7 @@ bool SMESHGUI::OnMousePress(QMouseEvent * pe, QAD_Desktop * parent, * */ //============================================================================= -bool SMESHGUI::OnMouseMove(QMouseEvent * pe, QAD_Desktop * parent, - QAD_StudyFrame * studyFrame) +bool SMESHGUI::OnMouseMove( QMouseEvent * pe, SUIT_ViewWindow * wnd ) { return true; } @@ -2100,379 +2114,946 @@ bool SMESHGUI::OnMouseMove(QMouseEvent * pe, QAD_Desktop * parent, * */ //============================================================================= -bool SMESHGUI::OnKeyPress(QKeyEvent * pe, QAD_Desktop * parent, - QAD_StudyFrame * studyFrame) +bool SMESHGUI::OnKeyPress( QKeyEvent * pe, SUIT_ViewWindow * wnd ) { return true; } //============================================================================= -/*! - * +/*! Method: BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO) + * Purpose: ensures that the actor for the given exists in the active VTK view */ //============================================================================= -bool SMESHGUI::SetSettings(QAD_Desktop * parent) +void SMESHGUI::BuildPresentation( const Handle(SALOME_InteractiveObject) & theIO, + SUIT_ViewWindow* wnd ) { - MESSAGE("SMESHGUI::SetSettings."); - SMESHGUI::GetSMESHGUI(); + if(theIO->hasEntry()){ + //SUIT_ViewWindow* wnd = SMESH::GetActiveWindow(); + SMESH::UpdateView(wnd,SMESH::eDisplay,theIO->getEntry()); + } +} - /* Display mode */ - QString DisplayMode = "Shading"; - if ( QAD_CONFIG->hasSetting("SMESH:DisplayMode") ) - DisplayMode = QAD_CONFIG->getSetting("SMESH:DisplayMode"); +//======================================================================= +// function : createSMESHAction +// purpose : +//======================================================================= +void SMESHGUI::createSMESHAction( const int id, const QString& po_id, const QString& icon_id, const int key, const bool toggle ) +{ + QIconSet icon; + QWidget* parent = application()->desktop(); + SUIT_ResourceMgr* resMgr = resourceMgr(); + QPixmap pix; + if ( icon_id.length() ) + pix = resMgr->loadPixmap( "SMESH", tr( icon_id ) ); else - QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shading"); - - bool Shrink = false; - if ( QAD_CONFIG->hasSetting("SMESH:Shrink") ) - Shrink = QAD_CONFIG->getSetting("SMESH:Shrink") == "yes"; - - if (DisplayMode == "Wireframe") { - // wireframe - parent->menuBar()->setItemChecked(10004, false); - parent->menuBar()->setItemChecked(10002, false); - parent->menuBar()->setItemChecked(10001, true); - parent->menuBar()->setItemEnabled(10003, true); - } - else if (DisplayMode == "Nodes") { - // poins - parent->menuBar()->setItemChecked(10004, true); - parent->menuBar()->setItemChecked(10002, false); - parent->menuBar()->setItemChecked(10001, false); - parent->menuBar()->setItemEnabled(10003, false); - } - else { - // default is shading - parent->menuBar()->setItemChecked(10004, false); - parent->menuBar()->setItemChecked(10002, true); - parent->menuBar()->setItemChecked(10001, false); - parent->menuBar()->setItemEnabled(10003, true); - } - parent->menuBar()->setItemChecked(10003, Shrink); + pix = resMgr->loadPixmap( "SMESH", tr( QString( "ICO_" )+po_id ), false ); + if ( !pix.isNull() ) + icon = QIconSet( pix ); - /* Automatic Update */ - QString AutoUpdate = QAD_CONFIG->getSetting("SMESH:AutomaticUpdate"); - if (AutoUpdate.compare("true") == 0) { - parent->menuBar()->setItemChecked(1001, true); - myAutomaticUpdate = true; - } - else { - parent->menuBar()->setItemChecked(1001, false); - myAutomaticUpdate = false; - } + QString tooltip = tr( QString( "TOP_" )+po_id ), + menu = tr( QString( "MEN_" )+po_id ), + status_bar = tr( QString( "STB_" )+po_id ); - /* Selection */ - SMESH::UpdateSelectionProp(); + createAction( id, tooltip, icon, menu, status_bar, key, parent, toggle, this, SLOT( OnGUIEvent() ) ); +} - /* menus disable */ - parent->menuBar()->setItemEnabled(111, false); // IMPORT DAT - //parent->menuBar()->setItemEnabled(112, false); // IMPORT UNV +//======================================================================= +// function : createPopupItem +// purpose : +//======================================================================= +void SMESHGUI::createPopupItem( const int id, + const QString& clients, + const QString& types, + const QString& theRule, + const int pId ) +{ + int parentId = pId; + if( pId!=-1 ) + parentId = popupMgr()->actionId( action( pId ) ); + + if( !popupMgr()->contains( popupMgr()->actionId( action( id ) ) ) ) + popupMgr()->insert( action( id ), parentId, 0 ); + + QChar lc = QtxPopupMgr::Selection::defEquality(); + QString rule = "(%1) and (%2) and (%3)"; + rule = rule.arg( QString( "%1>0" ).arg( QtxPopupMgr::Selection::defSelCountParam() ) ); + rule = rule.arg( QString( "%1client in {%2}" ).arg( lc ).arg( clients ) ); + rule = rule.arg( QString( "%1type in {%2}" ).arg( lc ).arg( types ) ); + rule += theRule; + + bool cont = myRules.contains( id ); + if( cont ) + rule = QString( "%1 or (%2)" ).arg( myRules[ id ] ).arg( rule ); + + popupMgr()->setRule( action( id ), rule, true ); + myRules[ id ] = QString( cont ? "%1" : "(%1)" ).arg( rule ); +} - return true; +//======================================================================= +// function : initialize +// purpose : +//======================================================================= +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) ); + createSMESHAction( 112, "UNV", "", (CTRL+Key_U) ); + createSMESHAction( 113, "MED", "", (CTRL+Key_M) ); + createSMESHAction( 114, "NUM" ); + createSMESHAction( 121, "DAT" ); + createSMESHAction( 122, "MED" ); + createSMESHAction( 123, "UNV" ); + createSMESHAction( 124, "EXPORT_DAT" ); + createSMESHAction( 125, "EXPORT_MED" ); + createSMESHAction( 126, "EXPORT_UNV" ); + createSMESHAction( 33, "DELETE", "ICON_DELETE" ); + createSMESHAction( 5105, "SEL_FILTER_LIB" ); + createSMESHAction( 701, "COMPUTE", "ICON_COMPUTE" ); + 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" ); + createSMESHAction( 804, "ADD" ); + createSMESHAction( 805, "REMOVE" ); + createSMESHAction( 810, "UN_GROUP", "ICON_UNION" ); + createSMESHAction( 811, "INT_GROUP", "ICON_INTERSECT" ); + createSMESHAction( 812, "CUT_GROUP", "ICON_CUT" ); + createSMESHAction( 813, "DEL_GROUP", "ICON_DEL_GROUP" ); + createSMESHAction( 900, "ADV_INFO", "ICON_ADV_INFO" ); + createSMESHAction( 902, "STD_INFO", "ICON_STD_INFO" ); + createSMESHAction( 6001, "LENGTH", "ICON_LENGTH" , 0, true ); + createSMESHAction( 6002, "FREE_EDGE", "ICON_FREE_EDGE" , 0, true ); + createSMESHAction( 6003, "FREE_BORDER", "ICON_FREE_EDGE_2D" , 0, true ); + createSMESHAction( 6004, "CONNECTION", "ICON_CONNECTION" , 0, true ); + createSMESHAction( 6011, "AREA", "ICON_AREA" , 0, true ); + createSMESHAction( 6012, "TAPER", "ICON_TAPER" , 0, true ); + createSMESHAction( 6013, "ASPECT", "ICON_ASPECT" , 0, true ); + createSMESHAction( 6014, "MIN_ANG", "ICON_ANGLE" , 0, true ); + createSMESHAction( 6015, "WARP", "ICON_WARP" , 0, true ); + createSMESHAction( 6016, "SKEW", "ICON_SKEW", 0, true ); + 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( 400, "NODE", "ICON_DLG_NODE" ); + createSMESHAction( 401, "EDGE", "ICON_DLG_EDGE" ); + createSMESHAction( 4021, "TRIANGLE", "ICON_DLG_TRIANGLE" ); + createSMESHAction( 4022, "QUAD", "ICON_DLG_QUADRANGLE" ); + createSMESHAction( 4023, "POLYGON", "ICON_DLG_POLYGON" ); + createSMESHAction( 4031, "TETRA", "ICON_DLG_TETRAS" ); + createSMESHAction( 4032, "HEXA", "ICON_DLG_HEXAS" ); + createSMESHAction( 4041, "REMOVE_NODES", "ICON_DLG_REM_NODE" ); + createSMESHAction( 4042, "REMOVE_ELEMENTS", "ICON_DLG_REM_ELEMENT" ); + createSMESHAction( 4051, "RENUM_NODES", "ICON_DLG_RENUMBERING_NODES" ); + createSMESHAction( 4052, "RENUM_ELEMENTS", "ICON_DLG_RENUMBERING_ELEMENTS" ); + createSMESHAction( 4061, "TRANS", "ICON_SMESH_TRANSLATION_VECTOR" ); + createSMESHAction( 4062, "ROT", "ICON_DLG_ROTATION" ); + 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" ); + createSMESHAction( 409, "ORIENT", "ICON_DLG_MESH_ORIENTATION" ); + createSMESHAction( 410, "UNION", "ICON_UNIONTRI" ); + createSMESHAction( 411, "CUT", "ICON_CUTQUAD" ); + createSMESHAction( 412, "SMOOTH", "ICON_DLG_SMOOTHING" ); + createSMESHAction( 413, "EXTRUSION", "ICON_EXTRUSION" ); + createSMESHAction( 414, "REVOLUTION", "ICON_REVOLUTION" ); + createSMESHAction( 415, "MAP", "ICON_MAP" ); + createSMESHAction( 416, "EXTRUSION_ALONG", "ICON_EXTRUSION_ALONG" ); + createSMESHAction( 200, "RESET" ); + createSMESHAction( 201, "SCALAR_BAR_PROP" ); + createSMESHAction( 211, "WIRE", "ICON_WIRE", 0, true ); + createSMESHAction( 212, "SHADE", "ICON_SHADE", 0, true ); + createSMESHAction( 213, "SHRINK", "ICON_SHRINK", 0, true ); + createSMESHAction( 214, "UPDATE", "ICON_UPDATE" ); + createSMESHAction( 215, "NODES", "ICON_POINTS", 0, true ); + createSMESHAction( 217, "EDGES", "ICON_DLG_EDGE", 0, true ); + createSMESHAction( 218, "FACES", "ICON_DLG_TRIANGLE", 0, true ); + createSMESHAction( 219, "VOLUMES", "ICON_DLG_TETRAS", 0, true ); + 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" ); + createSMESHAction( 1132, "COLORS" ); + createSMESHAction( 1133, "TRANSP" ); + createSMESHAction( 1134, "CLIP" ); + createSMESHAction( 1135, "DISP_ENT" ); + createSMESHAction( 2000, "CTRL" ); + + createSMESHAction( 300, "ERASE" ); + createSMESHAction( 301, "DISPLAY" ); + createSMESHAction( 302, "DISPLAY_ONLY" ); + createSMESHAction( 4033, "POLYHEDRON", "ICON_DLG_POLYHEDRON" ); + + // ----- create menu -------------- + int fileId = createMenu( tr( "MEN_FILE" ), -1, 1 ), + editId = createMenu( tr( "MEN_EDIT" ), -1, 3 ), + toolsId = createMenu( tr( "MEN_TOOLS" ), -1, 5, 50 ), + meshId = createMenu( tr( "MEN_MESH" ), -1, 70, 10 ), + ctrlId = createMenu( tr( "MEN_CTRL" ), -1, 60, 10 ), + modifyId = createMenu( tr( "MEN_MODIFY" ), -1, 40, 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 ); + + createMenu( 111, importId, -1 ); + createMenu( 112, importId, -1 ); + createMenu( 113, importId, -1 ); + + createMenu( 121, exportId, -1 ); + createMenu( 122, exportId, -1 ); + createMenu( 123, exportId, -1 ); + + createMenu( separator(), fileId, 10 ); + + createMenu( 33, editId, -1 ); + + createMenu( 5105, toolsId, -1 ); + + createMenu( 702, meshId, -1 ); + createMenu( 703, meshId, -1 ); + createMenu( 704, meshId, -1 ); + createMenu( separator(), meshId, -1 ); + createMenu( 701, meshId, -1 ); + createMenu( separator(), meshId, -1 ); + createMenu( 801, meshId, -1 ); + createMenu( 802, meshId, -1 ); + createMenu( 803, meshId, -1 ); + createMenu( separator(), meshId, -1 ); + createMenu( 810, meshId, -1 ); + createMenu( 811, meshId, -1 ); + createMenu( 812, meshId, -1 ); + createMenu( separator(), meshId, -1 ); + createMenu( 813, meshId, -1 ); + createMenu( separator(), meshId, -1 ); + createMenu( 900, meshId, -1 ); + createMenu( 902, meshId, -1 ); + createMenu( separator(), meshId, -1 ); + + createMenu( 6003, ctrlId, -1 ); + createMenu( 6001, ctrlId, -1 ); + createMenu( 6004, ctrlId, -1 ); + createMenu( separator(), ctrlId, -1 ); + createMenu( 6002, ctrlId, -1 ); + createMenu( 6018, ctrlId, -1 ); + createMenu( 6019, ctrlId, -1 ); + createMenu( 6011, ctrlId, -1 ); + createMenu( 6012, ctrlId, -1 ); + createMenu( 6013, ctrlId, -1 ); + createMenu( 6014, ctrlId, -1 ); + createMenu( 6015, ctrlId, -1 ); + createMenu( 6016, ctrlId, -1 ); + createMenu( separator(), ctrlId, -1 ); + createMenu( 6017, ctrlId, -1 ); + createMenu( separator(), ctrlId, -1 ); + + createMenu( 400, addId, -1 ); + createMenu( 401, addId, -1 ); + createMenu( 4021, addId, -1 ); + createMenu( 4022, addId, -1 ); + createMenu( 4023, addId, -1 ); + createMenu( 4031, addId, -1 ); + createMenu( 4032, addId, -1 ); + createMenu( 4033, addId, -1 ); + + createMenu( 4041, removeId, -1 ); + createMenu( 4042, removeId, -1 ); + + createMenu( 4051, renumId, -1 ); + createMenu( 4052, renumId, -1 ); + + createMenu( 4061, transfId, -1 ); + createMenu( 4062, transfId, -1 ); + createMenu( 4063, transfId, -1 ); + createMenu( 4064, transfId, -1 ); + createMenu( 4065, transfId, -1 ); + createMenu( 4066, transfId, -1 ); + + createMenu( 406, modifyId, -1 ); + createMenu( 407, modifyId, -1 ); + createMenu( 408, modifyId, -1 ); + createMenu( 409, modifyId, -1 ); + createMenu( 410, modifyId, -1 ); + createMenu( 411, modifyId, -1 ); + createMenu( 412, modifyId, -1 ); + createMenu( 413, modifyId, -1 ); + createMenu( 416, modifyId, -1 ); + createMenu( 414, modifyId, -1 ); + createMenu( 415, modifyId, -1 ); + + createMenu( 214, viewId, -1 ); + + // ----- create toolbars -------------- + int meshTb = createTool( tr( "TB_MESH" ) ), + ctrlTb = createTool( tr( "TB_CTRL" ) ), + addRemTb = createTool( tr( "TB_ADD_REMOVE" ) ), + modifyTb = createTool( tr( "TB_MODIFY" ) ), + dispModeTb = createTool( tr( "TB_DISP_MODE" ) ); + + createTool( 702, meshTb ); + createTool( 703, meshTb ); + createTool( 704, meshTb ); + createTool( separator(), meshTb ); + createTool( 701, meshTb ); + createTool( separator(), meshTb ); + createTool( 801, meshTb ); + createTool( 802, meshTb ); + createTool( 803, meshTb ); + createTool( separator(), meshTb ); + createTool( 900, meshTb ); + createTool( 902, meshTb ); + createTool( separator(), meshTb ); + + createTool( 6001, ctrlTb ); + createTool( 6003, ctrlTb ); + createTool( 6004, ctrlTb ); + createTool( separator(), ctrlTb ); + createTool( 6002, ctrlTb ); + createTool( 6018, ctrlTb ); + createTool( 6019, ctrlTb ); + createTool( 6011, ctrlTb ); + createTool( 6012, ctrlTb ); + createTool( 6013, ctrlTb ); + createTool( 6014, ctrlTb ); + createTool( 6015, ctrlTb ); + createTool( 6016, ctrlTb ); + createTool( separator(), ctrlTb ); + createTool( 6017, ctrlTb ); + createTool( separator(), ctrlTb ); + + createTool( 400, addRemTb ); + createTool( 401, addRemTb ); + createTool( 4021, addRemTb ); + createTool( 4022, addRemTb ); + createTool( 4023, addRemTb ); + createTool( 4031, addRemTb ); + createTool( 4032, addRemTb ); + createTool( 4033, addRemTb ); + createTool( separator(), addRemTb ); + createTool( 4041, addRemTb ); + createTool( 4042, addRemTb ); + createTool( separator(), addRemTb ); + createTool( 4051, addRemTb ); + createTool( 4052, addRemTb ); + createTool( separator(), addRemTb ); + createTool( 4061, addRemTb ); + createTool( 4062, addRemTb ); + createTool( 4063, addRemTb ); + createTool( 4064, addRemTb ); + createTool( 4065, addRemTb ); + createTool( 4066, addRemTb ); + createTool( separator(), addRemTb ); + + createTool( 406, modifyTb ); + createTool( 407, modifyTb ); + createTool( 408, modifyTb ); + createTool( 409, modifyTb ); + createTool( 410, modifyTb ); + createTool( 411, modifyTb ); + createTool( 412, modifyTb ); + createTool( 413, modifyTb ); + createTool( 416, modifyTb ); + createTool( 414, modifyTb ); + createTool( 415, modifyTb ); + + createTool( 214, dispModeTb ); + + + myRules.clear(); + QString OB = "'ObjectBrowser'", + View = "'" + SVTK_Viewer::Type() + "'", + pat = "'%1'", + mesh = pat.arg( SMESHGUI_Selection::typeName( MESH ) ), + group = pat.arg( SMESHGUI_Selection::typeName( GROUP ) ), + hypo = pat.arg( SMESHGUI_Selection::typeName( HYPOTHESIS ) ), + algo = pat.arg( SMESHGUI_Selection::typeName( ALGORITHM ) ), + elems = QString( "'%1' '%2' '%3' '%4' '%5'" ). + arg( SMESHGUI_Selection::typeName( SUBMESH_VERTEX ) ). + arg( SMESHGUI_Selection::typeName( SUBMESH_EDGE ) ). + arg( SMESHGUI_Selection::typeName( SUBMESH_FACE ) ). + arg( SMESHGUI_Selection::typeName( SUBMESH_SOLID ) ). + arg( SMESHGUI_Selection::typeName( SUBMESH_COMPOUND ) ), + subMesh = elems, + mesh_group = mesh + " " + subMesh + " " + group, + hyp_alg = hypo + " " + algo; + + // popup for object browser + + 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 + createPopupItem( 214, OB, mesh_group ); // UPDATE + createPopupItem( 900, OB, mesh_group ); // ADV_INFO + createPopupItem( 902, OB, mesh ); // STD_INFO + popupMgr()->insert( separator(), -1, 0 ); + createPopupItem( 801, OB, mesh ); // CREATE_GROUP + createPopupItem( 802, OB, subMesh ); // CONSTRUCT_GROUP + popupMgr()->insert( separator(), -1, 0 ); + 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 + createPopupItem( 33, OB, subMesh + " " + group ); // DELETE + popupMgr()->insert( separator(), -1, 0 ); + + // popup for viewer + createPopupItem( 803, View, group ); // EDIT_GROUP + createPopupItem( 804, View, elems ); // ADD + createPopupItem( 805, View, elems ); // REMOVE + popupMgr()->insert( separator(), -1, 0 ); + createPopupItem( 214, View, mesh_group ); // UPDATE + createPopupItem( 900, View, mesh_group ); // ADV_INFO + createPopupItem( 902, View, mesh ); // STD_INFO + popupMgr()->insert( separator(), -1, 0 ); + + int anId; + QString + isInvisible("not( isVisible )"), + isEmpty("numberOfNodes = 0"), + isNotEmpty("numberOfNodes <> 0"), + + // has nodes, edges, etc in VISIBLE! actor + hasNodes("(numberOfNodes > 0 )"),//&& isVisible)"), + hasElems("(count( elemTypes ) > 0)"), + hasDifferentElems("(count( elemTypes ) > 1)"), + hasEdges("({'Edge'} in elemTypes)"), + hasFaces("({'Face'} in elemTypes)"), + hasVolumes("({'Volume'} in elemTypes)"); + + 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; + + //------------------------------------------------- + // 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 ), "{'Point'} in labeledTypes", false ); + + popupMgr()->insert( action( 9011 ), anId, -1 ); + popupMgr()->setRule( action( 9011 ), aMeshInVTK + "&& isVisible &&" + hasElems, true ); + popupMgr()->setRule( action( 9011 ), "{'Cell'} in labeledTypes", false ); + + popupMgr()->insert( separator(), -1, -1 ); + + //------------------------------------------------- + // Display Mode + //------------------------------------------------- + anId = popupMgr()->insert( tr( "MEN_DISPMODE" ), -1, -1 ); + + popupMgr()->insert( action( 211 ), anId, -1 ); // WIRE + popupMgr()->setRule( action( 211 ), aMeshInVTK + "&&" + hasElems, true ); + popupMgr()->setRule( action( 211 ), "displayMode = 'eEdge'", false ); + + popupMgr()->insert( action( 212 ), anId, -1 ); // SHADE + popupMgr()->setRule( action( 212 ),aMeshInVTK+ "&& (" + hasFaces + "||" + hasVolumes + ")",true); + popupMgr()->setRule( action( 212 ), "displayMode = 'eSurface'", false ); + + popupMgr()->insert( action( 215 ), anId, -1 ); // POINTS + popupMgr()->setRule( action( 215 ), aMeshInVTK + "&&" + hasNodes, true ); + popupMgr()->setRule( action( 215 ), "displayMode = 'ePoint'", false ); + + popupMgr()->insert( separator(), anId, -1 ); + + popupMgr()->insert( action( 213 ), anId, -1 ); // SHRINK + popupMgr()->setRule( action( 213 ), aMeshInVTK + "&& shrinkMode <> 'IsNotShrinkable' && displayMode <> 'ePoint'",true); + popupMgr()->setRule( action( 213 ), "shrinkMode = 'IsShrunk'", false ); + + //------------------------------------------------- + // Display Entity + //------------------------------------------------- + QString aDiffElemsInVTK = aMeshInVTK + "&&" + hasDifferentElems; + + anId = popupMgr()->insert( tr( "MEN_DISP_ENT" ), -1, -1 ); + + popupMgr()->insert( action( 217 ), anId, -1 ); // EDGES + 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 + "&& isVisible &&" + hasFaces, true ); + popupMgr()->setRule( action( 218 ), "{'Face'} in entityMode", false ); + + popupMgr()->insert( action( 219 ), anId, -1 ); // VOLUMES + 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 + "&& isVisible && not( elemTypes in entityMode )", true ); + + //------------------------------------------------- + // Color / Size + //------------------------------------------------- + popupMgr()->insert( action( 1132 ), -1, -1 ); + popupMgr()->setRule( action( 1132 ), aMeshInVTK + "&& isVisible", true ); + + //------------------------------------------------- + // Transparency + //------------------------------------------------- + popupMgr()->insert( action( 1133 ), -1, -1 ); + popupMgr()->setRule( action( 1133 ), aMeshInVTK + "&& isVisible", true ); + + //------------------------------------------------- + // Clipping + //------------------------------------------------- + popupMgr()->insert( action( 1134 ), -1, -1 ); + popupMgr()->setRule( action( 1134 ), aMeshInVTK + "&& isVisible", true ); + + popupMgr()->insert( separator(), -1, -1 ); + + //------------------------------------------------- + // Controls + //------------------------------------------------- + QString + aMeshInVtkHasEdges = aMeshInVTK + "&&" + hasEdges, + aMeshInVtkHasFaces = aMeshInVTK + "&&" + hasFaces, + aMeshInVtkHasVolumes = aMeshInVTK + "&&" + hasVolumes; + + anId = popupMgr()->insert( tr( "MEN_CTRL" ), -1, -1 ); + + popupMgr()->insert( action( 200 ), anId, -1 ); // RESET + popupMgr()->setRule( action( 200 ), aMeshInVTK + "&& controlMode <> 'eNone'", true ); + + popupMgr()->insert( separator(), anId, -1 ); + + popupMgr()->insert( action( 6003 ), anId, -1 ); // FREE_BORDER + popupMgr()->setRule( action( 6003 ), aMeshInVtkHasEdges, true ); + popupMgr()->setRule( action( 6003 ), "controlMode = 'eFreeEdges'", false ); + + popupMgr()->insert( action( 6001 ), anId, -1 ); // LENGTH + popupMgr()->setRule( action( 6001 ), aMeshInVtkHasEdges, true ); + popupMgr()->setRule( action( 6001 ), "controlMode = 'eLength'", false ); + + popupMgr()->insert( action( 6004 ), anId, -1 ); // CONNECTION + popupMgr()->setRule( action( 6004 ), aMeshInVtkHasEdges, true ); + popupMgr()->setRule( action( 6004 ), "controlMode = 'eMultiConnection'", false ); + + popupMgr()->insert( separator(), anId, -1 ); + + popupMgr()->insert( action( 6002 ), anId, -1 ); // FREE_EDGE + popupMgr()->setRule( action( 6002 ), aMeshInVtkHasFaces, true ); + popupMgr()->setRule( action( 6002 ), "controlMode = 'eFreeBorders'", false ); + + popupMgr()->insert( action( 6018 ), anId, -1 ); // LENGTH_2D + popupMgr()->setRule( action( 6018 ), aMeshInVtkHasFaces, true ); + popupMgr()->setRule( action( 6018 ), "controlMode = 'eLength2D'", false ); + + popupMgr()->insert( action( 6019 ), anId, -1 ); // CONNECTION_2D + popupMgr()->setRule( action( 6019 ), aMeshInVtkHasFaces, true ); + popupMgr()->setRule( action( 6019 ), "controlMode = 'eMultiConnection2D'", false ); + + popupMgr()->insert( action( 6011 ), anId, -1 ); // AREA + popupMgr()->setRule( action( 6011 ), aMeshInVtkHasFaces, true ); + popupMgr()->setRule( action( 6011 ), "controlMode = 'eArea'", false ); + + popupMgr()->insert( action( 6012 ), anId, -1 ); // TAPER + popupMgr()->setRule( action( 6012 ), aMeshInVtkHasFaces, true ); + popupMgr()->setRule( action( 6012 ), "controlMode = 'eTaper'", false ); + + popupMgr()->insert( action( 6013 ), anId, -1 ); // ASPECT + popupMgr()->setRule( action( 6013 ), aMeshInVtkHasFaces, true ); + popupMgr()->setRule( action( 6013 ), "controlMode = 'eAspectRatio'", false ); + + popupMgr()->insert( action( 6014 ), anId, -1 ); // MIN_ANG + popupMgr()->setRule( action( 6014 ), aMeshInVtkHasFaces, true ); + popupMgr()->setRule( action( 6014 ), "controlMode = 'eMinimumAngle'", false ); + + popupMgr()->insert( action( 6015 ), anId, -1 ); // WARP + popupMgr()->setRule( action( 6015 ), aMeshInVtkHasFaces, true ); + popupMgr()->setRule( action( 6015 ), "controlMode = 'eWarping'", false ); + + popupMgr()->insert( action( 6016 ), anId, -1 ); // SKEW + popupMgr()->setRule( action( 6016 ), aMeshInVtkHasFaces, true ); + popupMgr()->setRule( action( 6016 ), "controlMode = 'eSkew'", false ); + + popupMgr()->insert( separator(), anId, -1 ); + + popupMgr()->insert( action( 6017 ), anId, -1 ); // ASPECT_3D + popupMgr()->setRule( action( 6017 ), aMeshInVtkHasVolumes, true ); + popupMgr()->setRule( action( 6017 ), "controlMode = 'eAspectRatio3D'", false ); + + popupMgr()->insert( separator(), anId, -1 ); + + popupMgr()->insert( action( 201 ), anId, -1 ); // SCALAR_BAR_PROP + popupMgr()->setRule( action( 201 ), aMeshInVTK + "&& controlMode <> 'eNone'", true ); + + popupMgr()->insert( separator(), -1, -1 ); + + //------------------------------------------------- + // Display / Erase + //------------------------------------------------- + aClient = "($client in {'VTKViewer' 'ObjectBrowser'})"; + QString anActiveVTK = QString("activeView = '%1'").arg(VTKViewer_Viewer::Type()); + QString aSelCount = QString( "%1 > 0" ).arg( QtxPopupMgr::Selection::defSelCountParam() ); + QString aRule = aClient + " and " + aType + " and " + aSelCount + " and " + anActiveVTK; + popupMgr()->insert( action( 301 ), -1, -1 ); // DISPLAY + popupMgr()->setRule( action( 301 ), aRule + "&&" + isNotEmpty + "&&" + isInvisible, true); + + popupMgr()->insert( action( 300 ), -1, -1 ); // ERASE + popupMgr()->setRule( action( 300 ), aRule + "&&" + isNotEmpty + "&& isVisible", true ); + + popupMgr()->insert( action( 302 ), -1, -1 ); // DISPLAY_ONLY + popupMgr()->setRule( action( 302 ), aRule + "&&" + isNotEmpty, true ); + + popupMgr()->insert( separator(), -1, -1 ); + + connect( application(), SIGNAL( viewManagerAdded( SUIT_ViewManager* ) ), + this, SLOT( onViewManagerAdded( SUIT_ViewManager* ) ) ); } -//============================================================================= -/*! - * - */ -//============================================================================= -void SMESHGUI::DefinePopup(QString & theContext, QString & theParent, QString & theObject) +bool SMESHGUI::activateModule( SUIT_Study* study ) { - // NRI : Temporary added - // if ( myStudy->GetProperties()->IsLocked() ) { - // theObject = "NothingSelected"; - // theContext = "NothingSelected"; - // } - // NRI - - SALOME_Selection *Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() ); - int nbSel = Sel->IObjectCount(); - switch ( nbSel ) { - case 0: - theObject = "NothingSelected"; - theContext = "NothingSelected"; - break; - case 1: - if ( myState == 800 && Sel->HasIndex( Sel->firstIObject() ) ) - theObject = "Elements"; - else - theObject = ::CheckTypeObject( Sel->firstIObject() ); - theContext = ""; - break; - default: - theObject = ::CheckHomogeneousSelection(); - theContext = ""; - } + bool res = SalomeApp_Module::activateModule( study ); + + setMenuShown( true ); + setToolShown( true ); + + return res; } -//============================================================================= -/*! - * - */ -//============================================================================= -bool SMESHGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString& theContext, - const QString& theParent, const QString& theObject) +bool SMESHGUI::deactivateModule( SUIT_Study* study ) { - // get active study frame - QAD_StudyFrame* studyFrame = myActiveStudy->getActiveStudyFrame(); + setMenuShown( false ); + setToolShown( false ); + + EmitSignalCloseAllDialogs(); - // get parent component which selected object(s) belongs to - QString parentComp = ( (SALOMEGUI_Desktop*)parent )->getComponentFromSelection(); + return SalomeApp_Module::deactivateModule( study ); +} - // get selection - SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() ); - int nbSel = Sel->IObjectCount(); +void SMESHGUI::OnGUIEvent() +{ + const QObject* obj = sender(); + if ( !obj || !obj->inherits( "QAction" ) ) + return; + int id = actionId((QAction*)obj); + if ( id != -1 ) + OnGUIEvent( id ); +} - if ( nbSel == 0 ) { - popup->clear(); - } - else if ( nbSel == 1 ) { - if ( parentComp != parent->getActiveComponent() ) { - // object not belongs to SMESH module - remove all commands except common Display/Erase... - while ( 1 ) { - int id = popup->idAt( 0 ); - if ( id <= QAD_TopLabel_Popup_ID ) - popup->removeItemAt( 0 ); - else - break; - } - } - else { - // get selected interactive object - Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject(); - SALOMEDS::SObject_var SO = SMESH::GetActiveStudyDocument()->FindObjectID( IObject->getEntry() ); - // find popup menu's TopLabel item - int topItem = popup->indexOf( QAD_TopLabel_Popup_ID ); - if ( topItem >= 0 ) { - if ( theParent == "Viewer" ) { - // set bold font for popup menu's TopLabel item (Viewer popup) - QFont fnt = QApplication::font(); fnt.setBold( TRUE ); - popup->removeItem( QAD_TopLabel_Popup_ID ); - popup->insertItem( new CustomItem( QString( IObject->getName() ), fnt ), QAD_TopLabel_Popup_ID, topItem ); - } - else if ( theParent == "ObjectBrowser" ) { - // remove popup menu's TopLabel item (Object Browser popup) - popup->removeItem( QAD_TopLabel_Popup_ID ); - } - } +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; +} - if ( theObject == "Hypothesis" || theObject == "Algorithm" ) { - // remove Display/Erase commands - popup->removeItem( QAD_Display_Popup_ID ); - popup->removeItem( QAD_DisplayOnly_Popup_ID ); - popup->removeItem( QAD_Erase_Popup_ID ); - // remove "Unassign ..." command if hyp/algo is not assigned - if ( SO->_is_nil() || !IObject->hasReference()/* !IsReferencedObject( SO ) */) - popup->removeItem( 1102 ); - } - else if ( theObject == "Mesh" || theObject == "SubMesh" || theObject == "Group" ) { - // get actor - GEOM::GEOM_Object_var aShapeObject = SMESH::GetShapeOnMeshOrSubMesh( SO ); - if ( aShapeObject->_is_nil() ) { - // imported mesh - popup->removeItem( 701 ); // Compute - popup->removeItem( 705 ); // Edit hypothesis - popup->removeItem( 706 ); // ... - } - SMESH::SMESH_GroupOnGeom_var aGeomGroup = - SMESH::SMESH_GroupOnGeom::_narrow( SO->GetObject() ); - if ( !aGeomGroup->_is_nil() ) // group linked on geometry - popup->removeItem( 803 ); // EDIT GROUP - - SMESH_Actor* ac = SMESH::FindActorByEntry(IObject->getEntry()); - // if object has actor - if ( ac && studyFrame->getTypeView() == VIEW_VTK ) { - VTKViewer_RenderWindowInteractor* myRenderInter = SMESH::GetCurrentVtkView()->getRWInteractor(); - if ( myRenderInter->isVisible( IObject ) ) { - popup->removeItem( QAD_Display_Popup_ID ); - popup->setItemChecked( 9010, ac->GetPointsLabeled() ); // Numbering / Display Nodes # - popup->setItemChecked( 9011, ac->GetCellsLabeled() ); // Numbering / Display Elements # - TVisualObjPtr aVisualObj = ac->GetObject(); - int aNbEdges = aVisualObj->GetNbEntities(SMESH::EDGE); - int aNbFaces = aVisualObj->GetNbEntities(SMESH::FACE); - int aNbVolumes = aVisualObj->GetNbEntities(SMESH::VOLUME); - QMenuItem* mi = popup->findItem( 1131 ); - if ( mi && mi->popup() ) { - int prType = ac->GetRepresentation(); - // Display Mode / Wireframe - if(!aNbFaces && !aNbVolumes && !aNbEdges){ - mi->popup()->removeItem( 211 ); - }else{ - mi->popup()->setItemChecked( 211, prType == SMESH_Actor::eEdge ); - } - // Display Mode / Shading - if(!aNbFaces && !aNbVolumes){ - mi->popup()->removeItem( 212 ); - }else{ - mi->popup()->setItemChecked( 212, prType == SMESH_Actor::eSurface ); - } - // Display Mode / Points - mi->popup()->setItemChecked( 215, prType == SMESH_Actor::ePoint ); - // Display Mode / Shrink - bool isShrunk = ac->IsShrunk(); - bool isShrunkable = ac->IsShrunkable(); - mi->popup()->setItemChecked( 213, isShrunk ); - mi->popup()->setItemEnabled( 213, prType != SMESH_Actor::ePoint && isShrunkable); - } - // Scalar Bar - mi = popup->findItem( 2000 ); - if ( mi && mi->popup() ) { - SMESH_Actor::eControl cMode = ac->GetControlMode(); - switch ( cMode ) { - case SMESH_Actor::eLengthEdges: - mi->popup()->setItemChecked( 6001, true ); break; - case SMESH_Actor::eFreeEdges: - mi->popup()->setItemChecked( 6002, true ); - mi->popup()->removeItem( 201 ); - break; - case SMESH_Actor::eFreeBorders: - mi->popup()->setItemChecked( 6003, true ); - mi->popup()->removeItem( 201 ); - break; - case SMESH_Actor::eMultiConnection: - mi->popup()->setItemChecked( 6004, true ); break; - case SMESH_Actor::eArea: - mi->popup()->setItemChecked( 6011, true ); break; - case SMESH_Actor::eTaper: - mi->popup()->setItemChecked( 6012, true ); break; - case SMESH_Actor::eAspectRatio: - mi->popup()->setItemChecked( 6013, true ); break; - case SMESH_Actor::eMinimumAngle: - mi->popup()->setItemChecked( 6014, true ); break; - case SMESH_Actor::eWarping: - mi->popup()->setItemChecked( 6015, true ); break; - case SMESH_Actor::eSkew: - mi->popup()->setItemChecked( 6016, true ); break; - case SMESH_Actor::eNone: - default: - mi->popup()->removeItem( 200 ); - mi->popup()->removeItem( 201 ); - break; - } - TVisualObjPtr aVisualObj = ac->GetObject(); - if(!aNbEdges){ - mi->popup()->removeItem( 6001 ); - mi->popup()->removeItem( 6003 ); - mi->popup()->removeItem( 6004 ); - } - if(!aNbFaces){ - mi->popup()->removeItem( 6002 ); - mi->popup()->removeItem( 6011 ); - mi->popup()->removeItem( 6012 ); - mi->popup()->removeItem( 6013 ); - mi->popup()->removeItem( 6014 ); - mi->popup()->removeItem( 6015 ); - mi->popup()->removeItem( 6016 ); - } - if(!aNbFaces && !aNbEdges) - popup->removeItem( 2000 ); // Scalar Bar - } - } - else { - popup->removeItem( QAD_Erase_Popup_ID ); - popup->removeItem( 114 ); // Numbering popup menu - popup->removeItem( 1131 ); // Display mode - popup->removeItem( 1132 ); // Color / size - popup->removeItem( 1133 ); // Transparency - popup->removeItem( 1134 ); // Clipping - popup->removeItem( 2000 ); // Scalar Bar - } - } - else { - // object doesn't have actor - CORBA::Object_var anObject = SO->GetObject(); - bool bDisplay = false; - if ( !CORBA::is_nil( anObject ) ) { - SMESH::SMESH_Mesh_var aMeshObj = SMESH::SMESH_Mesh::_narrow( anObject ); - if ( !aMeshObj->_is_nil() && ( aMeshObj->NbNodes() > 0 || aMeshObj->NbFaces() > 0 || aMeshObj->NbVolumes() > 0 ) ) - bDisplay = true; - SMESH::SMESH_subMesh_var aSubMeshObj = SMESH::SMESH_subMesh::_narrow( anObject ); - if ( !aSubMeshObj->_is_nil() && ( aSubMeshObj->GetNumberOfNodes(false) > 0 || aSubMeshObj->GetNumberOfElements() > 0 ) ) - bDisplay = true; - SMESH::SMESH_GroupBase_var aGroupObj = SMESH::SMESH_GroupBase::_narrow( anObject ); - if ( !aGroupObj->_is_nil() && aGroupObj->Size() > 0 ) - bDisplay = true; - } - if ( !bDisplay ) { - popup->removeItem( QAD_Display_Popup_ID ); - popup->removeItem( QAD_DisplayOnly_Popup_ID ); - } - popup->removeItem( QAD_Erase_Popup_ID ); - popup->removeItem( 114 ); // Numbering popup menu - popup->removeItem( 1131 ); // Display mode - popup->removeItem( 1132 ); // Color / size - popup->removeItem( 1133 ); // Transparency - popup->removeItem( 1134 ); // Clipping - popup->removeItem( 2000 ); // Scalar Bar - } - } - else if( theObject!="Component" ) { - // another SMESH object - popup->removeItem( QAD_Display_Popup_ID ); - popup->removeItem( QAD_DisplayOnly_Popup_ID ); - popup->removeItem( QAD_Erase_Popup_ID ); - } - } - } - else { - // multiple selection - if ( parentComp != parent->getActiveComponent() ) { - // object not belongs to SMESH module - remove all commands except common Display/Erase... - while ( 1 ) { - int id = popup->idAt( 0 ); - if ( id <= QAD_TopLabel_Popup_ID ) - popup->removeItemAt( 0 ); - else - break; - } - if ( parentComp.isNull() ) { - // objects from different components are selected - popup->removeItem( QAD_DisplayOnly_Popup_ID ); - popup->removeItem( QAD_Display_Popup_ID ); - popup->removeItem( QAD_Erase_Popup_ID ); - } - } - else { - QString type = ::CheckHomogeneousSelection(); - if ( type != "Heterogeneous Selection" ) { - int topItem = popup->indexOf( QAD_TopLabel_Popup_ID ); - if ( topItem >= 0 ) { - // set bold font for popup menu's TopLabel item - QFont fnt = QApplication::font(); fnt.setBold( TRUE ); - popup->removeItem( QAD_TopLabel_Popup_ID ); - popup->insertItem( new CustomItem( QString("%1 ").arg( nbSel ) + type + "(s) ", fnt ), QAD_TopLabel_Popup_ID, topItem ); - } - } - } - } - return false; +QString SMESHGUI::engineIOR() const +{ + CORBA::ORB_var anORB = getApp()->orb(); + CORBA::String_var anIOR = anORB->object_to_string(GetSMESHGen()); + return anIOR.in(); } -//============================================================================= -/*! Method: BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO) - * Purpose: ensures that the actor for the given exists in the active VTK view - */ -//============================================================================= -void SMESHGUI::BuildPresentation( const Handle(SALOME_InteractiveObject) & theIO, - QAD_ViewFrame* ) +void SMESHGUI::contextMenuPopup( const QString& client, QPopupMenu* menu, QString& /*title*/ ) { - if(theIO->hasEntry()){ - QAD_Study* aStudy = SMESHGUI::GetSMESHGUI()->GetActiveStudy(); - QAD_StudyFrame *aStudyFrame = aStudy->getActiveStudyFrame(); - SMESH::UpdateView(aStudyFrame,SMESH::eDisplay,theIO->getEntry()); - } + SMESHGUI_Selection sel; + sel.init( client, selectionMgr() ); + popupMgr()->updatePopup( menu, &sel ); } -void SMESHGUI::SupportedViewType(int *buffer, int bufferSize) +void SMESHGUI::windows( QMap& aMap ) const { - if (!buffer || !bufferSize) - return; - buffer[0] = (int)VIEW_VTK; + aMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::DockLeft ); + aMap.insert( SalomeApp_Application::WT_PyConsole, Qt::DockBottom ); +} + +void SMESHGUI::viewManagers( QStringList& list ) const +{ + list.append( SVTK_Viewer::Type() ); +} + +void SMESHGUI::onViewManagerAdded( SUIT_ViewManager* mgr ) +{ + if ( dynamic_cast( mgr ) ) + SMESH::UpdateSelectionProp( this ); +} + +void SMESHGUI::createPreferences() +{ + int genTab = addPreference( tr( "PREF_TAB_GENERAL" ) ); + + int updateGroup = addPreference( tr( "PREF_GROUP_UPDATE" ), genTab ); + addPreference( tr( "PREF_AUTO_UPDATE" ), updateGroup, SalomeApp_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_PRECISION_USE" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "use_precision" ); + + int precGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), genTab ); + setPreferenceProperty( precGroup, "columns", 1 ); + + 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( "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" ); + + 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" ) ); + 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" ); + 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 ) +{ +} + +//================================================================================ +/*! + * \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 +* SalomeApp_UpdateFlags enumeration ). +*/ +//================================================================================ +void SMESHGUI::update( const int flags ) +{ + if ( flags & UF_Viewer | flags & UF_Forced ) + SMESH::UpdateView(); + else + SalomeApp_Module::update( flags ); } -void SMESHGUI::Deactivate() +//================================================================================ +/*! + * \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. +*/ +//================================================================================ +SalomeApp_Operation* SMESHGUI::createOperation( const int id ) const { - if ( SMESHGUI::GetSMESHGUI() ) { - SMESHGUI::GetSMESHGUI()->EmitSignalCloseAllDialogs(); + SalomeApp_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; } + + return op; } + + + + + + + +