Commit 959b57aa authored by jcfr's avatar jcfr
Browse files

COMP: Rename Slicer3_USE_QT into Slicer_USE_QT

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15088 3bd1e089-480b-0410-8dfb-8563597acbee
parent 24050ede
......@@ -8,9 +8,9 @@ IF (Slicer3_USE_KWWIDGETS)
ADD_SUBDIRECTORY(GUI)
ENDIF (Slicer3_USE_KWWIDGETS)
IF(Slicer3_USE_QT)
IF(Slicer_USE_QT)
ADD_SUBDIRECTORY(SlicerQT)
ENDIF(Slicer3_USE_QT)
ENDIF(Slicer_USE_QT)
IF(Slicer3_BUILD_TESTING)
ADD_SUBDIRECTORY(Testing)
......
......@@ -15,9 +15,9 @@
#include "vtkSlicerConfigure.h" /* Slicer3_USE_* */
//---------------------------------------------------------------------------
// Slicer3_USE_QT
// Slicer_USE_QT
//
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
// SlicerQT includes
#include "qSlicerApplication.h"
......@@ -791,7 +791,7 @@ int Slicer3_main(int& argc, char *argv[])
Slicer3_Tcl_Eval( interp, tclCmd.c_str() );
}
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
static int slicerAppArgc = 1;
qSlicerApplication* qApplication = new qSlicerApplication(slicerAppArgc, argv);
Q_CHECK_PTR(qApplication);
......@@ -948,7 +948,7 @@ int Slicer3_main(int& argc, char *argv[])
scene->SetRootDirectory(root.c_str());
vtkMRMLScene::SetActiveScene( scene );
slicerApp->SetMRMLScene( scene );
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
qSlicerApplication::application()->setMRMLScene( scene );
#endif
......@@ -961,7 +961,7 @@ int Slicer3_main(int& argc, char *argv[])
appLogic->SetAndObserveMRMLScene ( scene );
appLogic->CreateProcessingThread();
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
qSlicerApplication::application()->setAppLogic( appLogic );
qSlicerApplication::application()->setInitialized(true);
......@@ -1310,7 +1310,7 @@ int Slicer3_main(int& argc, char *argv[])
if (slicerApp->GetLoadModules() && !NoModules)
{
loadableModuleFactory.Scan();
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
moduleFactoryManager->registerModules("qSlicerLoadableModuleFactory");
moduleFactoryManager->instantiateModules("qSlicerLoadableModuleFactory");
#endif
......@@ -1328,7 +1328,7 @@ int Slicer3_main(int& argc, char *argv[])
{
LoadableModuleDescription desc = loadableModuleFactory.GetModuleDescription(*lmit);
loadableModules->InsertNextValue(desc.GetName());
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
qDebug() << "Initialize loadable module:" << desc.GetName().c_str();
#endif
if (ignoreModules->LookupValue(desc.GetName().c_str()) < 0)
......@@ -1404,7 +1404,7 @@ int Slicer3_main(int& argc, char *argv[])
#ifndef MODELS_DEBUG
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
moduleFactoryManager->registerModules("qSlicerCoreModuleFactory");
moduleFactoryManager->instantiateModules("qSlicerCoreModuleFactory");
#endif
......@@ -1568,7 +1568,7 @@ int Slicer3_main(int& argc, char *argv[])
appGUI->InitializeViewControlGUI();
// appGUI->InitializeNavigationWidget();
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
// // --- Empty module
// slicerApp->SplashMessage("Initializing Empty Module...");
//
......@@ -1664,7 +1664,7 @@ int Slicer3_main(int& argc, char *argv[])
moduleFactory.SetModuleDiscoveryMessageCallback( SplashMessage );
}
moduleFactory.Scan();
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
moduleFactoryManager->registerModules("qSlicerCLILoadableModuleFactory");
moduleFactoryManager->instantiateModules("qSlicerCLILoadableModuleFactory");
......@@ -1684,7 +1684,7 @@ int Slicer3_main(int& argc, char *argv[])
{
ModuleDescription desc = moduleFactory.GetModuleDescription(*mit);
// slicerCerr(desc << endl);
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
//qDebug() << "Initialize command line module:" << mit->c_str()
// << "/" << desc.GetTitle().c_str()
// << "/" <<desc.GetLocation().c_str() ;
......@@ -1740,7 +1740,7 @@ int Slicer3_main(int& argc, char *argv[])
}
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
slicerApp->InitializeQtCommandLineModules();
#endif
......
......@@ -18,12 +18,12 @@ INCLUDE_DIRECTORIES(
ADD_SUBDIRECTORY(Logic)
IF(Slicer3_USE_QT)
IF(Slicer_USE_QT)
ADD_SUBDIRECTORY(QTCore)
ADD_SUBDIRECTORY(QTGUI)
ADD_SUBDIRECTORY(QTCLI)
ADD_SUBDIRECTORY(QTCoreModules)
ENDIF(Slicer3_USE_QT)
ENDIF(Slicer_USE_QT)
ADD_SUBDIRECTORY(GUI)
ADD_SUBDIRECTORY(CLI)
......
......@@ -191,13 +191,13 @@ IF (Slicer3_USE_KWWIDGETS)
RemoteIO
)
IF(Slicer3_USE_QT)
IF(Slicer_USE_QT)
set(libraries
${libraries}
${QT_LIBRARIES}
qSlicerBaseQTGUI
)
ENDIF(Slicer3_USE_QT)
ENDIF(Slicer_USE_QT)
target_link_libraries(${lib_name} ${libraries})
......
......@@ -4,7 +4,7 @@
#include <sstream>
#include <string>
// #ifdef Slicer3_USE_QT
// #ifdef Slicer_USE_QT
// #include <QApplication>
// #include <QGroupBox>
// #include <QVBoxLayout>
......@@ -59,7 +59,7 @@ void vtkKWTextWithHyperlinksWithScrollbars::SetText(const char *s)
void vtkKWTextWithHyperlinksWithScrollbars::OpenLink(const char *url)
{
// #ifdef Slicer3_USE_QT
// #ifdef Slicer_USE_QT
// QGroupBox *group = new QGroupBox();
// group->setTitle("WebView");
// QVBoxLayout *box = new QVBoxLayout(group);
......
......@@ -3,7 +3,7 @@
//
// SlicerQT
//
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
# ifdef Slicer3_USE_PYTHONQT
# include "PythonQt.h"
# include "PythonQt_QtAll.h"
......@@ -195,7 +195,7 @@ class vtkSlicerApplication::vtkInternal
public:
vtkInternal()
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
this->qApplication = 0;
this->RegisteredDialogCount = 0;
this->ModulePanel = 0;
......@@ -206,7 +206,7 @@ public:
vtkMRMLScene* MRMLScene;
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
qSlicerApplication* qApplication;
int RegisteredDialogCount;
qSlicerModulePanel* ModulePanel;
......@@ -326,7 +326,7 @@ vtkSlicerApplication::vtkSlicerApplication ( ) {
//---------------------------------------------------------------------------
vtkSlicerApplication::~vtkSlicerApplication ( ) {
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
if (this->Internal->ModulePanel)
{
delete this->Internal->ModulePanel;
......@@ -629,7 +629,7 @@ vtkMRMLScene* vtkSlicerApplication::GetMRMLScene()
//---------------------------------------------------------------------------
void vtkSlicerApplication::RegisterDialogUp(vtkKWWidget *ptr)
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
if (this->GetApplicationGUI())
{
if (this->Internal->RegisteredDialogCount == 0)
......@@ -647,7 +647,7 @@ void vtkSlicerApplication::UnRegisterDialogUp(vtkKWWidget *ptr)
{
this->Superclass::UnRegisterDialogUp(ptr);
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
if (this->GetApplicationGUI())
{
if (this->Internal->RegisteredDialogCount == 1)
......@@ -727,7 +727,7 @@ void vtkSlicerApplication::DoOneTclEvent ( )
Tcl_ServiceAll();
broker->ProcessEventQueue();
}
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
this->Internal->qApplication->processEvents();
#endif
}
......@@ -2437,7 +2437,7 @@ vtkKWColorPickerDialog* vtkSlicerApplication::GetColorPickerDialog()
// Temporary test method
// void vtkSlicerApplication::TestQtSlicerWebKit(const char *url)
// {
// #ifdef Slicer3_USE_QT
// #ifdef Slicer_USE_QT
// QtSlicerWebKit *webKit = new QtSlicerWebKit(NULL, this);
// if ( url )
// {
......@@ -2449,7 +2449,7 @@ vtkKWColorPickerDialog* vtkSlicerApplication::GetColorPickerDialog()
// }
//----------------------------------------------------------------------------
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
//----------------------------------------------------------------------------
void vtkSlicerApplication::InitializeQtCoreModules()
......
......@@ -3,7 +3,7 @@
#include "vtkSlicerConfigure.h"
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
// QT includes
#include <QStringList>
#endif
......@@ -16,7 +16,7 @@
#include "vtkSlicerApplicationGUI.h"
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
//BTX
class qSlicerApplication;
class qSlicerModulePanel;
......@@ -77,7 +77,7 @@ class VTK_SLICER_BASE_GUI_EXPORT vtkSlicerApplication : public vtkKWApplication
void SetMRMLScene( vtkMRMLScene* scene);
vtkMRMLScene* GetMRMLScene();
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
///
/// Initialize qt core Modules
//BTX
......
......@@ -15,7 +15,7 @@
#include "vtkSlicerConfigure.h" /* Slicer3_USE_* */
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
#include "qSlicerAbstractCoreModule.h"
#include "qSlicerAbstractModulePanel.h"
......@@ -397,7 +397,7 @@ void vtkSlicerApplicationGUI::ProcessLoadSceneCommand()
vtkErrorMacro ( "ProcessLoadSceneCommand: Got NULL LoadSceneDialog." );
return;
}
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
qSlicerApplication::application()->ioManager()->openLoadSceneDialog();
#else
if ( !this->LoadSceneDialog->IsCreated() )
......@@ -551,7 +551,7 @@ void vtkSlicerApplicationGUI::ProcessImportSceneCommand()
vtkErrorMacro ( "ProcessImportSceneCommand: Got NULL SlicerWindow." );
return;
}
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
qSlicerApplication::application()->ioManager()->openAddSceneDialog();
#else
if ( !this->LoadSceneDialog->IsCreated() )
......@@ -804,7 +804,7 @@ void vtkSlicerApplicationGUI::DownloadSampleVolume(const char *uri)
//---------------------------------------------------------------------------
void vtkSlicerApplicationGUI::ProcessAddDataCommand()
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
qSlicerApplication::application()->ioManager()->openAddDataDialog();
#else
this->GetApplication()->Script("::Loader::ShowDialog");
......@@ -814,7 +814,7 @@ void vtkSlicerApplicationGUI::ProcessAddDataCommand()
//---------------------------------------------------------------------------
void vtkSlicerApplicationGUI::ProcessAddVolumeCommand()
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
qSlicerApplication::application()->ioManager()->openAddVolumeDialog();
#else
this->GetApplication()->Script("::LoadVolume::ShowDialog");
......@@ -824,7 +824,7 @@ void vtkSlicerApplicationGUI::ProcessAddVolumeCommand()
//---------------------------------------------------------------------------
void vtkSlicerApplicationGUI::ProcessAddTransformCommand()
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
qSlicerApplication::application()->ioManager()->openAddTransformDialog();
#else
this->GetApplication()->Script("::LoadTransform::ShowDialog");
......@@ -1301,7 +1301,7 @@ vtkMRMLLayoutNode *vtkSlicerApplicationGUI::GetGUILayoutNode()
//---------------------------------------------------------------------------
void vtkSlicerApplicationGUI::ProcessSaveSceneAsCommand()
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
qSlicerApplication::application()->ioManager()->openSaveDataDialog();
#else
this->SaveDataWidget->SetAndObserveMRMLScene(this->GetMRMLScene());
......@@ -1348,7 +1348,7 @@ void vtkSlicerApplicationGUI::AddGUIObservers ( )
this->MainSlicerWindow->SetBinding("<Unmap>", this, "UnMapCallback %W");
this->MainSlicerWindow->SetBinding("<Map>", this, "MapCallback %W");
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
this->MainSlicerWindow->AddObserver(vtkKWTopLevel::SlaveDisplayEvent, (vtkCommand*)this->GUICallbackCommand);
this->MainSlicerWindow->AddObserver(vtkKWTopLevel::SlaveWithdrawEvent, (vtkCommand*)this->GUICallbackCommand);
#endif
......@@ -1535,7 +1535,7 @@ void vtkSlicerApplicationGUI::ProcessGUIEvents ( vtkObject *caller,
if (saveDataWidget == this->SaveDataWidget && event == vtkSlicerMRMLSaveDataWidget::DataSavedEvent)
{
}
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
if (event == vtkKWTopLevel::SlaveDisplayEvent)
{
......@@ -4856,7 +4856,7 @@ void vtkSlicerApplicationGUI::SetExternalProgress(char *message, float progress)
//-------------------------------------------------------------------------------------------------
void vtkSlicerApplicationGUI::SetCurrentQtModule(const char* moduleTitle)
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
qSlicerModuleManager* moduleManager = qSlicerApplication::application()->moduleManager();
Q_ASSERT(moduleManager);
......@@ -4885,7 +4885,7 @@ void vtkSlicerApplicationGUI::SetCurrentQtModule(const char* moduleTitle)
//-------------------------------------------------------------------------------------------------
void vtkSlicerApplicationGUI::ReposModulePanel()
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
if (!this->GetMainSlicerWindow() ||
!this->GetMainSlicerWindow()->GetMainNotebook())
{
......@@ -4915,7 +4915,7 @@ void vtkSlicerApplicationGUI::ConfigureCallback(char* widgetName)
return;
}
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
//this->SetCurrentQtModuleVisible(true);
this->ReposModulePanel();
#endif
......@@ -4929,7 +4929,7 @@ void vtkSlicerApplicationGUI::UnMapCallback(char * widgetName)
{
return;
}
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
//this->SetCurrentQtModuleVisible(false);
qSlicerApplication::application()->setTopLevelWidgetsVisible(false);
#endif
......@@ -4943,7 +4943,7 @@ void vtkSlicerApplicationGUI::MapCallback(char * widgetName)
{
return;
}
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
//this->SetCurrentQtModuleVisible(true);
qSlicerApplication::application()->setTopLevelWidgetsVisible(true);
this->ReposModulePanel();
......
#include "vtkSlicerConfigure.h"
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
// SlicerQT includes
#include "qSlicerAbstractModule.h"
#include "qSlicerApplication.h"
......@@ -233,7 +233,7 @@ void vtkSlicerModuleChooseGUI::ProcessGUIEvents ( vtkObject *caller,
if (currentModule != NULL )
{
currentModule->Exit ( );
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
//qDebug() << "Attempt to hide Qt module:" << currentModuleName;
//this->GetApplicationGUI()->SetQtModuleVisible(currentModuleName, false);
#endif
......@@ -275,7 +275,7 @@ void vtkSlicerModuleChooseGUI::ProcessGUIEvents ( vtkObject *caller,
if (currentModule != NULL )
{
currentModule->Exit ( );
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
//qDebug() << "Attempting to hide Qt module:" << currentModuleName;
//this->GetApplicationGUI()->SetQtModuleVisible(currentModuleName, false);
#endif
......@@ -372,7 +372,7 @@ void vtkSlicerModuleChooseGUI::RaiseModule ( const char *moduleName )
if (!m)
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
// we are here only if the module has not been found
// Check if the module is in Qt only.
qSlicerModuleManager* moduleManager = qSlicerApplication::application()->moduleManager();
......@@ -400,7 +400,7 @@ void vtkSlicerModuleChooseGUI::RaiseModule ( const char *moduleName )
}
p->GetMainSlicerWindow()->SetStatusText ( moduleName );
this->GetModulesMenuButton()->SetValue( moduleName );
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
this->GetApplicationGUI()->SetCurrentQtModule( moduleName );
#endif
//--- feedback to user
......@@ -479,7 +479,7 @@ void vtkSlicerModuleChooseGUI::SelectModule ( const char *moduleName, vtkMRMLNod
}
// Enter selected module.
vtkSlicerModuleGUI *currentModule = app->GetModuleGUIByName( moduleName );
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
QString moduleTitle = QString(moduleName);
qSlicerModuleManager* moduleManager = qSlicerApplication::application()->moduleManager();
Q_ASSERT(moduleManager);
......@@ -496,7 +496,7 @@ void vtkSlicerModuleChooseGUI::SelectModule ( const char *moduleName, vtkMRMLNod
{
currentModule->Enter ( );
}
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
}
#endif
vtkMRMLLayoutNode *lnode = this->GetApplicationGUI()->GetGUILayoutNode ( );
......@@ -884,7 +884,7 @@ void vtkSlicerModuleChooseGUI::Populate( )
m = vtkSlicerModuleGUI::SafeDownCast( app->GetModuleGUICollection( )->GetNextItemAsObject( ));
}
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
// Here we process the modules that are QT only.
qSlicerModuleManager* moduleManager = qSlicerApplication::application()->moduleManager();
Q_ASSERT(moduleManager);
......
......@@ -390,7 +390,7 @@ void vtkSlicerApplicationLogic::ProcessMRMLEvents(vtkObject * /*caller*/,
unsigned long /*event*/,
void * /*callData*/ )
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::ProcessMRMLEvents is deprecated");
#endif
......@@ -515,7 +515,7 @@ void vtkSlicerApplicationLogic::PrintSelf(ostream& os, vtkIndent indent)
//----------------------------------------------------------------------------
void vtkSlicerApplicationLogic::Connect (const char *URL)
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::Connect is deprecated");
#endif
......@@ -529,7 +529,7 @@ void vtkSlicerApplicationLogic::Connect (const char *URL)
//----------------------------------------------------------------------------
int vtkSlicerApplicationLogic::Commit()
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::Commit is deprecated");
#endif
if (this->MRMLScene)
......@@ -542,7 +542,7 @@ int vtkSlicerApplicationLogic::Commit()
//----------------------------------------------------------------------------
int vtkSlicerApplicationLogic::Commit(const char *URL)
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::Commit is deprecated");
#endif
if (this->MRMLScene)
......@@ -569,7 +569,7 @@ vtkCxxSetObjectMacro(vtkSlicerApplicationLogic, SelectionNode, vtkMRMLSelectionN
//----------------------------------------------------------------------------
vtkMRMLSelectionNode* vtkSlicerApplicationLogic::GetSelectionNode()
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::GetSelectionNode is deprecated");
#endif
vtkDebugMacro(<< this->GetClassName() << " (" << this
......@@ -583,7 +583,7 @@ vtkCxxSetObjectMacro(vtkSlicerApplicationLogic, InteractionNode, vtkMRMLInteract
//----------------------------------------------------------------------------
vtkMRMLInteractionNode* vtkSlicerApplicationLogic::GetInteractionNode()
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::GetInteractionNode is deprecated");
#endif
vtkDebugMacro(<< this->GetClassName() << " (" << this
......@@ -594,7 +594,7 @@ vtkMRMLInteractionNode* vtkSlicerApplicationLogic::GetInteractionNode()
//----------------------------------------------------------------------------
vtkMRMLSliceLogic* vtkSlicerApplicationLogic::GetSliceLogic(const char *layoutName)
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::GetSliceLogic is deprecated");
#endif
if (this->InternalSliceLogicMap)
......@@ -615,7 +615,7 @@ vtkMRMLSliceLogic* vtkSlicerApplicationLogic::GetSliceLogic(const char *layoutNa
// this function can be further improved to check if this is a duplicate.
void vtkSlicerApplicationLogic::AddSliceLogic(const char *layoutName, vtkMRMLSliceLogic *sliceLogic)
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::AddSliceLogic is deprecated");
#endif
if (this->InternalSliceLogicMap)
......@@ -626,7 +626,7 @@ void vtkSlicerApplicationLogic::AddSliceLogic(const char *layoutName, vtkMRMLSli
void vtkSlicerApplicationLogic::AddSliceLogic(vtkMRMLSliceLogic *sliceLogic)
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::AddSliceLogic is deprecated");
#endif
if (this->InternalSliceLogicMap)
......@@ -637,7 +637,7 @@ void vtkSlicerApplicationLogic::AddSliceLogic(vtkMRMLSliceLogic *sliceLogic)
void vtkSlicerApplicationLogic::RemoveSliceLogic(vtkMRMLSliceLogic *sliceLogic)
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::RemoveSliceLogic is deprecated");
#endif
SliceLogicMap::iterator mit;
......@@ -656,7 +656,7 @@ void vtkSlicerApplicationLogic::RemoveSliceLogic(vtkMRMLSliceLogic *sliceLogic)
void vtkSlicerApplicationLogic::RemoveSliceLogic(char *layoutName)
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::RemoveSliceLogic is deprecated");
#endif
SliceLogicMap::iterator mit;
......@@ -672,7 +672,7 @@ void vtkSlicerApplicationLogic::RemoveSliceLogic(char *layoutName)
void vtkSlicerApplicationLogic::CreateSliceLogics()
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::CreateSliceLogics is deprecated");
#endif
// make sure there is a CrossHair in the scene
......@@ -718,7 +718,7 @@ void vtkSlicerApplicationLogic::CreateSliceLogics()
//----------------------------------------------------------------------------
void vtkSlicerApplicationLogic::DeleteSliceLogics()
{
#ifdef Slicer3_USE_QT
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::DeleteSliceLogics is deprecated");
#endif
if (this->InternalSliceLogicMap)
......
......@@ -4,11 +4,11 @@
# if so, use it,
# otherwise, complain.
#
OPTION(Slicer3_USE_QT "Use Qt as an extra GUI library" OFF)
OPTION(Slicer_USE_QT "Use Qt as an extra GUI library" OFF)
MACRO(SLICER_SETUP_QT)
IF(Slicer3_USE_QT)
IF(Slicer_USE_QT)
SET(minimum_required_qt_version "4.6.2")
IF(VTK_USE_QVTK)
......
......@@ -262,7 +262,7 @@ include(${ITK_USE_FILE})
#
SET(git_repo http://github.com/commontk/CTK/raw/master/)
IF(Slicer3_USE_QT)
IF(Slicer_USE_QT)
SET(file Utilities/CMake/FindCTK.cmake)
downloadFile(${git_repo}/${file} ${Slicer3_BINARY_DIR}/CMake/FindCTK.cmake)
......@@ -316,27 +316,27 @@ mark_as_advanced(Slicer3_USE_VTK_CVSHEAD)
SLICER_SETUP_QT()
#-----------------------------------------------------------------------------
# Alert the user if both Slicer3_USE_QT and Slicer3_USE_KWWIDGETS are OFF
IF(NOT Slicer3_USE_QT AND NOT Slicer3_USE_KWWIDGETS)
MESSAGE(FATAL_ERROR "Both Slicer3_USE_QT and Slicer3_USE_KWWIDGETS are OFF. Please, choose one")
# Alert the user if both Slicer_USE_QT and Slicer3_USE_KWWIDGETS are OFF
IF(NOT Slicer_USE_QT AND NOT Slicer3_USE_KWWIDGETS)
MESSAGE(FATAL_ERROR "Both Slicer_USE_QT and Slicer3_USE_KWWIDGETS are OFF. Please, choose one")
ENDIF()
#-----------------------------------------------------------------------------
# If Slicer3_USE_QT is ON and Slicer3_USE_KWWIDGETS is OFF, complain if VTK_WRAP_TCL is ON
# If Slicer_USE_QT is ON and Slicer3_USE_KWWIDGETS is OFF, complain if VTK_WRAP_TCL is ON
# Note: Later on we will expect VTK_WRAP_PYTHON to be ON
IF(Slicer3_USE_QT AND NOT Slicer3_USE_KWWIDGETS)
IF(Slicer_USE_QT AND NOT Slicer3_USE_KWWIDGETS)
IF(VTK_WRAP_TCL)
MESSAGE(FATAL_ERROR "For now, if Slicer3_USE_QT is ON and Slicer3_USE_KWWIDGETS is OFF, we expect VTK_WRAP_TCL to be OFF")
MESSAGE(FATAL_ERROR "For now, if Slicer_USE_QT is ON and Slicer3_USE_KWWIDGETS is OFF, we expect VTK_WRAP_TCL to be OFF")
ENDIF()
ENDIF()
#-----------------------------------------------------------------------------
# Add Slicer3_USE_PYTHONQT option if Slicer3_USE_QT is ON
IF(Slicer3_USE_QT)
# Add Slicer3_USE_PYTHONQT option if Slicer_USE_QT is ON
IF(Slicer_USE_QT)
option(Slicer3_USE_PYTHONQT "Integrate a python-QT interpreter into Slicer." OFF)
IF(Slicer3_USE_PYTHONQT)
IF(NOT VTK_WRAP_PYTHON)
MESSAGE(FATAL_ERROR "Since both Slicer3_USE_QT and Slicer3_USE_PYTHONQT are ON, VTK_WRAP_PYTHON is expected to be ON. Disable Slicer3_USE_PYTHONQT or re-configure VTK with python wrapping.")
MESSAGE(FATAL_ERROR "Since both Slicer_USE_QT and Slicer3_USE_PYTHONQT are ON, VTK_WRAP_PYTHON is expected to be ON. Disable Slicer3_USE_PYTHONQT or re-configure VTK with python wrapping.")
ENDIF()
# Include convenient script allowing to copy and compile python scripts
INCLUDE(${Slicer_CMAKE_DIR}/SlicerCompilePythonScripts.cmake)
......@@ -499,7 +499,7 @@ set(vtkITK_DIR ${Slicer3_BINARY_DIR}/Libs/vtkITK)
#-----------------------------------------------------------------------------
# Qt Loadable Modules
#
IF(Slicer3_USE_QT)