Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ViewerDlg.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx
b/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx
index e2ca565f2da7ce901772232303c9733f336748c8..43a017d36e66e0b8ae1724a36ea9dff5480d3903 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ViewerDlg.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ViewerDlg.cxx
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-34,7
+30,9
@@
#include <OCCViewer_Utilities.h>
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewFrame.h>
#include <OCCViewer_Utilities.h>
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewFrame.h>
+
#include <LightApp_Application.h>
#include <LightApp_Application.h>
+#include <LightApp_SelectionMgr.h>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
@@
-54,7
+52,7
@@
HYDROGUI_ViewerDlg::HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QStrin
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
myViewManager = new OCCViewer_ViewManager( theModule->getApp()->activeStudy(), 0 );
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
myViewManager = new OCCViewer_ViewManager( theModule->getApp()->activeStudy(), 0 );
- OCCViewer_Viewer* aViewer = new OCCViewer_Viewer(
fals
e );
+ OCCViewer_Viewer* aViewer = new OCCViewer_Viewer(
tru
e );
aViewer->setBackground( OCCViewer_ViewFrame::TOP_LEFT,
aResMgr->backgroundValue( "OCCViewer", "xz_background", aViewer->background(OCCViewer_ViewFrame::TOP_LEFT) ) );
aViewer->setBackground( OCCViewer_ViewFrame::TOP_LEFT,
aResMgr->backgroundValue( "OCCViewer", "xz_background", aViewer->background(OCCViewer_ViewFrame::TOP_LEFT) ) );
@@
-74,8
+72,11
@@
HYDROGUI_ViewerDlg::HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QStrin
myViewManager->setViewModel( aViewer );// custom view model, which extends SALOME_View interface
myViewManager->setViewModel( aViewer );// custom view model, which extends SALOME_View interface
+ aViewer->enableMultiselection( false );
+
SUIT_ViewWindow* aViewWin = myViewManager->createViewWindow();
aViewer->setStaticTrihedronDisplayed( false );
SUIT_ViewWindow* aViewWin = myViewManager->createViewWindow();
aViewer->setStaticTrihedronDisplayed( false );
+ /*
Handle(AIS_Trihedron) aTrihedron =
HYDROGUI_AISTrihedron::createTrihedron( aResMgr->doubleValue( "3DViewer", "trihedron_size", aViewer->trihedronSize() ) );
Handle(AIS_InteractiveContext) anAISContext = aViewer->getAISContext();
Handle(AIS_Trihedron) aTrihedron =
HYDROGUI_AISTrihedron::createTrihedron( aResMgr->doubleValue( "3DViewer", "trihedron_size", aViewer->trihedronSize() ) );
Handle(AIS_InteractiveContext) anAISContext = aViewer->getAISContext();
@@
-84,7
+85,7
@@
HYDROGUI_ViewerDlg::HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QStrin
anAISContext->Display( aTrihedron );
anAISContext->Deactivate( aTrihedron );
}
anAISContext->Display( aTrihedron );
anAISContext->Deactivate( aTrihedron );
}
-
+ */
viewBase->addWidget( aViewWin );
// Coordinates
viewBase->addWidget( aViewWin );
// Coordinates
@@
-104,14
+105,26
@@
HYDROGUI_ViewerDlg::HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QStrin
HYDROGUI_ViewerDlg::~HYDROGUI_ViewerDlg()
{
HYDROGUI_ViewerDlg::~HYDROGUI_ViewerDlg()
{
+ myViewManager->closeAllViews();
delete myViewManager;
}
bool HYDROGUI_ViewerDlg::event( QEvent* e )
{
if ( e->type() == QEvent::Polish )
delete myViewManager;
}
bool HYDROGUI_ViewerDlg::event( QEvent* e )
{
if ( e->type() == QEvent::Polish )
+ {
addWidget( myCoordLabel->parentWidget(), 4 );
addWidget( myCoordLabel->parentWidget(), 4 );
+ Handle(AIS_Trihedron) aTrihedron = trihedron();
+ Handle(AIS_InteractiveContext) anAISContext = getAISContext();
+ if ( !anAISContext.IsNull() && !aTrihedron.IsNull() )
+ {
+ viewer()->setTrihedronShown( false );
+ anAISContext->Display( aTrihedron );
+ anAISContext->Deactivate( aTrihedron );
+ }
+ }
+
return HYDROGUI_InputPanel::event( e );
}
return HYDROGUI_InputPanel::event( e );
}
@@
-131,6
+144,18
@@
OCCViewer_ViewManager* HYDROGUI_ViewerDlg::viewManager() const
return myViewManager;
}
return myViewManager;
}
+SUIT_SelectionMgr* HYDROGUI_ViewerDlg::selectionMgr() const
+{
+ SUIT_SelectionMgr* aSelMgr = 0;
+ if ( module() )
+ {
+ LightApp_Application* app = module()->getApp();
+ if ( app )
+ aSelMgr = app->selectionMgr();
+ }
+ return aSelMgr;
+}
+
void HYDROGUI_ViewerDlg::onMouseMove( SUIT_ViewWindow* theViewWindow, QMouseEvent* theEvent )
{
OCCViewer_ViewWindow* anOCCViewWindow =
void HYDROGUI_ViewerDlg::onMouseMove( SUIT_ViewWindow* theViewWindow, QMouseEvent* theEvent )
{
OCCViewer_ViewWindow* anOCCViewWindow =
@@
-158,3
+183,8
@@
bool HYDROGUI_ViewerDlg::eventFilter( QObject* theObj, QEvent* theEvent )
return HYDROGUI_InputPanel::eventFilter( theObj, theEvent );
}
return HYDROGUI_InputPanel::eventFilter( theObj, theEvent );
}
+
+Handle(AIS_Trihedron) HYDROGUI_ViewerDlg::trihedron()
+{
+ return Handle(AIS_Trihedron)();
+}