#include "SMESHGUI_PrecisionDlg.h"
#include "SMESHGUI_Selection.h"
#include "SMESHGUI_CreatePolyhedralVolumeDlg.h"
+#include "SMESHGUI_MeshOp.h"
#include "SMESHGUI_Utils.h"
#include "SMESHGUI_GEOMGenUtils.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 <SVTK_ViewWindow.h>
}
anActor->SetControlMode(aControl);
anActor->GetScalarBarActor()->SetTitle(aTitle.latin1());
+ SMESH::RepaintCurrentView();
}
}
}
}
}
}
- SALOME_ListIO l1;
- aSel->setSelectedObjects( l1 );
+
+ if (anAction == SMESH::eErase) {
+ SALOME_ListIO l1;
+ aSel->setSelectedObjects( l1 );
+ }
+ else
+ aSel->setSelectedObjects( selected );
break;
}
SMESH::FitAll();
}
}
+ SMESH::RepaintCurrentView();
}
}else{
SUIT_MessageBox::warn1(desktop(),
break;
}
- case 702: // ADD SUB MESH
- {
- if(checkLock(aStudy)) break;
- if( vtkwnd ) {
- EmitSignalDeactivateDialog();
- new SMESHGUI_AddSubMeshDlg( this );
- }
- else {
- SUIT_MessageBox::warn1(desktop(),
- tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
- tr("SMESH_BUT_OK"));
- }
- break;
- }
-
- case 703: // INIT MESH
- {
- if(checkLock(aStudy)) break;
- EmitSignalDeactivateDialog();
- new SMESHGUI_InitMeshDlg( this );
- break;
- }
-
- case 704: // EDIT Hypothesis
- {
- if(checkLock(aStudy)) break;
- EmitSignalDeactivateDialog();
- new SMESHGUI_EditHypothesesDlg( this );
- break;
- }
-
- case 705: // EDIT Global Hypothesis
- {
- if(checkLock(aStudy)) break;
- EmitSignalDeactivateDialog();
- new SMESHGUI_EditHypothesesDlg( this );
- break;
- }
-
- case 706: // EDIT Local Hypothesis
- {
- if(checkLock(aStudy)) break;
- EmitSignalDeactivateDialog();
- new SMESHGUI_EditHypothesesDlg( this );
- break;
- }
-
+ case 702: // Create mesh
+ startOperation( 702 );
+ break;
+ case 703: // Create sub-mesh
+ startOperation( 703 );
+ break;
+ case 704: // Edit mesh/sub-mesh
+ startOperation( 704 );
+ break;
case 407: // DIAGONAL INVERSION
case 408: // Delete diagonal
{
break;
}
-
- case 5000: // HYPOTHESIS
- {
- if(checkLock(aStudy)) break;
- EmitSignalDeactivateDialog();
- new SMESHGUI_CreateHypothesesDlg ( this, "", FALSE, false );
- break;
- }
- case 5010: // ALGO
- {
- if(checkLock(aStudy)) break;
- EmitSignalDeactivateDialog();
- new SMESHGUI_CreateHypothesesDlg ( this, "", FALSE, true);
- break;
- }
-
case 5105: // Library of selection filters
{
static QValueList<int> aTypes;
break;
}
}
+
+ anApp->updateActions(); //SRN: To update a Save button in the toolbar
//updateObjBrowser();
return true;
}
createSMESHAction( 126, "EXPORT_UNV" );
createSMESHAction( 33, "DELETE", "ICON_DELETE" );
createSMESHAction( 5105, "SEL_FILTER_LIB" );
- createSMESHAction( 5000, "CREATE_HYPO", "ICON_HYPO" );
- createSMESHAction( 5010, "CREATE_ALG", "ICON_PATTERN_2d" );
createSMESHAction( 701, "COMPUTE", "ICON_COMPUTE" );
- createSMESHAction( 702, "LOCAL_HYPO", "ICON_DLG_ADD_SUBMESH" );
- createSMESHAction( 703, "GLOBAL_HYPO", "ICON_DLG_INIT_MESH" );
- createSMESHAction( 704, "EDIT_HYPO", "ICON_DLG_EDIT_MESH" );
- createSMESHAction( 705, "EDIT_GLOBAL_HYPO","ICON_DLG_EDIT_MESH" );
- createSMESHAction( 706, "EDIT_LOCAL_HYPO", "ICON_DLG_EDIT_MESH" );
+ createSMESHAction( 702, "CREATE_MESH", "ICON_DLG_INIT_MESH" );
+ createSMESHAction( 703, "CREATE_SUBMESH", "ICON_DLG_ADD_SUBMESH" );
+ createSMESHAction( 704, "EDIT_MESHSUBMESH","ICON_DLG_EDIT_MESH" );
createSMESHAction( 801, "CREATE_GROUP", "ICON_SMESH_TREE_GROUP" );
createSMESHAction( 802, "CONSTRUCT_GROUP", "ICON_CONSTRUCT_GROUP" );
createSMESHAction( 803, "EDIT_GROUP", "ICON_EDIT_GROUP" );
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" );
int fileId = createMenu( tr( "MEN_FILE" ), -1, 1 ),
editId = createMenu( tr( "MEN_EDIT" ), -1, 3 ),
toolsId = createMenu( tr( "MEN_TOOLS" ), -1, 5, 50 ),
- hypoId = createMenu( tr( "MEN_HYPO" ), -1, 50, 10 ),
meshId = createMenu( tr( "MEN_MESH" ), -1, 70, 10 ),
ctrlId = createMenu( tr( "MEN_CTRL" ), -1, 60, 10 ),
modifyId = createMenu( tr( "MEN_MODIFY" ), -1, 40, 10 ),
createMenu( 5105, toolsId, -1 );
- createMenu( 5000, hypoId, -1 );
- createMenu( 5010, hypoId, -1 );
-
- createMenu( 703, meshId, -1 );
createMenu( 702, meshId, -1 );
+ createMenu( 703, meshId, -1 );
createMenu( 704, meshId, -1 );
createMenu( separator(), meshId, -1 );
createMenu( 701, meshId, -1 );
// ----- create toolbars --------------
int meshTb = createTool( tr( "TB_MESH" ) ),
- hypoTb = createTool( tr( "TB_HYPO" ) ),
ctrlTb = createTool( tr( "TB_CTRL" ) ),
addRemTb = createTool( tr( "TB_ADD_REMOVE" ) ),
modifyTb = createTool( tr( "TB_MODIFY" ) ),
dispModeTb = createTool( tr( "TB_DISP_MODE" ) );
- createTool( 703, meshTb );
createTool( 702, meshTb );
+ createTool( 703, meshTb );
createTool( 704, meshTb );
createTool( separator(), meshTb );
createTool( 701, meshTb );
createTool( 902, meshTb );
createTool( separator(), meshTb );
- createTool( 5000, hypoTb );
- createTool( 5010, hypoTb );
-
createTool( 6001, ctrlTb );
createTool( 6003, ctrlTb );
createTool( 6004, ctrlTb );
// popup for object browser
- createPopupItem( 705, OB, mesh, "&& isComputable"); // EDIT_GLOBAL_HYPO
- createPopupItem( 706, OB, subMesh, "&& isComputable" ); // EDIT_LOCAL_HYPO
+ createPopupItem( 704, OB, mesh, "&& isComputable"); // EDIT_MESHSUBMESH
+ createPopupItem( 704, OB, subMesh, "&& isComputable" ); // EDIT_MESHSUBMESH
createPopupItem( 803, OB, group ); // EDIT_GROUP
popupMgr()->insert( separator(), -1, 0 );
createPopupItem( 701, OB, mesh, "&& isComputable" ); // COMPUTE
createPopupItem( 801, OB, mesh ); // CREATE_GROUP
createPopupItem( 802, OB, subMesh ); // CONSTRUCT_GROUP
popupMgr()->insert( separator(), -1, 0 );
- createPopupItem( 1100, OB, hypo ); // EDIT HYPOTHESIS
- createPopupItem( 1102, OB, hyp_alg, "&& hasReference" ); // REMOVE HYPOTHESIS / ALGORITHMS
- createPopupItem( 1101, OB, mesh_group + " " + hyp_alg ); // RENAME
+ createPopupItem( 1100, OB, hypo, "&& $hasReference={false}" ); // EDIT HYPOTHESIS
+ createPopupItem( 1102, OB, hyp_alg ); // REMOVE HYPOTHESIS / ALGORITHMS
+ createPopupItem( 1101, OB, mesh_group + " " + hyp_alg, "&& $hasReference={false}" ); // RENAME
popupMgr()->insert( separator(), -1, 0 );
createPopupItem( 125, OB, mesh ); // EXPORT_MED
createPopupItem( 126, OB, mesh ); // EXPORT_UNV
{
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_AUTO_UPDATE" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "auto_update" );
-
+ addPreference( tr( "PREF_PRECISION_USE" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "use_precision" );
+
int precGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), genTab );
setPreferenceProperty( precGroup, "columns", 1 );
- addPreference( tr( "PREF_PRECISION_USE" ), precGroup, SalomeApp_Preferences::Bool );
int prec = addPreference( tr( "PREF_PRECISION_VALUE" ), precGroup, SalomeApp_Preferences::IntSpin, "SMESH", "controls_precision" );
setPreferenceProperty( prec, "min", 0 );
QStringList modes;
modes.append( "Wireframe" );
modes.append( "Shading" );
- modes.append( "Shrink" );
modes.append( "Nodes" );
+ modes.append( "Shrink" );
+ QValueList<QVariant> 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 );
QStringList orients;
orients.append( tr( "SMESH_VERTICAL" ) );
orients.append( tr( "SMESH_HORIZONTAL" ) );
- QValueList<QVariant> indices; indices.append( 0 ); indices.append( 1 );
+ indices.clear(); indices.append( 0 ); indices.append( 1 );
setPreferenceProperty( orient, "strings", orients );
setPreferenceProperty( orient, "indexes", indices );
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 );
+}
+
+//================================================================================
+/*!
+ * \brief Set default selection mode
+*
+* SLOT called when operation commited. Sets default selection mode
+*/
+//================================================================================
+void SMESHGUI::onOperationCommited( SUIT_Operation* )
+{
+ SVTK_ViewWindow* vtkWnd =
+ dynamic_cast<SVTK_ViewWindow*>( 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<SVTK_ViewWindow*>( 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
+{
+ 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;
+}
+
+
+
+
+
+
+
+
