IMP 10199 (add Volume Control)

This commit is contained in:
eap 2005-10-10 14:51:36 +00:00
parent f8d37e1347
commit 81f4aba6d7
4 changed files with 17 additions and 0 deletions

View File

@ -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

View File

@ -1314,6 +1314,7 @@ const QMap<int, QString>& SMESHGUI_FilterTable::getCriteria (const int theType)
aCriteria[ SMESH::FT_BelongToGeom ] = tr("BELONG_TO_GEOM");
aCriteria[ SMESH::FT_LyingOnGeom ] = tr("LYING_ON_GEOM");
aCriteria[ SMESH::FT_BadOrientedVolume ] = tr("BAD_ORIENTED_VOLUME");
aCriteria[ SMESH::FT_Volume3D ] = tr("VOLUME_3D");
}
return aCriteria;
}

View File

@ -218,6 +218,7 @@ QString SMESHGUI_Selection::controlMode( int ind ) const
case SMESH_Actor::eMultiConnection: return "eMultiConnection";
case SMESH_Actor::eMultiConnection2D: return "eMultiConnection2D";
case SMESH_Actor::eArea: return "eArea";
case SMESH_Actor::eVolume3D: return "eVolume3D";
case SMESH_Actor::eTaper: return "eTaper";
case SMESH_Actor::eAspectRatio: return "eAspectRatio";
case SMESH_Actor::eAspectRatio3D: return "eAspectRatio3D";

View File

@ -301,6 +301,9 @@ msgstr "mesh_aspect.png"
msgid "ICON_ASPECT_3D"
msgstr "mesh_aspect_3d.png"
msgid "ICON_VOLUME_3D"
msgstr "mesh_aspect_3d.png"
msgid "ICON_ANGLE"
msgstr "mesh_angle.png"