// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-#include "NewGeom_SalomeViewer.h"
-#include "NewGeom_OCCSelector.h"
+#include "SHAPERGUI_SalomeViewer.h"
+#include "SHAPERGUI_OCCSelector.h"
#include <OCCViewer_ViewPort3d.h>
#include <OCCViewer_ViewFrame.h>
#include <QMouseEvent>
#include <QContextMenuEvent>
-NewGeom_SalomeView::NewGeom_SalomeView(OCCViewer_Viewer* theViewer)
+SHAPERGUI_SalomeView::SHAPERGUI_SalomeView(OCCViewer_Viewer* theViewer)
: ModuleBase_IViewWindow(), myCurrentView(0)
{
myViewer = theViewer;
}
-Handle(V3d_View) NewGeom_SalomeView::v3dView() const
+Handle(V3d_View) SHAPERGUI_SalomeView::v3dView() const
{
Handle(V3d_View) aView;
if (myCurrentView) {
return aView;
}
-QWidget* NewGeom_SalomeView::viewPort() const
+QWidget* SHAPERGUI_SalomeView::viewPort() const
{
QWidget* aViewPort = 0;
if (myCurrentView) {
-NewGeom_SalomeViewer::NewGeom_SalomeViewer(QObject* theParent)
+SHAPERGUI_SalomeViewer::SHAPERGUI_SalomeViewer(QObject* theParent)
: ModuleBase_IViewer(theParent),
mySelector(0), myView(0), myIsSelectionChanged(false)
{
}
-NewGeom_SalomeViewer::~NewGeom_SalomeViewer()
+SHAPERGUI_SalomeViewer::~SHAPERGUI_SalomeViewer()
{
if (myView)
delete myView;
//**********************************************
-Handle(AIS_InteractiveContext) NewGeom_SalomeViewer::AISContext() const
+Handle(AIS_InteractiveContext) SHAPERGUI_SalomeViewer::AISContext() const
{
if (mySelector && mySelector->viewer())
return mySelector->viewer()->getAISContext();
}
//**********************************************
-Handle(V3d_Viewer) NewGeom_SalomeViewer::v3dViewer() const
+Handle(V3d_Viewer) SHAPERGUI_SalomeViewer::v3dViewer() const
{
if (mySelector)
return mySelector->viewer()->getViewer3d();
}
//**********************************************
-Handle(AIS_Trihedron) NewGeom_SalomeViewer::trihedron() const
+Handle(AIS_Trihedron) SHAPERGUI_SalomeViewer::trihedron() const
{
return mySelector->viewer()->getTrihedron();
}
//**********************************************
-Handle(V3d_View) NewGeom_SalomeViewer::activeView() const
+Handle(V3d_View) SHAPERGUI_SalomeViewer::activeView() const
{
if (mySelector) {
OCCViewer_Viewer* aViewer = mySelector->viewer();
}
//**********************************************
-QWidget* NewGeom_SalomeViewer::activeViewPort() const
+QWidget* SHAPERGUI_SalomeViewer::activeViewPort() const
{
QWidget* aViewPort;
if (mySelector) {
}
//**********************************************
-void NewGeom_SalomeViewer::setSelector(NewGeom_OCCSelector* theSel)
+void SHAPERGUI_SalomeViewer::setSelector(SHAPERGUI_OCCSelector* theSel)
{
if (mySelector) {
if (mySelector == theSel)
OCCViewer_Viewer* aViewer = mySelector->viewer();
SUIT_ViewManager* aMgr = aViewer->getViewManager();
- myView = new NewGeom_SalomeView(mySelector->viewer());
+ myView = new SHAPERGUI_SalomeView(mySelector->viewer());
// TODO: Provide ModuleBase_IViewWindow interface
connect(aMgr, SIGNAL(lastViewClosed(SUIT_ViewManager*)), this, SIGNAL(lastViewClosed()));
- connect(aMgr, SIGNAL(tryCloseView(SUIT_ViewWindow*)),
+ connect(aMgr, SIGNAL(tryCloseView(SUIT_ViewWindow*)),
this, SLOT(onTryCloseView(SUIT_ViewWindow*)));
- connect(aMgr, SIGNAL(deleteView(SUIT_ViewWindow*)),
+ connect(aMgr, SIGNAL(deleteView(SUIT_ViewWindow*)),
this, SLOT(onDeleteView(SUIT_ViewWindow*)));
- connect(aMgr, SIGNAL(viewCreated(SUIT_ViewWindow*)),
+ connect(aMgr, SIGNAL(viewCreated(SUIT_ViewWindow*)),
this, SLOT(onViewCreated(SUIT_ViewWindow*)));
- connect(aMgr, SIGNAL(activated(SUIT_ViewManager*)),
+ connect(aMgr, SIGNAL(activated(SUIT_ViewManager*)),
this, SLOT(onActivated(SUIT_ViewManager*)));
connect(aMgr, SIGNAL(mousePress(SUIT_ViewWindow*, QMouseEvent*)), this,
}
//**********************************************
-void NewGeom_SalomeViewer::onSelectionChanged()
+void SHAPERGUI_SalomeViewer::onSelectionChanged()
{
// Selection event must be sent only after mouse release
myIsSelectionChanged = true;
}
//**********************************************
-void NewGeom_SalomeViewer::onMousePress(SUIT_ViewWindow* theView, QMouseEvent* theEvent)
+void SHAPERGUI_SalomeViewer::onMousePress(SUIT_ViewWindow* theView, QMouseEvent* theEvent)
{
myView->setCurrentView(theView);
emit mousePress(myView, theEvent);
}
//**********************************************
-void NewGeom_SalomeViewer::onMouseRelease(SUIT_ViewWindow* theView, QMouseEvent* theEvent)
+void SHAPERGUI_SalomeViewer::onMouseRelease(SUIT_ViewWindow* theView, QMouseEvent* theEvent)
{
myView->setCurrentView(theView);
emit mouseRelease(myView, theEvent);
}
//**********************************************
-void NewGeom_SalomeViewer::onMouseDoubleClick(SUIT_ViewWindow* theView, QMouseEvent* theEvent)
+void SHAPERGUI_SalomeViewer::onMouseDoubleClick(SUIT_ViewWindow* theView, QMouseEvent* theEvent)
{
myView->setCurrentView(theView);
emit mouseDoubleClick(myView, theEvent);
}
//**********************************************
-void NewGeom_SalomeViewer::onMouseMove(SUIT_ViewWindow* theView, QMouseEvent* theEvent)
+void SHAPERGUI_SalomeViewer::onMouseMove(SUIT_ViewWindow* theView, QMouseEvent* theEvent)
{
myView->setCurrentView(theView);
emit mouseMove(myView, theEvent);
}
//**********************************************
-bool NewGeom_SalomeViewer::canDragByMouse() const
+bool SHAPERGUI_SalomeViewer::canDragByMouse() const
{
OCCViewer_Viewer* aViewer = mySelector->viewer();
SUIT_ViewWindow* aWnd = aViewer->getViewManager()->getActiveView();
//**********************************************
-void NewGeom_SalomeViewer::onKeyPress(SUIT_ViewWindow* theView, QKeyEvent* theEvent)
+void SHAPERGUI_SalomeViewer::onKeyPress(SUIT_ViewWindow* theView, QKeyEvent* theEvent)
{
emit keyPress(myView, theEvent);
}
//**********************************************
-void NewGeom_SalomeViewer::onKeyRelease(SUIT_ViewWindow* theView, QKeyEvent* theEvent)
+void SHAPERGUI_SalomeViewer::onKeyRelease(SUIT_ViewWindow* theView, QKeyEvent* theEvent)
{
emit keyRelease(myView, theEvent);
}
//**********************************************
-void NewGeom_SalomeViewer::onTryCloseView(SUIT_ViewWindow*)
+void SHAPERGUI_SalomeViewer::onTryCloseView(SUIT_ViewWindow*)
{
emit tryCloseView(myView);
}
//**********************************************
-void NewGeom_SalomeViewer::onDeleteView(SUIT_ViewWindow*)
+void SHAPERGUI_SalomeViewer::onDeleteView(SUIT_ViewWindow*)
{
if(myWindowScale.contains(myView->v3dView()))
myWindowScale.remove(myView->v3dView());
}
//**********************************************
-void NewGeom_SalomeViewer::onViewCreated(SUIT_ViewWindow* theView)
+void SHAPERGUI_SalomeViewer::onViewCreated(SUIT_ViewWindow* theView)
{
myView->setCurrentView(theView);
}
reconnectActions(aWnd, true);
- myWindowScale.insert (aView->getViewPort()->getView(), aView->getViewPort()->getView()->Camera()->Scale());
+ myWindowScale.insert(aView->getViewPort()->getView(),
+ aView->getViewPort()->getView()->Camera()->Scale());
emit viewCreated(myView);
}
//**********************************************
-void NewGeom_SalomeViewer::onActivated(SUIT_ViewManager* theMgr)
+void SHAPERGUI_SalomeViewer::onActivated(SUIT_ViewManager* theMgr)
{
myView->setCurrentView(theMgr->getActiveView());
emit activated(myView);
}
//**********************************************
-void NewGeom_SalomeViewer::enableSelection(bool isEnabled)
+void SHAPERGUI_SalomeViewer::enableSelection(bool isEnabled)
{
if (mySelector)
if (mySelector->viewer()->isSelectionEnabled() != isEnabled)
}
//**********************************************
-bool NewGeom_SalomeViewer::isSelectionEnabled() const
+bool SHAPERGUI_SalomeViewer::isSelectionEnabled() const
{
if (mySelector)
return mySelector->viewer()->isSelectionEnabled();
}
//**********************************************
-void NewGeom_SalomeViewer::enableMultiselection(bool isEnable)
+void SHAPERGUI_SalomeViewer::enableMultiselection(bool isEnable)
{
if (mySelector)
mySelector->viewer()->enableMultiselection(isEnable);
}
//**********************************************
-bool NewGeom_SalomeViewer::isMultiSelectionEnabled() const
+bool SHAPERGUI_SalomeViewer::isMultiSelectionEnabled() const
{
if (mySelector)
return mySelector->viewer()->isMultiSelectionEnabled();
}
//**********************************************
-bool NewGeom_SalomeViewer::enableDrawMode(bool isEnabled)
+bool SHAPERGUI_SalomeViewer::enableDrawMode(bool isEnabled)
{
// TODO: Has to be replaced when SALOME patch become available
if (mySelector)
}
//**********************************************
-void NewGeom_SalomeViewer::reconnectActions(SUIT_ViewWindow* theWindow,
- const bool theUseNewGeomSlot)
+void SHAPERGUI_SalomeViewer::reconnectActions(SUIT_ViewWindow* theWindow,
+ const bool theUseSHAPERSlot)
{
OCCViewer_ViewWindow* aWindow = dynamic_cast<OCCViewer_ViewWindow*>(theWindow);
if (!aWindow)
if (!anAction)
return;
- if (theUseNewGeomSlot) {
+ if (theUseSHAPERSlot) {
anAction->disconnect(anAction, SIGNAL(toggled(bool)),
theWindow, SLOT(onTrihedronShow(bool)));
anAction->connect(anAction, SIGNAL(toggled(bool)),
}
//**********************************************
-void NewGeom_SalomeViewer::fitAll()
+void SHAPERGUI_SalomeViewer::fitAll()
{
if (mySelector) {
SUIT_ViewManager* aMgr = mySelector->viewer()->getViewManager();
}
//**********************************************
-void NewGeom_SalomeViewer::setViewProjection(double theX, double theY, double theZ, double theTwist)
+void SHAPERGUI_SalomeViewer::setViewProjection(double theX, double theY,
+ double theZ, double theTwist)
{
- if (!mySelector)
+ if (!mySelector)
return;
SUIT_ViewManager* aMgr = mySelector->viewer()->getViewManager();
}
//***************************************
-void NewGeom_SalomeViewer::addSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
+void SHAPERGUI_SalomeViewer::addSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull()) {
}
//***************************************
-void NewGeom_SalomeViewer::removeSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
+void SHAPERGUI_SalomeViewer::removeSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull()) {
}
//***************************************
-bool NewGeom_SalomeViewer::hasSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
+bool SHAPERGUI_SalomeViewer::hasSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
{
bool aFoundFilter = false;
Handle(AIS_InteractiveContext) aContext = AISContext();
const SelectMgr_ListOfFilter& aFilters = aContext->Filters();
SelectMgr_ListIteratorOfListOfFilter aIt(aFilters);
for (; aIt.More() && !aFoundFilter; aIt.Next()) {
- aFoundFilter = theFilter.Access() == aIt.Value().Access();
+ aFoundFilter = theFilter.get() == aIt.Value().get();
}
}
return aFoundFilter;
}
//***************************************
-void NewGeom_SalomeViewer::clearSelectionFilters()
+void SHAPERGUI_SalomeViewer::clearSelectionFilters()
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull()) {
}
//***************************************
-void NewGeom_SalomeViewer::update()
+void SHAPERGUI_SalomeViewer::update()
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull()) {
}
//***************************************
-void NewGeom_SalomeViewer::onViewTransformed(OCCViewer_ViewWindow::OperationType theType)
+void SHAPERGUI_SalomeViewer::onViewTransformed(OCCViewer_ViewWindow::OperationType theType)
{
emit viewTransformed((int) theType);
}
//***************************************
-void NewGeom_SalomeViewer::onViewPortMapped()
+void SHAPERGUI_SalomeViewer::onViewPortMapped()
{
emit trihedronVisibilityChanged(true);
}
//***************************************
-void NewGeom_SalomeViewer::activateViewer(bool toActivate)
+void SHAPERGUI_SalomeViewer::activateViewer(bool toActivate)
{
if (!mySelector || !mySelector->viewer())
return;
foreach (SUIT_ViewWindow* aView, aViews) {
OCCViewer_ViewFrame* aOCCView = dynamic_cast<OCCViewer_ViewFrame*>(aView);
OCCViewer_ViewWindow* aWnd = aOCCView->getView(OCCViewer_ViewFrame::MAIN_VIEW);
- disconnect((OCCViewer_ViewWindow*)aWnd, SIGNAL(vpTransformationFinished(OCCViewer_ViewWindow::OperationType)),
+ disconnect((OCCViewer_ViewWindow*)aWnd,
+ SIGNAL(vpTransformationFinished(OCCViewer_ViewWindow::OperationType)),
this, SLOT(onViewTransformed(OCCViewer_ViewWindow::OperationType)));
reconnectActions(aWnd, false);
}
}
}
-void NewGeom_SalomeViewer::Zfitall()
-{
- if (!mySelector || !mySelector->viewer())
- return;
- SUIT_ViewManager* aMgr = mySelector->viewer()->getViewManager();
- OCCViewer_ViewFrame* aView = dynamic_cast<OCCViewer_ViewFrame*>(aMgr->getActiveView());
- if (aView) {
- OCCViewer_ViewWindow* aWnd = aView->getView(OCCViewer_ViewFrame::MAIN_VIEW);
- Handle(V3d_View) aView3d = aWnd->getViewPort()->getView();
- aView3d->ZFitAll();
- if (aView3d->Depth() < 0.1)
- aView3d->DepthFitAll();
- }
-}
\ No newline at end of file
+//void SHAPERGUI_SalomeViewer::Zfitall()
+//{
+// if (!mySelector || !mySelector->viewer())
+// return;
+// SUIT_ViewManager* aMgr = mySelector->viewer()->getViewManager();
+// /// WORKAROUND for issue #1798. SUIT_ViewManager::closeAllViews() should nullify myActiveView
+// /// As a result, we need to check views count in manager
+// if (aMgr->getViews().size() > 0) {
+// OCCViewer_ViewFrame* aView = dynamic_cast<OCCViewer_ViewFrame*>(aMgr->getActiveView());
+// if (aView) {
+// OCCViewer_ViewWindow* aWnd = aView->getView(OCCViewer_ViewFrame::MAIN_VIEW);
+// Handle(V3d_View) aView3d = aWnd->getViewPort()->getView();
+// aView3d->ZFitAll();
+// if (aView3d->Depth() < 0.1)
+// aView3d->DepthFitAll();
+// }
+// }
+//}
\ No newline at end of file
