mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-02-19 22:03:07 +05:00
Adjust to HEAD modifications
This commit is contained in:
parent
c0562941ea
commit
5f43472a23
@ -582,6 +582,10 @@ namespace{
|
||||
aTitle = QObject::tr( "SKEW_ELEMENTS" );
|
||||
aControl = SMESH_Actor::eSkew;
|
||||
break;
|
||||
case 6009:
|
||||
aTitle = QObject::tr( "VOLUME_3D_ELEMENTS" );
|
||||
aControl = SMESH_Actor::eVolume3D;
|
||||
break;
|
||||
}
|
||||
anActor->SetControlMode(aControl);
|
||||
anActor->GetScalarBarActor()->SetTitle(aTitle.latin1());
|
||||
@ -2061,6 +2065,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
case 6002:
|
||||
case 6003:
|
||||
case 6004:
|
||||
case 6009:
|
||||
if ( vtkwnd ) {
|
||||
|
||||
SalomeApp_SelectionMgr* mgr = selectionMgr();
|
||||
@ -2282,6 +2287,7 @@ void SMESHGUI::initialize( CAM_Application* app )
|
||||
createSMESHAction( 6017, "ASPECT_3D", "ICON_ASPECT_3D", 0, true );
|
||||
createSMESHAction( 6018, "LENGTH_2D", "ICON_LENGTH_2D", 0, true );
|
||||
createSMESHAction( 6019, "CONNECTION_2D", "ICON_CONNECTION_2D", 0, true );
|
||||
createSMESHAction( 6009, "VOLUME_3D", "ICON_VOLUME_3D", 0, true );
|
||||
createSMESHAction( 400, "NODE", "ICON_DLG_NODE" );
|
||||
createSMESHAction( 401, "EDGE", "ICON_DLG_EDGE" );
|
||||
createSMESHAction( 4021, "TRIANGLE", "ICON_DLG_TRIANGLE" );
|
||||
@ -2405,6 +2411,7 @@ void SMESHGUI::initialize( CAM_Application* app )
|
||||
createMenu( 6016, ctrlId, -1 );
|
||||
createMenu( separator(), ctrlId, -1 );
|
||||
createMenu( 6017, ctrlId, -1 );
|
||||
createMenu( 6009, ctrlId, -1 );
|
||||
createMenu( separator(), ctrlId, -1 );
|
||||
|
||||
createMenu( 400, addId, -1 );
|
||||
@ -2479,6 +2486,7 @@ void SMESHGUI::initialize( CAM_Application* app )
|
||||
createTool( 6016, ctrlTb );
|
||||
createTool( separator(), ctrlTb );
|
||||
createTool( 6017, ctrlTb );
|
||||
createTool( 6009, ctrlTb );
|
||||
createTool( separator(), ctrlTb );
|
||||
|
||||
createTool( 400, addRemTb );
|
||||
@ -2743,6 +2751,10 @@ void SMESHGUI::initialize( CAM_Application* app )
|
||||
popupMgr()->setRule( action( 6017 ), aMeshInVtkHasVolumes, true );
|
||||
popupMgr()->setRule( action( 6017 ), "controlMode = 'eAspectRatio3D'", false );
|
||||
|
||||
popupMgr()->insert ( action( 6009 ), anId, -1 ); // VOLUME_3D
|
||||
popupMgr()->setRule( action( 6009 ), aMeshInVtkHasVolumes, true );
|
||||
popupMgr()->setRule( action( 6009 ), "controlMode = 'eVolume3D'", false );
|
||||
|
||||
popupMgr()->insert( separator(), anId, -1 );
|
||||
|
||||
popupMgr()->insert( action( 201 ), anId, -1 ); // SCALAR_BAR_PROP
|
||||
@ -2770,8 +2782,8 @@ void SMESHGUI::initialize( CAM_Application* app )
|
||||
|
||||
popupMgr()->insert( separator(), -1, -1 );
|
||||
|
||||
connect( application(), SIGNAL( viewManagerAdded( SUIT_ViewManager* ) ),
|
||||
this, SLOT( onViewManagerAdded( SUIT_ViewManager* ) ) );
|
||||
connect( application(), SIGNAL( viewManagerActivated( SUIT_ViewManager* ) ),
|
||||
this, SLOT( onViewManagerActivated( SUIT_ViewManager* ) ) );
|
||||
}
|
||||
|
||||
bool SMESHGUI::activateModule( SUIT_Study* study )
|
||||
@ -2839,7 +2851,7 @@ void SMESHGUI::viewManagers( QStringList& list ) const
|
||||
list.append( SVTK_Viewer::Type() );
|
||||
}
|
||||
|
||||
void SMESHGUI::onViewManagerAdded( SUIT_ViewManager* mgr )
|
||||
void SMESHGUI::onViewManagerActivated( SUIT_ViewManager* mgr )
|
||||
{
|
||||
if ( dynamic_cast<SVTK_ViewManager*>( mgr ) )
|
||||
SMESH::UpdateSelectionProp( this );
|
||||
|
Loading…
Reference in New Issue
Block a user