Commit 73099179 authored by Jean-Loup HABERBUSCH's avatar Jean-Loup HABERBUSCH
Browse files

New version name 4.0.1

Reordering includes to avoid problems on Win32 with VTKQWidget2

This hotfix modifies RendererWidget inheritance. Now RendererWidget
inherits from VTKQWidget2 instead of VTKQWidget.
In VTK 6.3, VTKQWidget2 include somehow somewhere Win32 headers.
This defines the ERROR macro, which creates a conflict with the ApplyStatus enum
(that also defines ERROR apply status).
In order to solve this conflict, #include "Action.h" should be done before
any \#include "InteractiveViewer.h" or "RendererWidget.h"
parent 2c225567
......@@ -16,7 +16,7 @@ set(CAMITK_PROJECT_NAME "CamiTK")
set(CAMITK_VERSION_MAJOR "4")
set(CAMITK_VERSION_MINOR "0")
set(CAMITK_VER_NICKNAME "red") # Red Amaranth American rose Auburn Burgundy Cardinal Carmine Carnelian Cerise Coquelicot
set(CAMITK_VERSION_PATCH "0") # patch version for packaging, change when appropriate
set(CAMITK_VERSION_PATCH "1") # patch version for packaging, change when appropriate
string(TOLOWER "${CAMITK_PROJECT_NAME}-${CAMITK_VERSION_MAJOR}.${CAMITK_VERSION_MINOR}" CAMITK_SHORT_VERSION_STRING)
# Specific to SDK: this is the SDK build
......
......@@ -199,7 +199,7 @@ Action::ApplyStatus RigidTransform::apply() {
comp->setModified();
} else {
CAMITK_INFO("RigidTransform", "applyTransform", "Error: filter output is of type: " << filterList[i]->GetOutputDataObject(0)->GetClassName());
return ERROR;
return ABORTED;
}
// next filter
i++;
......
......@@ -37,7 +37,6 @@
// -- CamiTK Core stuff
#include <MainWindow.h>
#include <InteractiveViewer.h>
#include <Application.h>
#include <MedicalImageViewer.h>
#include <Core.h>
......
......@@ -30,6 +30,7 @@
#include <Application.h>
#include <ExtensionManager.h>
#include <MedicalImageViewer.h>
#include <ActionViewer.h>
#include <SettingsDialog.h>
#include <Component.h>
#include <Action.h>
......
......@@ -35,7 +35,6 @@
#include <QWidget>
#include <QString>
#include <QAction>
#include <signal.h>
namespace camitk {
......
......@@ -24,12 +24,12 @@
****************************************************************************/
// -- Core stuff
#include "Action.h"
#include "RendererWidget.h"
#include "InteractiveViewer.h"
#include "SliderSpinBoxWidget.h"
#include "Application.h"
#include "Log.h"
#include "Action.h"
#include "MeshComponent.h"
#include "PropertyObject.h"
......
......@@ -24,10 +24,10 @@
****************************************************************************/
// -- Core stuff
#include "Action.h"
#include "MedicalImageViewer.h"
#include "InteractiveViewer.h"
#include "Application.h"
#include "Action.h"
//-- Qt stuff
#include <QColorDialog>
......
......@@ -26,6 +26,7 @@
// -- Core stuff
#include "Application.h"
#include "PropertyExplorer.h"
#include "Component.h"
// -- QT stuff
#include <QVBoxLayout>
......
......@@ -28,7 +28,6 @@
// -- Core stuff
#include "Viewer.h"
#include "ObjectController.h"
#include "ActionViewer.h"
#include "PropertyObject.h"
// -- QT stuff
......
......@@ -26,10 +26,10 @@
// -- Core stuff
#include <Application.h>
#include <MainWindow.h>
#include <Action.h>
#include <InteractiveViewer.h>
#include <Core.h>
#include <ExtensionManager.h>
#include <Action.h>
using namespace camitk;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment