From: ouv Date: Wed, 11 Jan 2006 08:31:03 +0000 (+0000) Subject: Fixed bug GVIEW11209 : Camera dump does not work X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3e1878256e948c50dd991f755373633bc7eaa54d;p=modules%2Fgui.git Fixed bug GVIEW11209 : Camera dump does not work --- diff --git a/src/SVTK/SVTK_MainWindow.cxx b/src/SVTK/SVTK_MainWindow.cxx index bb11c50e9..6b5e8c3f8 100644 --- a/src/SVTK/SVTK_MainWindow.cxx +++ b/src/SVTK/SVTK_MainWindow.cxx @@ -35,6 +35,7 @@ #include "SUIT_ToolButton.h" #include "SUIT_MessageBox.h" +#include "SUIT_ViewWindow.h" #include "SUIT_Tools.h" #include "SUIT_ResourceMgr.h" @@ -55,8 +56,10 @@ SVTK_MainWindow ::SVTK_MainWindow(QWidget* theParent, const char* theName, - SUIT_ResourceMgr* theResourceMgr) : - QMainWindow(theParent,theName,0) + SUIT_ResourceMgr* theResourceMgr, + SUIT_ViewWindow* theViewWindow) : + QMainWindow(theParent,theName,0), + myViewWindow(theViewWindow) { myToolBar = new QToolBar(this); myToolBar->setCloseMode(QDockWindow::Undocked); @@ -349,7 +352,7 @@ SVTK_MainWindow theResourceMgr->loadPixmap( "VTKViewer", tr( "ICON_VTKVIEWER_VIEW_DUMP" ) ), tr( "MNU_DUMP_VIEW" ), 0, this); anAction->setStatusTip(tr("DSC_DUMP_VIEW")); - connect(anAction, SIGNAL(activated()), this, SLOT(onDumpView())); + connect(anAction, SIGNAL(activated()), myViewWindow, SLOT(onDumpView())); myActionsMap[ DumpId ] = anAction; // FitAll @@ -682,12 +685,6 @@ SVTK_MainWindow GetRenderer()->OnAdjustCubeAxes(); } -//---------------------------------------------------------------------------- -void -SVTK_MainWindow -::onDumpView() -{} - //---------------------------------------------------------------------------- QImage SVTK_MainWindow diff --git a/src/SVTK/SVTK_MainWindow.h b/src/SVTK/SVTK_MainWindow.h index 223a4a6b5..758093797 100644 --- a/src/SVTK/SVTK_MainWindow.h +++ b/src/SVTK/SVTK_MainWindow.h @@ -21,6 +21,7 @@ class vtkInteractorStyle; class vtkRenderWindowInteractor; class SUIT_ResourceMgr; +class SUIT_ViewWindow; class SVTK_RenderWindowInteractor; class SVTK_NonIsometricDlg; @@ -48,7 +49,8 @@ class SVTK_EXPORT SVTK_MainWindow: public QMainWindow public: SVTK_MainWindow(QWidget* theParent, const char* theName, - SUIT_ResourceMgr* theResourceMgr); + SUIT_ResourceMgr* theResourceMgr, + SUIT_ViewWindow* theViewWindow); //! To initialize the class virtual @@ -199,8 +201,6 @@ public: void onAdjustTrihedron(); void onAdjustCubeAxes(); - void onDumpView(); - public: QImage dumpView(); @@ -219,6 +219,8 @@ public: ViewTrihedronId, NonIsometric, GraduatedAxes}; typedef QMap TActionsMap; + SUIT_ViewWindow* myViewWindow; + SVTK_NonIsometricDlg* myNonIsometricDlg; SVTK_CubeAxesDlg* myCubeAxesDlg;