From a7326d6b2149dc084a7101ff8063fb38fe22aa8e Mon Sep 17 00:00:00 2001 From: tbaudier Date: Tue, 19 Jul 2016 16:55:20 +0200 Subject: [PATCH] Modifications for Windows compilation --- common/clitkMatrix.cxx | 1 + vv/vvMainWindow.cxx | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/common/clitkMatrix.cxx b/common/clitkMatrix.cxx index c911f55..2c09f31 100644 --- a/common/clitkMatrix.cxx +++ b/common/clitkMatrix.cxx @@ -17,6 +17,7 @@ ===========================================================================**/ #include "clitkMatrix.h" +#include //-------------------------------------------------------------------- namespace clitk { diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx index 3da4be7..1bc0759 100644 --- a/vv/vvMainWindow.cxx +++ b/vv/vvMainWindow.cxx @@ -378,12 +378,13 @@ vvMainWindow::vvMainWindow():vvMainWindowBase() vvToolManager::GetInstance()->InsertToolsInMenu(this); vvToolManager::GetInstance()->EnableToolsInMenu(this, false); -#ifndef CLITK_EXPERIMENTAL -#define CLITK_EXPERIMENTAL 0 -#endif +//#ifndef CLITK_EXPERIMENTAL +//#define CLITK_EXPERIMENTAL 0 +//#endif +#ifdef CLITK_EXPERIMENTAL if (!CLITK_EXPERIMENTAL) menuExperimental->menuAction()->setVisible(false); - +#endif QTimer * timerMemory = new QTimer(this); //timerMemory->setInterval(5); @@ -3386,7 +3387,7 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget) vidwriter = mpg; mpg->SetQuality(2); bool ok; - int fps = QInputDialog::getInteger(this, tr("Number of frames per second"), + int fps = QInputDialog::getInt(this, tr("Number of frames per second"), tr("FPS:"), 5, 0, 1024, 1, &ok); if(!ok) fps = 5; @@ -3399,7 +3400,7 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget) vidwriter = mpg; mpg->SetQuality(2); bool ok; - int fps = QInputDialog::getInteger(this, tr("Number of frames per second"), + int fps = QInputDialog::getInt(this, tr("Number of frames per second"), tr("FPS:"), 5, 0, 1024, 1, &ok); if(!ok) fps = 5; -- 2.45.1