From 01c524a818bf15fb5017225319f42c1caba6f54e Mon Sep 17 00:00:00 2001 From: ouv Date: Wed, 11 Jan 2006 10:09:36 +0000 Subject: [PATCH] Fixed bug GVIEW11209 : Camera dump does not work --- src/VVTK/VVTK_MainWindow.cxx | 19 +++++++++++-------- src/VVTK/VVTK_MainWindow.h | 10 +++++++--- src/VVTK/VVTK_ViewWindow.cxx | 6 ++++-- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/VVTK/VVTK_MainWindow.cxx b/src/VVTK/VVTK_MainWindow.cxx index 6eb73563..c3fddbc7 100644 --- a/src/VVTK/VVTK_MainWindow.cxx +++ b/src/VVTK/VVTK_MainWindow.cxx @@ -52,8 +52,9 @@ VVTK_MainWindow ::VVTK_MainWindow(QWidget* theParent, const char* theName, - SUIT_ResourceMgr* theResourceMgr): - SVTK_MainWindow(theParent,theName,theResourceMgr), + SUIT_ResourceMgr* theResourceMgr, + SUIT_ViewWindow* theViewWindow): + SVTK_MainWindow(theParent,theName,theResourceMgr,theViewWindow), myInteractorStyle(VVTK_InteractorStyle::New()), myControllerIncrement(VVTK_ControllerIncrement::New()), myControllerOnKeyDown(VVTK_ControllerOnKeyDown::New()) @@ -215,13 +216,13 @@ VVTK_MainWindow } } - //---------------------------------------------------------------------------- VVTK_MainWindow1 ::VVTK_MainWindow1(QSplitter* theParent, const char* theName, - SUIT_ResourceMgr* theResourceMgr): - VVTK_MainWindow(theParent,theName,theResourceMgr), + SUIT_ResourceMgr* theResourceMgr, + SUIT_ViewWindow* theViewWindow): + VVTK_MainWindow(theParent,theName,theResourceMgr,theViewWindow), myStyleSwitchAction(NULL), mySplitter(theParent), myPickingDlg(NULL) @@ -327,17 +328,18 @@ VVTK_MainWindow1 ::~VVTK_MainWindow1() {} - //---------------------------------------------------------------------------- VVTK_MainWindow2* VVTK_MainWindow1 ::CreateMainWindow2(QWidget* theParent, const char* theName, - SUIT_ResourceMgr* theResourceMgr) + SUIT_ResourceMgr* theResourceMgr, + SUIT_ViewWindow* theViewWindow) { myMainWindow2 = new VVTK_MainWindow2(theParent, theName, theResourceMgr, + theViewWindow, myStyleSwitchAction); return myMainWindow2; } @@ -474,8 +476,9 @@ VVTK_MainWindow2 ::VVTK_MainWindow2(QWidget* theParent, const char* theName, SUIT_ResourceMgr* theResourceMgr, + SUIT_ViewWindow* theViewWindow, QtxAction* theStyleSwitchAction): - VVTK_MainWindow(theParent,theName,theResourceMgr), + VVTK_MainWindow(theParent,theName,theResourceMgr,theViewWindow), myStyleSwitchAction(theStyleSwitchAction) {} diff --git a/src/VVTK/VVTK_MainWindow.h b/src/VVTK/VVTK_MainWindow.h index 20a2f719..7541c0b5 100644 --- a/src/VVTK/VVTK_MainWindow.h +++ b/src/VVTK/VVTK_MainWindow.h @@ -34,7 +34,8 @@ public: //! Construct instance of the class VVTK_MainWindow(QWidget* theParent, const char* theName, - SUIT_ResourceMgr* theResourceMgr); + SUIT_ResourceMgr* theResourceMgr, + SUIT_ViewWindow* theViewWindow); //! Reimplement SVTK_MainWindow::Initialize virtual @@ -96,7 +97,8 @@ public: //! Construct instance of the class VVTK_MainWindow1(QSplitter* theParent, const char* theName, - SUIT_ResourceMgr* theResourceMgr); + SUIT_ResourceMgr* theResourceMgr, + SUIT_ViewWindow* theViewWindow); //! Reimplement VVTK_MainWindow::Initialize virtual @@ -116,7 +118,8 @@ public: VVTK_MainWindow2* CreateMainWindow2(QWidget* theParent, const char* theName, - SUIT_ResourceMgr* theResourceMgr); + SUIT_ResourceMgr* theResourceMgr, + SUIT_ViewWindow* theViewWindow); VISU_WidgetCtrl* GetWidgetCtrl(); @@ -188,6 +191,7 @@ class VVTK_EXPORT VVTK_MainWindow2: public VVTK_MainWindow VVTK_MainWindow2(QWidget* theParent, const char* theName, SUIT_ResourceMgr* theResourceMgr, + SUIT_ViewWindow* theViewWindow, QtxAction* theStyleSwitchAction); public: //! Destroy instance of the class diff --git a/src/VVTK/VVTK_ViewWindow.cxx b/src/VVTK/VVTK_ViewWindow.cxx index 0230fbfc..e9a66ade 100755 --- a/src/VVTK/VVTK_ViewWindow.cxx +++ b/src/VVTK/VVTK_ViewWindow.cxx @@ -71,7 +71,8 @@ void VVTK_ViewWindow::Initialize(SVTK_ViewModelBase* theModel) { myMainWindow1 = new VVTK_MainWindow1(aSplitter, "VVTK_MainWindow", - aResourceMgr); + aResourceMgr, + this); anInsideCursorSettings = myMainWindow1->GetInsideCursorSettings(); anOutsideCursorSettings = myMainWindow1->GetOutsideCursorSettings(); @@ -111,7 +112,8 @@ void VVTK_ViewWindow::Initialize(SVTK_ViewModelBase* theModel) { myMainWindow2 = myMainWindow1->CreateMainWindow2(aSplitter, "VVTK_SegmantationWindow", - aResourceMgr); + aResourceMgr, + this); SVTK_RenderWindowInteractor* anIteractor = new SVTK_RenderWindowInteractor(myMainWindow2,"SVTK_RenderWindowInteractor1"); -- 2.39.2