// 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 "GeometryGUI.h"
#include "GEOMGUI_OCCSelector.h"
#include "GEOMGUI_Selection.h"
+#include "GEOM_Displayer.h"
#include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h>
#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 <LightApp_Preferences.h>
#include <SALOME_LifeCycleCORBA.hxx>
#include <SALOME_ListIO.hxx>
#include <Prs3d_Drawer.hxx>
#include <Prs3d_IsoAspect.hxx>
+#include <Aspect_TypeOfMarker.hxx>
#include <OSD_SharedLibrary.hxx>
#include <utilities.h>
#include <vtkCamera.h>
#include <vtkRenderer.h>
+
extern "C" {
Standard_EXPORT CAM_Module* createModule() {
return new GeometryGUI();
}
}
-GEOM::GEOM_Gen_var GeometryGUI::myComponentGeom = GEOM::GEOM_Gen::_nil();
-bool GeometryGUI::InitGeomGen()
+
+GEOM::GEOM_Gen_var GeometryGUI::myComponentGeom = GEOM::GEOM_Gen::_nil();
+
+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()
{
GeometryGUI aGG;
- if( CORBA::is_nil( myComponentGeom ) ) return false;
- return true;
-}
+ if( CORBA::is_nil( myComponentGeom ) ) return false;
+ return true;
+}
+
+//=======================================================================
+// function : ClientSObjectToObject
+// purpose :
+//=======================================================================
+CORBA::Object_var GeometryGUI::ClientSObjectToObject (_PTR(SObject) theSObject)
+{
+ _PTR(GenericAttribute) anAttr;
+ CORBA::Object_var anObj;
+ try {
+ std::string aValue = theSObject->GetIOR();
+ if (strcmp(aValue.c_str(), "") != 0) {
+ CORBA::ORB_ptr anORB = SalomeApp_Application::orb();
+ anObj = anORB->string_to_object(aValue.c_str());
+ }
+ } catch(...) {
+ INFOS("ClientSObjectToObject - Unknown exception was occured!!!");
+ }
+ return anObj._retn();
+}
+
+//=======================================================================
+// function : ClientStudyToStudy
+// purpose :
+//=======================================================================
+SALOMEDS::Study_var GeometryGUI::ClientStudyToStudy (_PTR(Study) theStudy)
+{
+ SALOME_NamingService *aNamingService = SalomeApp_Application::namingService();
+ CORBA::Object_var aSMObject = aNamingService->Resolve("/myStudyManager");
+ SALOMEDS::StudyManager_var aStudyManager = SALOMEDS::StudyManager::_narrow(aSMObject);
+ int aStudyID = theStudy->StudyId();
+ SALOMEDS::Study_var aDSStudy = aStudyManager->GetStudyByID(aStudyID);
+ return aDSStudy._retn();
+}
//=================================================================================
// class : CustomItem
SalomeApp_Module( "GEOM" )
{
if ( CORBA::is_nil( myComponentGeom ) )
- {
+ {
SALOME_LifeCycleCORBA* ls = new SALOME_LifeCycleCORBA( getApp()->namingService() );
Engines::Component_var comp = ls->FindOrLoad_Component( "FactoryServer", "GEOM" );
myComponentGeom = GEOM::GEOM_Gen::_narrow( comp );
}
-
+
myState = -1;
myActiveDialogBox = 0;
myFatherior = "";
myOCCSelectors.setAutoDelete( true );
myVTKSelectors.setAutoDelete( true );
+
+ myDisplayer = 0;
+ myLocalSelectionMode = GEOM_ALLOBJECTS;
}
//=======================================================================
if ( !myGUIMap.contains( libraryName ) ) {
// try to load library if it is not loaded yet
QCString libs;
+#ifndef WNT
if( ( libs = getenv( "LD_LIBRARY_PATH" ) ) ) {
- QStringList dirList = QStringList::split( ":", libs, false ); // skip empty entries
+ QStringList dirList = QStringList::split( ":", libs, false ); // skip empty entries
+#else
+ if( ( libs = getenv( "PATH" ) ) ) {
+ QStringList dirList = QStringList::split( ";", libs, false ); // skip empty entries
+#endif
for( int i = dirList.count()-1; i >= 0; i-- ) {
QString dir = dirList[ i ];
QFileInfo fi( Qtx::addSlash( dirList[ i ] ) + libraryName );
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();
- // check if current viewframe is of OCC type
+ 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
- if( !ViewOCC && !ViewVTK )
+ // 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 );
+ if ( !ViewOCC && !ViewVTK && !NotViewerDependentCommand )
return;
// fix for IPAL9103, point 2
id == 121 || // MENU FILE - EXPORT BREP
id == 122 || // MENU FILE - EXPORT IGES
id == 123 || // MENU FILE - EXPORT STEP
+ id == 2171 || // POPUP VIEWER - SELECT ONLY - VERTEX
+ id == 2172 || // POPUP VIEWER - SELECT ONLY - EDGE
+ id == 2173 || // POPUP VIEWER - SELECT ONLY - WIRE
+ id == 2174 || // POPUP VIEWER - SELECT ONLY - FACE
+ id == 2175 || // POPUP VIEWER - SELECT ONLY - SHELL
+ id == 2176 || // POPUP VIEWER - SELECT ONLY - SOLID
+ id == 2177 || // POPUP VIEWER - SELECT ONLY - COMPOUND
+ id == 2178 || // POPUP VIEWER - SELECT ONLY - SELECT ALL
id == 31 || // MENU EDIT - COPY
id == 33 || // MENU EDIT - DELETE
id == 411 || // MENU SETTINGS - ADD IN STUDY
id == 901 || // OBJECT BROWSER - RENAME
id == 9024 ) { // OBJECT BROWSER - OPEN
//cout << "id " << id << " received" << endl;
- library = getLibrary( "libGEOMToolsGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libGEOMToolsGUI.so" );
+#else
+ library = getLibrary( "GEOMToolsGUI.dll" );
+#endif
}
else if( id == 211 || // MENU VIEW - WIREFRAME/SHADING
id == 212 || // MENU VIEW - DISPLAY ALL
id == 216 || // MENU VIEW - DISPLAY
id == 80311 || // POPUP VIEWER - WIREFRAME
id == 80312 ) { // POPUP VIEWER - SHADING
- library = getLibrary( "libDisplayGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libDisplayGUI.so" );
+#else
+ library = getLibrary( "DisplayGUI.dll" );
+#endif
}
else if( id == 4011 || // MENU BASIC - POINT
id == 4012 || // MENU BASIC - LINE
id == 4018 || // MENU BASIC - WPLANE
id == 4019 || // MENU BASIC - CURVE
id == 4020 ) { // MENU BASIC - REPAIR
- library = getLibrary( "libBasicGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libBasicGUI.so" );
+#else
+ library = getLibrary( "BasicGUI.dll" );
+#endif
}
else if( id == 4021 || // MENU PRIMITIVE - BOX
id == 4022 || // MENU PRIMITIVE - CYLINDER
id == 4023 || // MENU PRIMITIVE - SPHERE
id == 4024 || // MENU PRIMITIVE - TORUS
id == 4025 ) { // MENU PRIMITIVE - CONE
- library = getLibrary( "libPrimitiveGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libPrimitiveGUI.so" );
+#else
+ library = getLibrary( "PrimitiveGUI.dll" );
+#endif
}
else if( id == 4031 || // MENU GENERATION - PRISM
id == 4032 || // MENU GENERATION - REVOLUTION
id == 4033 || // MENU GENERATION - FILLING
id == 4034 ) { // MENU GENERATION - PIPE
- library = getLibrary( "libGenerationGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libGenerationGUI.so" );
+#else
+ library = getLibrary( "GenerationGUI.dll" );
+#endif
}
else if( id == 404 || // MENU ENTITY - SKETCHER
id == 407 ) { // MENU ENTITY - EXPLODE
- library = getLibrary( "libEntityGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libEntityGUI.so" );
+#else
+ library = getLibrary( "EntityGUI.dll" );
+#endif
}
else if( id == 4081 || // MENU BUILD - EDGE
id == 4082 || // MENU BUILD - WIRE
id == 4084 || // MENU BUILD - SHELL
id == 4085 || // MENU BUILD - SOLID
id == 4086 ) { // MENU BUILD - COMPUND
- library = getLibrary( "libBuildGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libBuildGUI.so" );
+#else
+ library = getLibrary( "BuildGUI.dll" );
+#endif
}
else if( id == 5011 || // MENU BOOLEAN - FUSE
id == 5012 || // MENU BOOLEAN - COMMON
id == 5013 || // MENU BOOLEAN - CUT
id == 5014 ) { // MENU BOOLEAN - SECTION
- library = getLibrary( "libBooleanGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libBooleanGUI.so" );
+#else
+ library = getLibrary( "BooleanGUI.dll" );
+#endif
}
else if( id == 5021 || // MENU TRANSFORMATION - TRANSLATION
id == 5022 || // MENU TRANSFORMATION - ROTATION
id == 5026 || // MENU TRANSFORMATION - OFFSET
id == 5027 || // MENU TRANSFORMATION - MULTI-TRANSLATION
id == 5028 ) { // MENU TRANSFORMATION - MULTI-ROTATION
- library = getLibrary( "libTransformationGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libTransformationGUI.so" );
+#else
+ library = getLibrary( "TransformationGUI.dll" );
+#endif
}
else if( id == 503 || // MENU OPERATION - PARTITION
id == 504 || // MENU OPERATION - ARCHIMEDE
id == 505 || // MENU OPERATION - FILLET
- id == 506 || // MENU OPERATION - CHAMFER
+ id == 506 || // MENU OPERATION - CHAMFER
id == 507 ) { // MENU OPERATION - CLIPPING RANGE
- library = getLibrary( "libOperationGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libOperationGUI.so" );
+#else
+ library = getLibrary( "OperationGUI.dll" );
+#endif
}
else if( id == 601 || // MENU REPAIR - SEWING
id == 603 || // MENU REPAIR - SUPPRESS FACES
id == 608 || // MENU REPAIR - ADD POINT ON EDGE
id == 609 || // MENU REPAIR - FREE BOUNDARIES
id == 610 || // MENU REPAIR - FREE FACES
+ id == 611 || // MENU REPAIR - CHANGE ORIENTATION
id == 602 ) { // MENU REPAIR - GLUE FACES
- library = getLibrary( "libRepairGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libRepairGUI.so" );
+#else
+ library = getLibrary( "RepairGUI.dll" );
+#endif
}
else if( id == 701 || // MENU MEASURE - PROPERTIES
id == 702 || // MENU MEASURE - CDG
id == 707 || // MENU MEASURE - CHECK
id == 7072 || // MENU MEASURE - CHECK COMPOUND OF BLOCKS
id == 708 ) { // MENU MEASURE - POINT COORDINATES
- library = getLibrary( "libMeasureGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libMeasureGUI.so" );
+#else
+ library = getLibrary( "MeasureGUI.dll" );
+#endif
}
else if( id == 800 || // MENU GROUP - CREATE
id == 8001 || // POPUP MENU - CREATE GROUP
id == 801 ) { // MENU GROUP - EDIT
- library = getLibrary( "libGroupGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libGroupGUI.so" );
+#else
+ library = getLibrary( "GroupGUI.dll" );
+#endif
}
else if( id == 9999 || // MENU BLOCKS - HEXAHEDRAL SOLID
id == 9998 || // MENU BLOCKS - MULTI-TRANSFORMATION
id == 9997 || // MENU BLOCKS - QUADRANGLE FACE
id == 99991 || // MENU BLOCKS - PROPAGATE
id == 9995 ) { // MENU BLOCKS - EXPLODE ON BLOCKS
- library = getLibrary( "libBlocksGUI.so" );
+#ifndef WNT
+ library = getLibrary( "libBlocksGUI.so" );
+#else
+ library = getLibrary( "BlocksGUI.dll" );
+#endif
}
// call method of corresponding GUI library
- if ( library )
+ if ( library )
library->OnGUIEvent( id, desk );
- else
+ else
SUIT_MessageBox::error1( desk, tr( "GEOM_ERROR" ), tr( "GEOM_ERR_LIB_NOT_FOUND" ), tr( "GEOM_BUT_OK" ) );
}
// 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();
{
QMenuBar* Mb = parent->getMainMenuBar();
SUIT_Study* ActiveStudy = application()->activeStudy();
-
+
// Wireframe or Shading
int DisplayMode = 0;
SUIT_ViewWindow* window = application()->desktop()->activeWindow();
}
}
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();
}
}
// if(!AddInStudy.isEmpty())
// Settings_AddInStudy = AddInStudy.toInt();
// else
-
+
Settings_AddInStudy = 1;
Mb->setItemChecked(411, Settings_AddInStudy);
- // step value
+ // step value
QString S = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
if(S.isEmpty())
QAD_CONFIG->addSetting("Geometry:SettingsGeomStep", "100");
- // isos
+ // isos
int count = ActiveStudy->getStudyFramesCount();
for(int i = 0; i < count; i++) {
if(ActiveStudy->getStudyFrame(i)->getTypeView() == VIEW_OCC) {
GUIMap::Iterator it;
for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it )
bOk = bOk && it.data()->SetSettings( parent );
-
- // MZN: Enable/disable "Clipping range" menu item(from GEOM_CLIPPING variable)
+
+ // MZN: Enable/disable "Clipping range" menu item(from GEOM_CLIPPING variable)
if (getenv( "GEOM_CLIPPING" ) == NULL)
{
QMenuItem* mi = Mb->findItem(50);
if (mi && mi->popup())
- mi->popup()->removeItem(507);
- }
-
+ mi->popup()->removeItem(507);
+ }
+
return bOk;
}
*/
//=======================================================================
// function : createGeomAction
-// purpose :
+// purpose :
//=======================================================================
void GeometryGUI::createGeomAction( const int id, const QString& po_id, const QString& icon_id, const int key, const bool toggle )
{
QWidget* parent = application()->desktop();
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
QPixmap pix;
- if ( icon_id.length() )
+ if ( icon_id.length() )
pix = resMgr->loadPixmap( "GEOM", tr( icon_id ) );
else
- pix = resMgr->loadPixmap( "GEOM", tr( QString( "ICO_" )+po_id ) );
+ pix = resMgr->loadPixmap( "GEOM", tr( QString( "ICO_" )+po_id ), false );
if ( !pix.isNull() )
icon = QIconSet( pix );
//=======================================================================
-// 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 )
{
createGeomAction( 5011, "FUSE" );
createGeomAction( 5012, "COMMON" );
createGeomAction( 5013, "CUT" );
- createGeomAction( 50114, "SECTION" );
+ createGeomAction( 5014, "SECTION" );
createGeomAction( 5021, "TRANSLATION" );
createGeomAction( 5022, "ROTATION" );
createGeomAction( 608, "POINT_ON_EDGE" );
createGeomAction( 609, "CHECK_FREE_BNDS" );
createGeomAction( 610, "CHECK_FREE_FACES" );
-
+ createGeomAction( 611, "CHANGE_ORIENTATION" );
+
createGeomAction( 708, "POINT_COORDS" );
createGeomAction( 701, "BASIC_PROPS" );
createGeomAction( 702, "MASS_CENTER" );
createGeomAction( 7072, "CHECK_COMPOUND" );
createGeomAction( 5103, "CHECK_GEOMETRY" );
-
+
createGeomAction( 412, "SHADING_COLOR" );
createGeomAction( 413, "ISOS" );
createGeomAction( 414, "STEP_VALUE" );
createGeomAction( 212, "DISPLAY_ALL" );
createGeomAction( 214, "ERASE_ALL" );
createGeomAction( 216, "DISPLAY" );
+ createGeomAction( 2171, "VERTEX_SEL_ONLY" ,"", 0, true );
+ createGeomAction( 2172, "EDGE_SEL_ONLY", "", 0, true );
+ createGeomAction( 2173, "WIRE_SEL_ONLY", "", 0, true );
+ createGeomAction( 2174, "FACE_SEL_ONLY", "", 0, true );
+ createGeomAction( 2175, "SHELL_SEL_ONLY", "", 0, true );
+ createGeomAction( 2176, "SOLID_SEL_ONLY", "", 0, true );
+ createGeomAction( 2177, "COMPOUND_SEL_ONLY", "", 0, true );
+ createGeomAction( 2178, "ALL_SEL_ONLY", "", 0, true );
createGeomAction( 213, "DISPLAY_ONLY" );
createGeomAction( 215, "ERASE" );
createMenu( 4020, basicId, -1 );
int primId = createMenu( tr( "MEN_PRIMITIVES" ), newEntId, -1 );
- createMenu( 4021, primId, -1 );
- createMenu( 4022, primId, -1 );
- createMenu( 4023, primId, -1 );
- createMenu( 4024, primId, -1 );
- createMenu( 4025, primId, -1 );
+ createMenu( 4021, primId, -1 );
+ createMenu( 4022, primId, -1 );
+ createMenu( 4023, primId, -1 );
+ createMenu( 4024, primId, -1 );
+ createMenu( 4025, primId, -1 );
int genId = createMenu( tr( "MEN_GENERATION" ), newEntId, -1 );
- createMenu( 4031, genId, -1 );
- createMenu( 4032, genId, -1 );
- createMenu( 4033, genId, -1 );
- createMenu( 4034, genId, -1 );
+ createMenu( 4031, genId, -1 );
+ createMenu( 4032, genId, -1 );
+ createMenu( 4033, genId, -1 );
+ createMenu( 4034, genId, -1 );
createMenu( separator(), newEntId, -1 );
int groupId = createMenu( tr( "MEN_GROUP" ), newEntId, -1 );
- createMenu( 800, groupId, -1 );
- createMenu( 801, groupId, -1 );
+ createMenu( 800, groupId, -1 );
+ createMenu( 801, groupId, -1 );
createMenu( separator(), newEntId, -1 );
int blocksId = createMenu( tr( "MEN_BLOCKS" ), newEntId, -1 );
- createMenu( 9997, blocksId, -1 );
- createMenu( 9999, blocksId, -1 );
+ createMenu( 9997, blocksId, -1 );
+ createMenu( 9999, blocksId, -1 );
createMenu( separator(), newEntId, -1 );
- createMenu( 404, newEntId, -1 );
+ createMenu( 404, newEntId, -1 );
createMenu( separator(), newEntId, -1 );
- createMenu( 407, newEntId, -1 );
+ createMenu( 407, newEntId, -1 );
int buildId = createMenu( tr( "MEN_BUILD" ), newEntId, -1 );
- createMenu( 4081, buildId, -1 );
- createMenu( 4082, buildId, -1 );
- createMenu( 4083, buildId, -1 );
- createMenu( 4084, buildId, -1 );
- createMenu( 4085, buildId, -1 );
- createMenu( 4086, buildId, -1 );
+ createMenu( 4081, buildId, -1 );
+ createMenu( 4082, buildId, -1 );
+ createMenu( 4083, buildId, -1 );
+ createMenu( 4084, buildId, -1 );
+ createMenu( 4085, buildId, -1 );
+ createMenu( 4086, buildId, -1 );
int operId = createMenu( tr( "MEN_OPERATIONS" ), -1, -1, 10 );
int boolId = createMenu( tr( "MEN_BOOLEAN" ), operId, -1 );
- createMenu( 5011, boolId, -1 );
- createMenu( 5012, boolId, -1 );
- createMenu( 5013, boolId, -1 );
- createMenu( 5014, boolId, -1 );
+ createMenu( 5011, boolId, -1 );
+ createMenu( 5012, boolId, -1 );
+ createMenu( 5013, boolId, -1 );
+ createMenu( 5014, boolId, -1 );
int transId = createMenu( tr( "MEN_TRANSFORMATION" ), operId, -1 );
- createMenu( 5021, transId, -1 );
- createMenu( 5022, transId, -1 );
- createMenu( 5023, transId, -1 );
- createMenu( 5024, transId, -1 );
- createMenu( 5025, transId, -1 );
- createMenu( 5026, transId, -1 );
+ createMenu( 5021, transId, -1 );
+ createMenu( 5022, transId, -1 );
+ createMenu( 5023, transId, -1 );
+ createMenu( 5024, transId, -1 );
+ createMenu( 5025, transId, -1 );
+ createMenu( 5026, transId, -1 );
createMenu( separator(), transId, -1 );
- createMenu( 5027, transId, -1 );
- createMenu( 5028, transId, -1 );
+ createMenu( 5027, transId, -1 );
+ createMenu( 5028, transId, -1 );
- createMenu( 503, operId, -1 );
- createMenu( 504, operId, -1 );
+ createMenu( 503, operId, -1 );
+ createMenu( 504, operId, -1 );
createMenu( separator(), operId, -1 );
- createMenu( 505, transId, -1 );
- createMenu( 506, transId, -1 );
- //createMenu( 507, transId, -1 );
+ createMenu( 505, transId, -1 );
+ createMenu( 506, transId, -1 );
+ //createMenu( 507, transId, -1 );
int blockId = createMenu( tr( "MEN_BLOCKS" ), operId, -1 );
- createMenu( 9998, blockId, -1 );
- createMenu( 9995, blockId, -1 );
- createMenu( 99991, blockId, -1 );
+ createMenu( 9998, blockId, -1 );
+ createMenu( 9995, blockId, -1 );
+ createMenu( 99991, blockId, -1 );
int repairId = createMenu( tr( "MEN_REPAIR" ), -1, -1, 10 );
- createMenu( 605, repairId, -1 );
- createMenu( 603, repairId, -1 );
- createMenu( 606, repairId, -1 );
- createMenu( 607, repairId, -1 );
- createMenu( 604, repairId, -1 );
- createMenu( 601, repairId, -1 );
- createMenu( 602, repairId, -1 );
- createMenu( 608, repairId, -1 );
- createMenu( 609, repairId, -1 );
- createMenu( 610, repairId, -1 );
+ createMenu( 605, repairId, -1 );
+ createMenu( 603, repairId, -1 );
+ createMenu( 606, repairId, -1 );
+ createMenu( 607, repairId, -1 );
+ createMenu( 604, repairId, -1 );
+ createMenu( 601, repairId, -1 );
+ createMenu( 602, repairId, -1 );
+ createMenu( 608, repairId, -1 );
+ createMenu( 609, repairId, -1 );
+ createMenu( 610, repairId, -1 );
+ createMenu( 611, repairId, -1 );
int measurId = createMenu( tr( "MEN_MEASURES" ), -1, -1, 10 );
- createMenu( 708, measurId, -1 );
- createMenu( 701, measurId, -1 );
+ createMenu( 708, measurId, -1 );
+ createMenu( 701, measurId, -1 );
createMenu( separator(), measurId, -1 );
- createMenu( 702, measurId, -1 );
- createMenu( 703, measurId, -1 );
+ createMenu( 702, measurId, -1 );
+ createMenu( 703, measurId, -1 );
createMenu( separator(), measurId, -1 );
int dimId = createMenu( tr( "MEN_DIMENSIONS" ), measurId, -1 );
- createMenu( 7041, dimId, -1 );
+ createMenu( 7041, dimId, -1 );
createMenu( 7042, dimId, -1 );
createMenu( separator(), measurId, -1 );
-
- createMenu( 705, measurId, -1 );
+
+ createMenu( 705, measurId, -1 );
createMenu( separator(), measurId, -1 );
- createMenu( 706, measurId, -1 );
- createMenu( 707, measurId, -1 );
- createMenu( 7072, measurId, -1 );
+ createMenu( 706, measurId, -1 );
+ createMenu( 707, measurId, -1 );
+ createMenu( 7072, measurId, -1 );
- int toolsId = createMenu( tr( "MEN_TOOLS" ), -1, -1, 10 );
+ int toolsId = createMenu( tr( "MEN_TOOLS" ), -1, -1, 50 );
createMenu( separator(), toolsId, -1 );
- createMenu( 5103, toolsId, -1 );
-
- int prefId = createMenu( tr( "MEN_PREFERENCES" ), -1, -1, 10 );
- createMenu( separator(), prefId, -1 );
+ createMenu( 5103, toolsId, -1 );
- int geomId = createMenu( tr( "MEN_PREFERENCES_GEOM" ), prefId, -1 );
- createMenu( 412, geomId, -1 );
- createMenu( 413, geomId, -1 );
- createMenu( 414, geomId, -1 );
- createMenu( separator(), prefId, -1 );
+ //int prefId = createMenu( tr( "MEN_PREFERENCES" ), -1, -1, 50 );
+ //createMenu( separator(), prefId, -1 );
+ //int geomId = createMenu( tr( "MEN_PREFERENCES_GEOM" ), prefId, -1 );
+ //createMenu( 412, geomId, -1 );
+ //createMenu( 413, geomId, -1 );
+ //createMenu( 414, geomId, -1 );
+ //createMenu( separator(), prefId, -1 );
int viewId = createMenu( tr( "MEN_VIEW" ), -1, -1 );
createMenu( separator(), viewId, -1 );
int dispmodeId = createMenu( tr( "MEN_DISPLAY_MODE" ), viewId, -1 );
- createMenu( 211, dispmodeId, -1 );
-
+ createMenu( 211, dispmodeId, -1 );
+
createMenu( separator(), viewId, -1 );
- createMenu( 212, viewId, -1 );
- createMenu( 214, viewId, -1 );
+ createMenu( 212, viewId, -1 );
+ createMenu( 214, viewId, -1 );
createMenu( separator(), viewId, -1 );
- createMenu( 216, viewId, -1 );
- createMenu( 213, 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 --------------------------
createTool( 4020, basicTbId );
int primTbId = createTool( tr( "TOOL_PRIMITIVES" ) );
- createTool( 4021, primTbId );
- createTool( 4022, primTbId );
- createTool( 4023, primTbId );
- createTool( 4024, primTbId );
- createTool( 4025, primTbId );
+ createTool( 4021, primTbId );
+ createTool( 4022, primTbId );
+ createTool( 4023, primTbId );
+ createTool( 4024, primTbId );
+ createTool( 4025, primTbId );
int boolTbId = createTool( tr( "TOOL_BOOLEAN" ) );
- createTool( 5011, boolTbId );
- createTool( 5012, boolTbId );
- createTool( 5013, boolTbId );
- createTool( 5014, boolTbId );
+ createTool( 5011, boolTbId );
+ createTool( 5012, boolTbId );
+ createTool( 5013, boolTbId );
+ createTool( 5014, boolTbId );
int genTbId = createTool( tr( "TOOL_GENERATION" ) );
- createTool( 4031, genTbId );
- createTool( 4032, genTbId );
- createTool( 4033, genTbId );
- createTool( 4034, genTbId );
+ createTool( 4031, genTbId );
+ createTool( 4032, genTbId );
+ createTool( 4033, genTbId );
+ createTool( 4034, genTbId );
int transTbId = createTool( tr( "TOOL_TRANSFORMATION" ) );
- createTool( 5021, transTbId );
- createTool( 5022, transTbId );
- createTool( 5023, transTbId );
- createTool( 5024, transTbId );
- createTool( 5025, transTbId );
- createTool( 5026, transTbId );
+ createTool( 5021, transTbId );
+ createTool( 5022, transTbId );
+ createTool( 5023, transTbId );
+ createTool( 5024, transTbId );
+ createTool( 5025, transTbId );
+ createTool( 5026, transTbId );
createTool( separator(), transTbId );
- createTool( 5027, transTbId );
+ createTool( 5027, transTbId );
createTool( 5028, transTbId );
+ // ---- create popup menus --------------------------
+
+ QString clientOCCorVTK = "(client='OCCViewer' or client='VTKViewer')";
+ QString clientOCCorVTK_AndSomeVisible = clientOCCorVTK + " and selcount>0 and isVisible";
+
QtxPopupMgr* mgr = popupMgr();
- mgr->insert( action( 901 ), -1, -1 ); // rename
+ mgr->insert( action( 901 ), -1, -1 ); // rename
mgr->setRule( action( 901 ), "$type in {'Shape' 'Group'} and selcount=1", true );
mgr->insert( action( 8001 ), -1, -1 ); // create group
- mgr->setRule( action( 8001 ), "$client in {'ObjectBrowser'} and $type in {'Shape'} and selcount=1 and isOCC", true );
- mgr->insert( action( 801 ), -1, -1 ); // edit group
- mgr->setRule( action( 801 ), "$client in {'ObjectBrowser'} and $type in {'Group'} and selcount=1 and isOCC", true );
- mgr->insert( separator(), -1, -1 ); // -----------
+ mgr->setRule( action( 8001 ), "client='ObjectBrowser' and type='Shape' and selcount=1 and isOCC=true", true );
+ mgr->insert( action( 801 ), -1, -1 ); // edit group
+ mgr->setRule( action( 801 ), "client='ObjectBrowser' and type='Group' and selcount=1 and isOCC=true", true );
+ 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 in {'OCCViewer' 'VTKViewer'} and selcount>0", true );
- mgr->setRule( action( 80311 ), "$displaymode in {'Wireframe'}", false );
+ mgr->setRule( action( 80311 ), clientOCCorVTK_AndSomeVisible, true );
+ mgr->setRule( action( 80311 ), clientOCCorVTK + " and displaymode='Wireframe'", false );
mgr->insert( action( 80312 ), dispmodeId, -1 ); // shading
- mgr->setRule( action( 80312 ), "$client in {'OCCViewer' 'VTKViewer'} and selcount>0", true );
- mgr->setRule( action( 80312 ), "$displaymode in {'Shading'}", false );
- mgr->insert( separator(), -1, -1 ); // -----------
+ mgr->setRule( action( 80312 ), clientOCCorVTK_AndSomeVisible, true );
+ mgr->setRule( action( 80312 ), clientOCCorVTK + " and displaymode='Shading'", false );
+ mgr->insert( separator(), -1, -1 ); // -----------
mgr->insert( action( 8032 ), -1, -1 ); // color
- mgr->setRule( action( 8032 ), "$client in {'OCCViewer' 'VTKViewer'} and selcount>0", true );
+ mgr->setRule( action( 8032 ), clientOCCorVTK_AndSomeVisible + " and ($component={'GEOM'})", true );
mgr->insert( action( 8033 ), -1, -1 ); // transparency
- mgr->setRule( action( 8033 ), "$client in {'OCCViewer' 'VTKViewer'} and selcount>0", true );
+ mgr->setRule( action( 8033 ), clientOCCorVTK_AndSomeVisible, true );
mgr->insert( action( 8034 ), -1, -1 ); // isos
- mgr->setRule( action( 8034 ), "$client in {'OCCViewer'} and selcount>0", true );
- mgr->insert( separator(), -1, -1 ); // -----------
+ 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 ), "$isActiveViewer in {true} and selcount>0 and (($type in {'Shape' 'Group'} and ($isVisible in {false})) or $type in {'Component'})", true );
+ mgr->setRule( action( 216 ), rule.arg( types ).arg( "not isVisible" ), true );
+
mgr->insert( action( 215 ), -1, -1 ); // erase
- mgr->setRule( action( 215 ), "$isActiveViewer in {true} and selcount>0 and (($type in {'Shape' 'Group'} and $isVisible in {true}) or ($type in {'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 ), "$isActiveViewer in {true} and $client in {'OCCViewer' 'VTKViewer'}", true );
+ mgr->setRule( action( 214 ), clientOCCorVTK, true );
+
+ QString selectOnly = "(client='OCCViewer' or client='VTKViewer') and (selcount=0)";
+
+ int selectolnyId = mgr->insert( tr("MEN_SELECT_ONLY"), -1, -1); //select only menu
+ mgr->insert( action(2171), selectolnyId, -1); //Vertex
+ mgr->setRule(action(2171), selectOnly, true);
+ mgr->setRule(action(2171), selectOnly + " and selectionmode='VERTEX'", false);
+ mgr->insert( action(2172), selectolnyId, -1); //Edge
+ mgr->setRule(action(2172), selectOnly, true);
+ mgr->setRule(action(2172), selectOnly + " and selectionmode='EDGE'", false);
+ mgr->insert( action(2173), selectolnyId, -1); //Wire
+ mgr->setRule(action(2173), selectOnly, true);
+ mgr->setRule(action(2173), selectOnly + " and selectionmode='WIRE'", false);
+ mgr->insert( action(2174), selectolnyId, -1); //Face
+ mgr->setRule(action(2174), selectOnly, true);
+ mgr->setRule(action(2174), selectOnly + " and selectionmode='FACE'", false);
+ mgr->insert( action(2175), selectolnyId, -1); //Shell
+ mgr->setRule(action(2175), selectOnly, true);
+ mgr->setRule(action(2175), selectOnly + " and selectionmode='SHELL'", false);
+ mgr->insert( action(2176), selectolnyId, -1); //Solid
+ mgr->setRule(action(2176), selectOnly, true);
+ mgr->setRule(action(2176), selectOnly + " and selectionmode='SOLID'", false);
+ mgr->insert( action(2177), selectolnyId, -1); //Compound
+ mgr->setRule(action(2177), selectOnly, true);
+ mgr->setRule(action(2177), selectOnly + " and selectionmode='COMPOUND'", false);
+ mgr->insert( separator(), selectolnyId, -1);
+ mgr->insert( action(2178), selectolnyId, -1); //Clear selection filter
+ mgr->setRule(action(2178), selectOnly, true);
+ mgr->setRule(action(2178), selectOnly + " and selectionmode='ALL'", false);
+
mgr->insert( action( 213 ), -1, -1 ); // display only
- mgr->setRule( action( 213 ), "$isActiveViewer in {true} and selcount>0 and ($type in {'Shape' 'Group'} or ($type in {'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 )
{
setMenuShown( false );
setToolShown( false );
- disconnect( application()->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ),
+ 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();
GUIMap::Iterator it;
for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it )
- it.data()->deactivate();
+ 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();
if( nbSel == 0 ) {
////// NOTHING SELECTED
popup->clear();
- }
+ }
else if ( nbSel == 1 ) {
////// SINGLE OBJECT SELECTION
if ( parentComponent != parent->getActiveComponent() ) {
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 : GeometryGUI::BuildPresentation()
-// purpose :
+// purpose :
//=======================================================================
void GeometryGUI::BuildPresentation( const Handle(SALOME_InteractiveObject)& io, SUIT_ViewWindow* win )
{
}
//=======================================================================
-// 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
action( 603 )->setEnabled( ViewOCC ); // SuppressFace
{
mappa.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::DockLeft );
mappa.insert( SalomeApp_Application::WT_PyConsole, Qt::DockBottom );
- mappa.insert( SalomeApp_Application::WT_LogWindow, Qt::DockBottom );
}
void GeometryGUI::viewManagers( QStringList& lst ) const
{
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();
}
title = QString( obj->GetName().c_str() );
}
}
+
+void GeometryGUI::createPreferences()
+{
+ int tabId = addPreference( tr( "PREF_TAB_SETTINGS" ) );
+
+ int genGroup = addPreference( tr( "PREF_GROUP_GENERAL" ), tabId );
+ setPreferenceProperty( genGroup, "columns", 1 );
+
+ int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), genGroup,
+ LightApp_Preferences::Selector, "Geometry", "display_mode" );
+
+ addPreference( tr( "PREF_SHADING_COLOR" ), genGroup,
+ LightApp_Preferences::Color, "Geometry", "shading_color" );
+
+ addPreference( tr( "PREF_WIREFRAME_COLOR" ), genGroup,
+ LightApp_Preferences::Color, "Geometry", "wireframe_color" );
+
+ addPreference( tr( "PREF_FREE_BOUND_COLOR" ), genGroup,
+ LightApp_Preferences::Color, "Geometry", "free_bound_color" );
+
+ addPreference( tr( "PREF_LINE_COLOR"), genGroup,
+ LightApp_Preferences::Color, "Geometry", "line_color" );
+
+ addPreference( tr( "PREF_POINT_COLOR"), genGroup,
+ LightApp_Preferences::Color, "Geometry", "point_color" );
+
+ addPreference( tr( "PREF_ISOS_COLOR" ), genGroup,
+ LightApp_Preferences::Color, "Geometry", "isos_color" );
+
+ int step = addPreference( tr( "PREF_STEP_VALUE" ), genGroup,
+ LightApp_Preferences::IntSpin, "Geometry", "SettingsGeomStep" );
+
+ int VertexGroup = addPreference( tr( "PREF_GROUP_VERTEX" ), tabId );
+
+ int typeOfMarker = addPreference( tr( "PREF_TYPE_OF_MARKER" ), VertexGroup,
+ LightApp_Preferences::Selector, "Geometry", "type_of_marker" );
+
+ int markerScale = addPreference( tr( "PREF_MARKER_SCALE" ), VertexGroup,
+ LightApp_Preferences::DblSpin, "Geometry", "marker_scale" );
+
+ // Set property for default display mode
+ QStringList aModesList;
+ aModesList.append( tr("MEN_WIREFRAME") );
+ aModesList.append( tr("MEN_SHADING") );
+
+ QValueList<QVariant> anIndexesList;
+ anIndexesList.append(0);
+ anIndexesList.append(1);
+
+ setPreferenceProperty( dispmode, "strings", aModesList );
+ setPreferenceProperty( dispmode, "indexes", anIndexesList );
+
+ // Set property for step value for spinboxes
+ setPreferenceProperty( step, "min", 0.001 );
+ setPreferenceProperty( step, "max", 10000 );
+ setPreferenceProperty( step, "precision", 3 );
+
+ // Set property for type of vertex marker
+ QStringList aTypeOfMarkerList;
+ QValueList<QVariant> anTypeOfMarkerIndexesList;
+
+ aTypeOfMarkerList.append( tr("TOM_PLUS") );
+ anTypeOfMarkerIndexesList.append(Aspect_TOM_PLUS);
+
+ aTypeOfMarkerList.append( tr("TOM_POINT") );
+ anTypeOfMarkerIndexesList.append(Aspect_TOM_POINT);
+
+ aTypeOfMarkerList.append( tr("TOM_STAR") );
+ anTypeOfMarkerIndexesList.append(Aspect_TOM_STAR);
+
+ aTypeOfMarkerList.append( tr("TOM_O") );
+ anTypeOfMarkerIndexesList.append(Aspect_TOM_O);
+
+ aTypeOfMarkerList.append( tr("TOM_X") );
+ anTypeOfMarkerIndexesList.append(Aspect_TOM_X);
+
+ aTypeOfMarkerList.append( tr("TOM_O_POINT") );
+ anTypeOfMarkerIndexesList.append(Aspect_TOM_O_POINT);
+
+ aTypeOfMarkerList.append( tr("TOM_O_PLUS") );
+ anTypeOfMarkerIndexesList.append(Aspect_TOM_O_PLUS);
+
+ aTypeOfMarkerList.append( tr("TOM_O_STAR") );
+ anTypeOfMarkerIndexesList.append(Aspect_TOM_O_STAR);
+
+ aTypeOfMarkerList.append( tr("TOM_O_X") );
+ anTypeOfMarkerIndexesList.append(Aspect_TOM_O_X);
+
+
+ setPreferenceProperty( typeOfMarker, "strings", aTypeOfMarkerList );
+ setPreferenceProperty( typeOfMarker, "indexes", anTypeOfMarkerIndexesList );
+
+ // Set property for Vertex Marker scale
+ setPreferenceProperty( markerScale, "min", 1. );
+ setPreferenceProperty( markerScale, "max", 7. );
+ setPreferenceProperty( markerScale, "precision", 0.01 );
+ setPreferenceProperty( markerScale, "step", 0.5 );
+
+}
+
+void GeometryGUI::preferencesChanged( const QString& section, const QString& param )
+{
+ if (section == "Geometry") {
+ SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
+ if (param == QString("SettingsGeomStep")) {
+ double spin_step = aResourceMgr->doubleValue(section, param, 100.);
+ EmitSignalDefaultStepValueChanged(spin_step);
+ }
+ }
+}
+
+LightApp_Displayer* GeometryGUI::displayer()
+{
+ if( !myDisplayer )
+ myDisplayer = new GEOM_Displayer( dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) );
+ return myDisplayer;
+}
+
+void GeometryGUI::setLocalSelectionMode(const int mode)
+{
+ myLocalSelectionMode = mode;
+}
+int GeometryGUI::getLocalSelectionMode() const
+{
+ return myLocalSelectionMode;
+}
