// $Header$
#include "SMESHGUI.h"
+
#include "SMESHGUI_InitMeshDlg.h"
#include "SMESHGUI_AddSubMeshDlg.h"
#include "SMESHGUI_NodesDlg.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"
#include "SMESHGUI_SymmetryDlg.h"
#include "SMESHGUI_SewingDlg.h"
#include "SMESHGUI_MergeNodesDlg.h"
+#include "SMESHGUI_EditMeshDlg.h"
#include "SMESHGUI_MeshPatternDlg.h"
#include "SMESHGUI_PrecisionDlg.h"
#include "SMESHGUI_Selection.h"
#include "SMESHGUI_CreatePolyhedralVolumeDlg.h"
-#include <SVTK_InteractorStyle.h>
-#include <SVTK_RenderWindowInteractor.h>
+#include "SMESHGUI_Utils.h"
+#include "SMESHGUI_GEOMGenUtils.h"
+#include "SMESHGUI_MeshUtils.h"
+#include "SMESHGUI_GroupUtils.h"
+#include "SMESHGUI_FilterUtils.h"
+#include "SMESHGUI_PatternUtils.h"
+#include "SMESHGUI_VTKUtils.h"
+#include "SMESHGUI_HypothesesUtils.h"
#include "SMESH_Actor.h"
#include "SMESH_Object.h"
#include "SMESH_TypeFilter.hxx"
-#include "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 "SALOME_NamingService.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "SALOME_InteractiveObject.hxx"
-#include "SALOME_ListIO.hxx"
-#include <SALOME_LifeCycleCORBA.hxx>
-
-#include "OB_Browser.h"
-
-#include "QtxPopupMgr.h"
-
#include "SalomeApp_Tools.h"
#include "SalomeApp_Study.h"
#include "SalomeApp_NameDlg.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_Preferences.h"
#include "SalomeApp_VTKSelector.h"
-
#include "SalomeApp_ImportOperation.h"
#include <SVTK_ViewWindow.h>
#include <SVTK_ViewModel.h>
+#include <SVTK_InteractorStyle.h>
+#include <SVTK_RenderWindowInteractor.h>
#include <VTKViewer_ViewManager.h>
-#include "SMESHGUI_Utils.h"
-#include "SMESHGUI_GEOMGenUtils.h"
-#include "SMESHGUI_MeshUtils.h"
-#include "SMESHGUI_GroupUtils.h"
-#include "SMESHGUI_FilterUtils.h"
-#include "SMESHGUI_PatternUtils.h"
-#include "SMESHGUI_VTKUtils.h"
+#include "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 <qapplication.h>
-#include <qlineedit.h>
-#include <qmenudata.h>
-#include <qmenubar.h>
#include <qpopupmenu.h>
-#include <qfont.h>
#include <qstring.h>
-#include <qpainter.h>
-#include <qcheckbox.h>
-#include <qcolordialog.h>
-#include <qspinbox.h>
-#include <qlist.h>
#include <qwidget.h>
-#include <qevent.h>
#include <qaction.h>
-#include <qradiobutton.h>
+// BOOST Includes
#include <boost/shared_ptr.hpp>
+// VTK Includes
#include <vtkRenderer.h>
#include <vtkRenderWindow.h>
#include <vtkActorCollection.h>
void Control( int theCommandID );
- void SetDisplaySettings();
-
// Definitions
//=============================================================
if(!filename.isEmpty()) {
SUIT_OverrideCursor wc;
_PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+ theComponentMesh->SetCurrentStudy( _CAST(Study,aStudy)->GetStudy() );
try {
SMESH::mesh_array_var aMeshes = new SMESH::mesh_array;
SMESH::RepaintCurrentView();
}
}
-
-
- void SetDisplaySettings()
- {
- SUIT_ResourceMgr* mgr = SMESHGUI::resourceMgr();
- if( !mgr )
- return;
-
- SMESHGUI::GetSMESHGUI()->EmitSignalDeactivateDialog();
- SMESHGUI_Preferences_ColorDlg *aDlg =
- new SMESHGUI_Preferences_ColorDlg( SMESHGUI::GetSMESHGUI(), "" );
-
- QColor color = mgr->colorValue( "SMESH", "SettingsFillColor", QColor(0, 170, 255) );
- aDlg->SetColor(1, color);
-
- color = mgr->colorValue( "SMESH", "SettingsOutlineColor", QColor(0, 170, 255) );
- aDlg->SetColor(2, color);
-
- color = mgr->colorValue( "SMESH", "SettingsNodeColor", Qt::red );
- aDlg->SetColor(3, color);
-
- color = mgr->colorValue( "SMESH", "SettingsBackFaceColor", Qt::blue );
- aDlg->SetColor(4, color);
-
- int iVal = mgr->integerValue( "SMESH", "SettingsWidth", 1 );
- aDlg->SetIntValue(1, iVal);
-
- iVal = mgr->integerValue( "SMESH", "SettingsNodesSize", 3 );
- aDlg->SetIntValue(2, iVal);
-
- iVal = mgr->integerValue( "SMESH", "SettingsShrinkCoeff", 75 );
- aDlg->SetIntValue(3, iVal);
-
- if (aDlg->exec()) {
- mgr->setValue( "SMESH", "SettingsFillColor", aDlg->GetColor(1) );
- mgr->setValue( "SMESH", "SettingsOutlineColor", aDlg->GetColor(2) );
- mgr->setValue( "SMESH", "SettingsNodeColor", aDlg->GetColor(3) );
- mgr->setValue( "SMESH", "SettingsBackFaceColor", aDlg->GetColor(4) );
-
- mgr->setValue( "SMESH", "SettingsWidth", aDlg->GetIntValue(1) );
- mgr->setValue( "SMESH", "SettingsNodesSize", aDlg->GetIntValue(2) );
- mgr->setValue( "SMESH", "SettingsShrinkCoeff", aDlg->GetIntValue(3) );
- }
-
- delete aDlg;
- }
-
void Control( int theCommandID )
{
SUIT_ViewWindow* view = application()->desktop()->activeWindow();
SVTK_ViewWindow* vtkwnd = dynamic_cast<SVTK_ViewWindow*>( view );
- QAction* act = action( theCommandID );
+ //QAction* act = action( theCommandID );
switch (theCommandID) {
case 33: // DELETE
case 302: // DISPLAY ONLY
{
SMESH::EDisplaing anAction;
- switch(theCommandID){
+ switch (theCommandID) {
case 300: anAction = SMESH::eErase; break;
case 301: anAction = SMESH::eDisplay; break;
case 302: anAction = SMESH::eDisplayOnly; break;
SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
- if( aSel )
+ if (aSel)
aSel->selectedObjects( selected );
- if ( vtkwnd ) {
- SALOME_ListIteratorOfListIO It(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;
}
}
}
break;
}
- case 1001: // AUTOMATIC UPDATE PREFERENCES
- {
-// if (act->isOn()) {
-// mgr->setValue( "SMESH", "AutomaticUpdate", true );
-// myAutomaticUpdate = true;
-// }
-// else {
-// mgr->setValue( "SMESH", "AutomaticUpdate", false );
-// myAutomaticUpdate = false;
-// }
- break;
- }
-
- case 1003: // MESH PREFERENCES
- {
- ::SetDisplaySettings();
- break;
- }
-
- case 1005:
- {
- SMESHGUI_Preferences_ScalarBarDlg::ScalarBarPreferences( this );
- break;
- }
-
- case 10070:
- {
- ( new SMESHGUI_PrecisionDlg( this ) )->exec();
- break;
- }
-
- case 10071:
- {
- if (act->isOn()) {
- mgr->setValue( "SMESH", "DispayEntity", true );
- }
- else {
- mgr->setValue( "SMESH", "DispayEntity", false );
- }
- break;
- }
- case 1006:
- {
- SMESHGUI_Preferences_SelectionDlg* aDlg =
- new SMESHGUI_Preferences_SelectionDlg( this );
-
- QColor aColor = mgr->colorValue( "SMESH", "SettingsPreSelectColor", Qt::cyan );
- aDlg->SetColor(1, aColor);
-
- aColor = mgr->colorValue( "SMESH", "SettingsItemSelectColor", Qt::yellow );
- aDlg->SetColor(2, aColor);
-
- aColor = mgr->colorValue( "SMESH", "SettingsSelectColor", Qt::white );
- aDlg->SetColor(3, aColor);
-
- aDlg->SetWidth(1, mgr->integerValue( "SMESH", "SettingsPreSelectWidth", 5 ) );
- aDlg->SetWidth(2, mgr->integerValue( "SMESH", "SettingsItemSelectWidth", 5 ) );
- aDlg->SetPrecision(1, mgr->doubleValue( "SMESH", "SettingsNodeSelectTol", 0.025 ) );
- aDlg->SetPrecision(2, mgr->doubleValue( "SMESH", "SettingsElementsSelectTol", 0.001 ) );
-
- if (aDlg->exec()) {
- QColor aPreColor = aDlg->GetColor(1),
- aSelColor = aDlg->GetColor(2),
- aHiColor = aDlg->GetColor(3);
- int aPreWidth = aDlg->GetWidth(1),
- aSelWidth = aDlg->GetWidth(2);
- double aTolNodes = aDlg->GetPrecision(1),
- aTolItems = aDlg->GetPrecision(2);
-
- mgr->setValue( "SMESH", "SettingsPreSelectColor", aPreColor );
- mgr->setValue( "SMESH", "SettingsItemSelectColor", aSelColor );
- mgr->setValue( "SMESH", "SettingsSelectColor", aHiColor );
-
- mgr->setValue( "SMESH", "SettingsPreSelectWidth", aPreWidth );
- mgr->setValue( "SMESH", "SettingsItemSelectWidth", aSelWidth );
- mgr->setValue( "SMESH", "SettingsNodeSelectTol", aTolNodes );
- mgr->setValue( "SMESH", "SettingsElementsSelectTol", aTolItems );
-
- // update current study settings
- SMESH::UpdateSelectionProp( this );
-
- if( vtkwnd ) {
- // update VTK viewer properties
- SVTK_RenderWindowInteractor* anInteractor =
- dynamic_cast<SVTK_RenderWindowInteractor*>( vtkwnd->getRWInteractor() );
- if (anInteractor) {
- anInteractor->SetSelectionProp(aSelColor.red()/255., aSelColor.green()/255.,
- aSelColor.blue()/255., aSelWidth);
- anInteractor->SetSelectionTolerance(aTolNodes, aTolItems);
- SVTK_InteractorStyle* aStyle =
- dynamic_cast<SVTK_InteractorStyle*>( anInteractor->GetInteractorStyle() );
-
- if (aStyle)
- aStyle->setPreselectionProp(aPreColor.red()/255., aPreColor.green()/255.,
- aPreColor.blue()/255., aPreWidth);
- }
- // update actors
- vtkRenderer* aRenderer = vtkwnd->getRenderer();
- vtkActorCollection *aCollection = aRenderer->GetActors();
- aCollection->InitTraversal();
- while(vtkActor *anAct = aCollection->GetNextActor()){
- if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
- anActor->SetHighlightColor(aHiColor.red()/255., aHiColor.green()/255.,
- aHiColor.blue()/255.);
- anActor->SetPreHighlightColor(aPreColor.red()/255., aPreColor.green()/255.,
- aPreColor.blue()/255.);
- }
- }
- }
- }
-
- break;
- }
-
case 1100: // EDIT HYPOTHESIS
{
if(checkLock(aStudy)) break;
}
break;
}
+ case 4066: // MERGE EQUAL ELEMENTS
+ {
+ 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 5000: // HYPOTHESIS
}
break;
}
- case 10001: // DISPLAY MODE PREFERENCE
- {
- // Wireframe
- act->setOn( true );
- action( 10002 )->setOn( false );
- action( 10004 )->setOn( false );
- action( 10003 )->setOn( true );
- mgr->setValue( "SMESH", "DisplayMode", "Wireframe");
- break;
- }
- case 10002:
- {
- act->setOn( true );
- action( 10001 )->setOn( false );
- action( 10004 )->setOn( false );
- action( 10003 )->setOn( true );
- mgr->setValue( "SMESH", "DisplayMode", "Shading");
- break;
- }
- case 10003:
- {
- mgr->setValue( "SMESH", "Shrink", act->isOn() );
- break;
- }
- case 10004:
- {
- act->setOn( true );
- action( 10001 )->setOn( false );
- action( 10002 )->setOn( false );
- action( 10003 )->setOn( false );
- mgr->setValue( "SMESH", "DisplayMode", "Nodes" );
- break;
- }
-
}
-
//updateObjBrowser();
return true;
}
return true;
}
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::SetSettings(SUIT_Desktop* parent)
-{
- SMESHGUI::GetSMESHGUI();
-
- SUIT_ResourceMgr* mgr = resourceMgr();
- if( !mgr )
- return false;
-
- // Display mode
- QString DisplayMode = "Shading";
- if ( mgr->hasValue("SMESH","DisplayMode") )
- DisplayMode = mgr->stringValue("SMESH","DisplayMode");
- else
- mgr->setValue("SMESH","DisplayMode", "Shading");
-
- bool Shrink = false;
- if ( mgr->hasValue("SMESH","Shrink") )
- Shrink = mgr->stringValue("SMESH","Shrink") == "yes";
-
- if (DisplayMode == "Wireframe") {
- // wireframe
- action( 10004 )->setOn( false );
- action( 10002 )->setOn( false );
- action( 10001 )->setOn( true );
- action( 10003 )->setOn( true );
- }
- else if (DisplayMode == "Nodes") {
- // poins
- action( 10004 )->setOn( true );
- action( 10002 )->setOn( false );
- action( 10001 )->setOn( false );
- action( 10003 )->setOn( false );
- }
- else {
- // default is shading
- action( 10004 )->setOn( false );
- action( 10002 )->setOn( true );
- action( 10001 )->setOn( false );
- action( 10003 )->setOn( true );
- }
-
- action( 10003 )->setOn( Shrink );
-
- // Automatic Update
-// if ( mgr->booleanValue( "SMESH","AutomaticUpdate", false ) ) {
-// action( 1001 )->setOn( true );
-// myAutomaticUpdate = true;
-// }
-// else {
-// action( 1001 )->setOn( false );
-// myAutomaticUpdate = false;
-// }
-
- if ( mgr->booleanValue( "SMESH","DispayEntity", false ) )
- action( 10071 )->setOn( true );
- else
- action( 10071 )->setOn( false );
-
- // Selection
- SMESH::UpdateSelectionProp( this );
-
- // menus disable
- action( 111 )->setEnabled( false ); // IMPORT DAT
-
- //action( 112 )->setEnabled( false );
- //parent->menuBar()->setItemEnabled(112, false); // IMPORT UNV
-
- return true;
-}
-
//=============================================================================
/*! Method: BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO)
* Purpose: ensures that the actor for the given <theIO> exists in the active VTK view
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( 414, "REVOLUTION", "ICON_REVOLUTION" );
createSMESHAction( 415, "MAP", "ICON_MAP" );
createSMESHAction( 416, "EXTRUSION_ALONG", "ICON_EXTRUSION_ALONG" );
- createSMESHAction( 10001, "WIRE", "ICON_WIRE", 0, true );
- createSMESHAction( 10002, "SHADE", "ICON_SHADE", 0, true );
- createSMESHAction( 10003, "SHRINK", "ICON_SHRINK", 0, true );
- createSMESHAction( 10004, "NODES", "ICON_POINTS", 0, true );
- createSMESHAction( 1001, "AUTO_UPD", "", 0, true );
- createSMESHAction( 1003, "COLORS" );
- createSMESHAction( 1005, "SCALAR_BAR" );
- createSMESHAction( 1006, "SELECTION" );
- createSMESHAction( 10070, "PRECISION", "", 0, true );
- createSMESHAction( 10071, "DISP_ENT", "", 0, true );
createSMESHAction( 200, "RESET" );
createSMESHAction( 201, "SCALAR_BAR_PROP" );
createSMESHAction( 211, "WIRE", "ICON_WIRE", 0, true );
// ----- create menu --------------
int fileId = createMenu( tr( "MEN_FILE" ), -1, 1 ),
editId = createMenu( tr( "MEN_EDIT" ), -1, 3 ),
- toolsId = createMenu( tr( "MEN_TOOLS" ), -1, 5, 10 ),
+ 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 ),
- prefId = createMenu( tr( "MEN_PREF" ), -1, 4, 10 ),
viewId = createMenu( tr( "MEN_VIEW" ), -1, 2 );
createMenu( separator(), fileId );
int importId = createMenu( tr( "MEN_IMPORT" ), fileId, 11, 10 ),
exportId = createMenu( tr( "MEN_EXPORT" ), fileId, 12, 10 ),
-
addId = createMenu( tr( "MEN_ADD" ), modifyId, 402 ),
removeId = createMenu( tr( "MEN_REMOVE" ), modifyId, 403 ),
renumId = createMenu( tr( "MEN_RENUM" ), modifyId, 404 ),
- transfId = createMenu( tr( "MEN_TRANSF" ), modifyId, 405 ),
-
- meshPrefId = createMenu( tr( "MEN_MESH" ), prefId, 100 ),
-
- dispModeId = createMenu( tr( "MEN_DISPMODE" ), meshPrefId, 1000 ),
- qualityId = createMenu( tr( "MEN_QUALITY" ), meshPrefId, 1007 );
+ transfId = createMenu( tr( "MEN_TRANSF" ), modifyId, 405 );
createMenu( 111, importId, -1 );
createMenu( 112, importId, -1 );
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( 414, modifyId, -1 );
createMenu( 415, modifyId, -1 );
- createMenu( 10001, dispModeId, -1 );
- createMenu( 10002, dispModeId, -1 );
- createMenu( 10004, dispModeId, -1 );
- createMenu( 10003, dispModeId, -1 );
-
- createMenu( 1001, prefId, -1 );
- createMenu( separator(), prefId, -1 );
- createMenu( 1003, prefId, -1 );
- createMenu( separator(), prefId, -1 );
- createMenu( 1005, prefId, -1 );
- createMenu( separator(), prefId, -1 );
- createMenu( 1006, prefId, -1 );
- createMenu( separator(), prefId, -1 );
-
- createMenu( 10070, qualityId, -1 );
- createMenu( 10071, qualityId, -1 );
-
- createMenu( separator(), prefId, -1 );
-
createMenu( 214, viewId, -1 );
// ----- create toolbars --------------
createTool( 4063, addRemTb );
createTool( 4064, addRemTb );
createTool( 4065, addRemTb );
+ createTool( 4066, addRemTb );
createTool( separator(), addRemTb );
createTool( 406, modifyTb );
hasFaces("({'Face'} in elemTypes)"),
hasVolumes("({'Volume'} in elemTypes)");
- QString aSelCount = QString( "%1 = 1" ).arg( QtxPopupMgr::Selection::defSelCountParam() );
QString lc = QtxPopupMgr::Selection::defEquality();
QString aClient = QString( "%1client in {%2}" ).arg( lc ).arg( "'VTKViewer'" );
QString aType = QString( "%1type in {%2}" ).arg( QtxPopupMgr::Selection::defEquality() ).arg( mesh_group );
- QString aMeshInVTK = aClient + "&&" + aType;// + "&&" + aSelCount;
+ QString aMeshInVTK = aClient + "&&" + aType;
//-------------------------------------------------
// Numbering
//-------------------------------------------------
anId = popupMgr()->insert( tr( "MEN_NUM" ), -1, -1 );
-
+
popupMgr()->insert( action( 9010 ), anId, -1 );
- popupMgr()->setRule( action( 9010 ), aMeshInVTK + "&&" + hasNodes, true );
+ popupMgr()->setRule( action( 9010 ), aMeshInVTK + "&& isVisible &&" + hasNodes, true );//@
popupMgr()->setRule( action( 9010 ), "{'Point'} in labeledTypes", false );
popupMgr()->insert( action( 9011 ), anId, -1 );
- popupMgr()->setRule( action( 9011 ), aMeshInVTK + "&&" + hasElems, true );
+ popupMgr()->setRule( action( 9011 ), aMeshInVTK + "&& isVisible &&" + hasElems, true );
popupMgr()->setRule( action( 9011 ), "{'Cell'} in labeledTypes", false );
popupMgr()->insert( separator(), -1, -1 );
anId = popupMgr()->insert( tr( "MEN_DISP_ENT" ), -1, -1 );
popupMgr()->insert( action( 217 ), anId, -1 ); // EDGES
- popupMgr()->setRule( action( 217 ), aDiffElemsInVTK + "&&" + hasEdges, true );
+ popupMgr()->setRule( action( 217 ), aDiffElemsInVTK + "&& isVisible &&" + hasEdges, true );
popupMgr()->setRule( action( 217 ), "{'Edge'} in entityMode", false );
popupMgr()->insert( action( 218 ), anId, -1 ); // FACES
- popupMgr()->setRule( action( 218 ), aDiffElemsInVTK + "&&" + hasFaces, true );
+ popupMgr()->setRule( action( 218 ), aDiffElemsInVTK + "&& isVisible &&" + hasFaces, true );
popupMgr()->setRule( action( 218 ), "{'Face'} in entityMode", false );
popupMgr()->insert( action( 219 ), anId, -1 ); // VOLUMES
- popupMgr()->setRule( action( 219 ), aDiffElemsInVTK + "&&" + hasVolumes, true );
+ popupMgr()->setRule( action( 219 ), aDiffElemsInVTK + "&& isVisible &&" + hasVolumes, true );
popupMgr()->setRule( action( 219 ), "{'Volume'} in entityMode", false );
popupMgr()->insert( separator(), anId, -1 );
popupMgr()->insert( action( 220 ), anId, -1 ); // ALL
- popupMgr()->setRule( action( 220 ), aDiffElemsInVTK + "&& not( elemTypes in entityMode )", true );
+ popupMgr()->setRule( action( 220 ), aDiffElemsInVTK + "&& isVisible && not( elemTypes in entityMode )", true );
//-------------------------------------------------
// Color / Size
//-------------------------------------------------
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);
setMenuShown( true );
setToolShown( true );
- SetSettings( desktop() );
return res;
}
int genTab = addPreference( tr( "PREF_TAB_GENERAL" ) );
int qaGroup = addPreference( tr( "PREF_GROUP_QUALITY" ), genTab );
- addPreference( tr( "PREF_DISPLAY_ENTITY" ), qaGroup, SalomeApp_Preferences::Bool, "Mesh", "display_entity" );
- addPreference( tr( "PREF_AUTO_UPDATE" ), qaGroup, SalomeApp_Preferences::Bool, "Mesh", "auto_update" );
+ addPreference( tr( "PREF_DISPLAY_ENTITY" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "display_entity" );
+ addPreference( tr( "PREF_AUTO_UPDATE" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "auto_update" );
int precGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), genTab );
setPreferenceProperty( precGroup, "columns", 1 );
setPreferenceProperty( prec, "min", 0 );
setPreferenceProperty( prec, "max", 16 );
+ int dispgroup = addPreference( tr( "PREF_DISPLAY_MODE" ), genTab );
+ int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), dispgroup, SalomeApp_Preferences::Selector, "SMESH", "display_mode" );
+ QStringList modes;
+ modes.append( "Wireframe" );
+ modes.append( "Shading" );
+ modes.append( "Shrink" );
+ modes.append( "Nodes" );
+ setPreferenceProperty( dispmode, "strings", modes );
+
int meshTab = addPreference( tr( "PREF_TAB_MESH" ) );
int nodeGroup = addPreference( tr( "PREF_GROUP_NODES" ), meshTab );
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 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&, const QString& )
+void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
{
}
