// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
#include <OCCViewer_ViewModel.h>
#include <OCCViewer_ViewManager.h>
-#include <VTKViewer_ViewWindow.h>
+#include <SVTK_ViewWindow.h>
#include <SVTK_RenderWindowInteractor.h>
#include <SVTK_InteractorStyle.h>
#include <SVTK_ViewModel.h>
-#include <VTKViewer_ViewManager.h>
+#include <SVTK_ViewManager.h>
#include <SalomeApp_Application.h>
-#include <SalomeApp_SelectionMgr.h>
-#include <SalomeApp_VTKSelector.h>
+#include <LightApp_SelectionMgr.h>
+#include <LightApp_VTKSelector.h>
#include <SalomeApp_Study.h>
-#include <SalomeApp_Preferences.h>
+#include <LightApp_Preferences.h>
#include <SALOME_LifeCycleCORBA.hxx>
#include <SALOME_ListIO.hxx>
-GEOM::GEOM_Gen_var GeometryGUI::myComponentGeom = GEOM::GEOM_Gen::_nil();
+GEOM::GEOM_Gen_var GeometryGUI::myComponentGeom = GEOM::GEOM_Gen::_nil();
-GEOM::GEOM_Gen_var GeometryGUI::GetGeomGen() { return GeometryGUI::myComponentGeom; }
+GEOM::GEOM_Gen_var GeometryGUI::GetGeomGen()
+{
+ // Bug 12290: exception in Mesh GUI on GEOMBase::GetShape() if Geometry GUI hasn't been loaded
+ if (CORBA::is_nil(myComponentGeom))
+ InitGeomGen();
+ return GeometryGUI::myComponentGeom;
+}
-bool GeometryGUI::InitGeomGen()
+bool GeometryGUI::InitGeomGen()
{
GeometryGUI aGG;
- if( CORBA::is_nil( myComponentGeom ) ) return false;
- return true;
-}
+ if( CORBA::is_nil( myComponentGeom ) ) return false;
+ return true;
+}
//=======================================================================
// function : ClientSObjectToObject
SUIT_ViewWindow* window = application()->desktop()->activeWindow();
bool ViewOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() );
- bool ViewVTK = ( window && window->getViewManager()->getType() == VTKViewer_Viewer::Type() );
+ bool ViewVTK = ( window && window->getViewManager()->getType() == SVTK_Viewer::Type() );
if( ViewOCC ) {
OCCViewer_ViewWindow* vw = dynamic_cast<OCCViewer_ViewWindow*>( window );
}
}
else if( ViewVTK ) {
- VTKViewer_ViewWindow* vw = dynamic_cast<VTKViewer_ViewWindow*>( window );
+ SVTK_ViewWindow* vw = dynamic_cast<SVTK_ViewWindow*>( window );
if ( vw ) {
vtkCamera* camera = vw->getRenderer()->GetActiveCamera();
//=======================================================================
void GeometryGUI::OnGUIEvent( int id )
{
- SUIT_Desktop* desk = application()->desktop();
+ SUIT_Application* anApp = application();
+ if (!anApp) return;
+ SUIT_Desktop* desk = anApp->desktop();
// check type of the active viewframe
SUIT_ViewWindow* window = desk->activeWindow();
bool ViewOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() );
- bool ViewVTK = ( window && window->getViewManager()->getType() == VTKViewer_Viewer::Type() );
+ bool ViewVTK = ( window && window->getViewManager()->getType() == SVTK_Viewer::Type() );
// if current viewframe is not of OCC and not of VTK type - return immediately
// fix for IPAL8958 - allow some commands to execute even when NO viewer is active (rename for example)
bool NotViewerDependentCommand = ( id == 901 || id == 216 || id == 213 );
// function : GeometryGUI::OnKeyPress()
// purpose : Called when any key is pressed by user [static]
//=================================================================================
-bool GeometryGUI::OnKeyPress( QKeyEvent* pe, SUIT_ViewWindow* win )
+void GeometryGUI::OnKeyPress( SUIT_ViewWindow* win, QKeyEvent* pe )
{
GUIMap::Iterator it;
bool bOk = true;
- for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it )
- bOk = bOk && it.data()->OnKeyPress( pe, application()->desktop(), win );
- return bOk;
+ for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) {
+ SUIT_Application* anApp = application();
+ if (!anApp) return;
+ bOk = bOk && it.data()->OnKeyPress( pe, anApp->desktop(), win );
+ }
+// return bOk;
}
// function : GeometryGUI::OnMouseMove()
// purpose : Manages mouse move events [static]
//=================================================================================
-bool GeometryGUI::OnMouseMove( QMouseEvent* pe, SUIT_ViewWindow* win )
+void GeometryGUI::OnMouseMove( SUIT_ViewWindow* win, QMouseEvent* pe )
{
GUIMap::Iterator it;
bool bOk = true;
- for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it )
- bOk = bOk && it.data()->OnMouseMove( pe, application()->desktop(), win );
- return bOk;
+ for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) {
+ SUIT_Application* anApp = application();
+ if (!anApp) return;
+ bOk = bOk && it.data()->OnMouseMove( pe, anApp->desktop(), win );
+ }
+// return bOk;
}
// function : GeometryGUI::0nMousePress()
// purpose : Manage mouse press events [static]
//=================================================================================
-bool GeometryGUI::OnMousePress( QMouseEvent* pe, SUIT_ViewWindow* win )
+void GeometryGUI::OnMousePress( SUIT_ViewWindow* win, QMouseEvent* pe )
{
GUIMap::Iterator it;
// OnMousePress() should return false if this event should be processed further
// (see OCCViewer_Viewer3d::onMousePress() for explanation)
bool processed = false;
- for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it )
- processed = processed || it.data()->OnMousePress( pe, application()->desktop(), win );
- return processed;
+ for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) {
+ SUIT_Application* anApp = application();
+ if (!anApp) return;
+ processed = processed || it.data()->OnMousePress( pe, anApp->desktop(), win );
+ }
+// return processed;
}
/*
SUIT_ViewWindow* win = 0;
for ( win = winList.first(); win; win = winList.next() ) {
if ( win->getViewManager()->getTypeView() == VIEW_VTK ) {
- VTKViewer_ViewWindow* vw = dynamic_cast<VTKViewer_ViewWindow*>( window );
+ SVTK_ViewWindow* vw = dynamic_cast<SVTK_ViewWindow*>( window );
if ( vw ) {
- VTKViewer_RenderWindowInteractor* anInteractor = vw->getRWInteractor();
+ SVTK_RenderWindowInteractor* anInteractor = vw->getRWInteractor();
anInteractor->SetSelectionProp();
anInteractor->SetSelectionTolerance();
SVTK_InteractorStyleSALOME* aStyle = anInteractor->GetInteractorStyleSALOME();
}
}
else if ( ViewVTK ) {
- VTKViewer_ViewWindow* vw = dynamic_cast<VTKViewer_ViewWindow*>( window );
+ SVTK_ViewWindow* vw = dynamic_cast<SVTK_ViewWindow*>( window );
if ( vw ) {
- VTKViewer_RenderWindowInteractor* myRenderInter = vw->getRWInteractor();
+ SVTK_RenderWindowInteractor* myRenderInter = vw->getRWInteractor();
DisplayMode = myRenderInter->GetDisplayMode();
}
}
//=======================================================================
-// function : GeometryGUI::Deactivate()
-// purpose : Called when GEOM module is deactivated [ static ]
+// function : GeometryGUI::initialize()
+// purpose : Called when GEOM module is created
//=======================================================================
void GeometryGUI::initialize( CAM_Application* app )
{
createMenu( 212, viewId, -1 );
createMenu( 214, viewId, -1 );
createMenu( separator(), viewId, -1 );
+
+/*
+ PAL9111:
+ because of these items are accessible through object browser and viewers
+ we have removed they from main menu
+
createMenu( 216, viewId, -1 );
createMenu( 213, viewId, -1 );
createMenu( 215, viewId, -1 );
+*/
// ---- create toolbars --------------------------
mgr->insert( separator(), -1, -1 ); // -----------
dispmodeId = mgr->insert( tr( "MEN_DISPLAY_MODE" ), -1, -1 ); // display mode menu
mgr->insert( action( 80311 ), dispmodeId, -1 ); // wireframe
- mgr->setRule( action( 80311 ), "(client='OCCViewer' or client='VTKViewer') and selcount>0", true );
+ mgr->setRule( action( 80311 ), "(client='OCCViewer' or client='VTKViewer') and selcount>0 and isVisible", true );
mgr->setRule( action( 80311 ), "(client='OCCViewer' or client='VTKViewer') and displaymode='Wireframe'", false );
mgr->insert( action( 80312 ), dispmodeId, -1 ); // shading
- mgr->setRule( action( 80312 ), "(client='OCCViewer' or client='VTKViewer') and selcount>0", true );
+ mgr->setRule( action( 80312 ), "(client='OCCViewer' or client='VTKViewer') and selcount>0 and isVisible", true );
mgr->setRule( action( 80312 ), "(client='OCCViewer' or client='VTKViewer') and displaymode='Shading'", false );
mgr->insert( separator(), -1, -1 ); // -----------
mgr->insert( action( 8032 ), -1, -1 ); // color
- mgr->setRule( action( 8032 ), "(client='OCCViewer' or client='VTKViewer') and selcount>0", true );
+ mgr->setRule( action( 8032 ), "(client='OCCViewer' or client='VTKViewer') and selcount>0 and isVisible", true );
mgr->insert( action( 8033 ), -1, -1 ); // transparency
- mgr->setRule( action( 8033 ), "(client='OCCViewer' or client='VTKViewer') and selcount>0", true );
+ mgr->setRule( action( 8033 ), "(client='OCCViewer' or client='VTKViewer') and selcount>0 and isVisible", true );
mgr->insert( action( 8034 ), -1, -1 ); // isos
- mgr->setRule( action( 8034 ), "client='OCCViewer' and selcount>0", true );
+ mgr->setRule( action( 8034 ), "client='OCCViewer' and selcount>0 and isVisible", true );
mgr->insert( separator(), -1, -1 ); // -----------
+
+
+
+ QString canDisplay = "($component={'GEOM'}) and (selcount>0) and ({true} in $canBeDisplayed) ",
+ onlyComponent = "((type='Component') and selcount=1)",
+ rule = canDisplay + "and ((($type in {%1}) and( %2 )) or " + onlyComponent + ")",
+ types = "'Shape' 'Group'";
+
mgr->insert( action( 216 ), -1, -1 ); // display
- mgr->setRule( action( 216 ), "(selcount>0) and (((isActiveView=true) and (($type in {'Shape' 'Group'} and (not isVisible)) or type='Component'))"
- "or ((isActiveView=false) and ($type in {'Shape' 'Group' 'Component'})))", true );
+ mgr->setRule( action( 216 ), rule.arg( types ).arg( "not isVisible" ), true );
+
mgr->insert( action( 215 ), -1, -1 ); // erase
- mgr->setRule( action( 215 ), "(isActiveView=true) and (($type in {'Shape' 'Group'} and isVisible and selcount>0) or (type='Component' and selcount=1))", true );
+ mgr->setRule( action( 215 ), rule.arg( types ).arg( "isVisible" ), true );
+
mgr->insert( action( 214 ), -1, -1 ); // erase All
mgr->setRule( action( 214 ), "client='OCCViewer' or client='VTKViewer'", true );
+
mgr->insert( action( 213 ), -1, -1 ); // display only
- mgr->setRule( action( 213 ), "($type in {'Shape' 'Group'} and selcount>0) or (type='Component' and selcount=1)", true );
+ mgr->setRule( action( 213 ), rule.arg( types ).arg( "true" ), true );
mgr->insert( separator(), -1, -1 );
+
+ mgr->hide( mgr->actionId( action( myEraseAll ) ) );
}
//=======================================================================
-// function : GeometryGUI::Deactivate()
-// purpose : Called when GEOM module is deactivated [ static ]
+// function : GeometryGUI::activateModule()
+// purpose : Called when GEOM module is activated
//=======================================================================
bool GeometryGUI::activateModule( SUIT_Study* study )
{
setMenuShown( true );
setToolShown( true );
- connect( application()->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ),
+ connect( application()->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ),
this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ) );
- connect( (STD_Application*)application(), SIGNAL( viewManagerAdded( SUIT_ViewManager* ) ),
- this, SLOT( onViewManagerAdded( SUIT_ViewManager* ) ) );
+
+ // Reset actions accelerator keys
+ //action(111)->setAccel(QKeySequence(CTRL + Key_I)); // Import
+ //action(121)->setAccel(QKeySequence(CTRL + Key_E)); // Export
+ action(111)->setEnabled(true); // Import
+ action(121)->setEnabled(true); // Export
GUIMap::Iterator it;
for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it )
it.data()->activate( application()->desktop() );
- SalomeApp_SelectionMgr* sm = getApp()->selectionMgr();
+ LightApp_SelectionMgr* sm = getApp()->selectionMgr();
SUIT_ViewManager* vm;
ViewManagerList OCCViewManagers, VTKViewManagers;
application()->viewManagers( OCCViewer_Viewer::Type(), OCCViewManagers );
for ( vm = OCCViewManagers.first(); vm; vm = OCCViewManagers.next() )
myOCCSelectors.append( new GEOMGUI_OCCSelector( ((OCCViewer_ViewManager*)vm)->getOCCViewer(), sm ) );
- application()->viewManagers( VTKViewer_Viewer::Type(), VTKViewManagers );
+ application()->viewManagers( SVTK_Viewer::Type(), VTKViewManagers );
for ( vm = VTKViewManagers.first(); vm; vm = VTKViewManagers.next() )
- myVTKSelectors.append( new SalomeApp_VTKSelector( (SVTK_Viewer*)vm->getViewModel(), sm ) );
+ myVTKSelectors.append( new LightApp_VTKSelector( dynamic_cast<SVTK_Viewer*>( vm->getViewModel() ), sm ) );
// disable OCC selectors
getApp()->selectionMgr()->setEnabled( false, OCCViewer_Viewer::Type() );
for ( GEOMGUI_OCCSelector* sr = myOCCSelectors.first(); sr; sr = myOCCSelectors.next() )
sr->setEnabled(true);
-
+
// disable VTK selectors
- getApp()->selectionMgr()->setEnabled( false, VTKViewer_Viewer::Type() );
- for ( SalomeApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() )
+ getApp()->selectionMgr()->setEnabled( false, SVTK_Viewer::Type() );
+ for ( LightApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() )
sr->setEnabled(true);
-
+
return true;
}
//=======================================================================
-// function : GeometryGUI::Deactivate()
-// purpose : Called when GEOM module is deactivated [ static ]
+// function : GeometryGUI::deactivateModule()
+// purpose : Called when GEOM module is deactivated
//=======================================================================
bool GeometryGUI::deactivateModule( SUIT_Study* study )
{
disconnect( application()->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ),
this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ) );
- disconnect( (STD_Application*)application(), SIGNAL( viewManagerAdded( SUIT_ViewManager* ) ),
- this, SLOT( onViewManagerAdded( SUIT_ViewManager* ) ) );
EmitSignalCloseAllDialogs();
for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it )
it.data()->deactivate();
+ // Unset actions accelerator keys
+ //action(111)->setAccel(QKeySequence()); // Import
+ //action(121)->setAccel(QKeySequence()); // Export
+ action(111)->setEnabled(false); // Import
+ action(121)->setEnabled(false); // Export
+
myOCCSelectors.clear();
getApp()->selectionMgr()->setEnabled( true, OCCViewer_Viewer::Type() );
myVTKSelectors.clear();
- getApp()->selectionMgr()->setEnabled( true, VTKViewer_Viewer::Type() );
+ getApp()->selectionMgr()->setEnabled( true, SVTK_Viewer::Type() );
return SalomeApp_Module::deactivateModule( study );
}
if ( aViewFrame->getTypeView() == VIEW_OCC )
aDisplayMode = ((OCCViewer_ViewFrame*)aViewFrame)->getViewer()->getAISContext()->DisplayMode();
else if ( aViewFrame->getTypeView() == VIEW_VTK )
- aDisplayMode = ((VTKViewer_ViewFrame*)aViewFrame)->getRWInteractor()->GetDisplayMode();
+ aDisplayMode = (dynamic_cast<SVTK_ViewFrame*>( aViewFrame )->getRWInteractor()->GetDisplayMode();
int nbSel = Sel->IObjectCount();
else {
////// VTK viewer only
popup->removeItem( 8034 ); // "Isos"
- VTKViewer_Prs* vtkPrs = dynamic_cast<VTKViewer_Prs*>( prs );
+ SVTK_Prs* vtkPrs = dynamic_cast<SVTK_Prs*>( prs );
if ( vtkPrs && !vtkPrs->IsNull() ) {
vtkActorCollection* actorList = vtkPrs->GetObjects();
actorList->InitTraversal();
}
//=======================================================================
-// function : setCommandsEnabled()
+// function : onWindowActivated()
// purpose : update menu items' status - disable non-OCC-viewer-compatible actions
//=======================================================================
void GeometryGUI::onWindowActivated( SUIT_ViewWindow* win )
return;
const bool ViewOCC = ( win->getViewManager()->getType() == OCCViewer_Viewer::Type() );
-// const bool ViewVTK = ( win->getViewManager()->getType() == VTKViewer_Viewer::Type() );
+// const bool ViewVTK = ( win->getViewManager()->getType() == SVTK_Viewer::Type() );
// disable non-OCC viewframe menu commands
// action( 404 )->setEnabled( ViewOCC ); // SKETCHER
{
if ( vm->getType() == OCCViewer_Viewer::Type() )
{
- SalomeApp_SelectionMgr* sm = getApp()->selectionMgr();
+ qDebug( "connect" );
+ connect( vm, SIGNAL( keyPress ( SUIT_ViewWindow*, QKeyEvent* ) ),
+ this, SLOT( OnKeyPress( SUIT_ViewWindow*, QKeyEvent* ) ) );
+ connect( vm, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
+ this, SLOT( OnMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) );
+ connect( vm, SIGNAL( mouseMove ( SUIT_ViewWindow*, QMouseEvent* ) ),
+ this, SLOT( OnMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) );
+
+
+ LightApp_SelectionMgr* sm = getApp()->selectionMgr();
myOCCSelectors.append( new GEOMGUI_OCCSelector( ((OCCViewer_ViewManager*)vm)->getOCCViewer(), sm ) );
// disable OCC selectors
for ( GEOMGUI_OCCSelector* sr = myOCCSelectors.first(); sr; sr = myOCCSelectors.next() )
sr->setEnabled(true);
}
- else if ( vm->getType() == VTKViewer_Viewer::Type() )
+ else if ( vm->getType() == SVTK_Viewer::Type() )
{
- SalomeApp_SelectionMgr* sm = getApp()->selectionMgr();
- myVTKSelectors.append( new SalomeApp_VTKSelector( (SVTK_Viewer*)vm->getViewModel(), sm ) );
-
+ LightApp_SelectionMgr* sm = getApp()->selectionMgr();
+ myVTKSelectors.append( new LightApp_VTKSelector( dynamic_cast<SVTK_Viewer*>( vm->getViewModel() ), sm ) );
+
// disable VTK selectors
- getApp()->selectionMgr()->setEnabled( false, VTKViewer_Viewer::Type() );
- for ( SalomeApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() )
+ getApp()->selectionMgr()->setEnabled( false, SVTK_Viewer::Type() );
+ for ( LightApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() )
sr->setEnabled(true);
}
}
break;
}
}
- if ( vm->getType() == VTKViewer_Viewer::Type() )
+ if ( vm->getType() == SVTK_Viewer::Type() )
{
- for ( SalomeApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() )
+ for ( LightApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() )
if ( sr->viewer() == viewer )
{
myVTKSelectors.remove( sr );
return QString( "" );
}
-SalomeApp_Selection* GeometryGUI::createSelection() const
+LightApp_Selection* GeometryGUI::createSelection() const
{
return new GEOMGUI_Selection();
}
int genGroup = addPreference( tr( "PREF_GROUP_GENERAL" ), tabId );
addPreference( tr( "PREF_SHADING_COLOR" ), genGroup,
- SalomeApp_Preferences::Color, "Geometry", "shading_color" );
+ LightApp_Preferences::Color, "Geometry", "shading_color" );
int step = addPreference( tr( "PREF_STEP_VALUE" ), genGroup,
- SalomeApp_Preferences::IntSpin, "Geometry", "SettingsGeomStep" );
+ LightApp_Preferences::IntSpin, "Geometry", "SettingsGeomStep" );
int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), genGroup,
- SalomeApp_Preferences::Selector, "Geometry", "display_mode" );
+ LightApp_Preferences::Selector, "Geometry", "display_mode" );
setPreferenceProperty( genGroup, "columns", 1 );
{
}
-SalomeApp_Displayer* GeometryGUI::displayer()
+LightApp_Displayer* GeometryGUI::displayer()
{
if( !myDisplayer )
myDisplayer = new GEOM_Displayer( dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) );