diff --git a/Modules/MapperExt/CMakeLists.txt b/Modules/MapperExt/CMakeLists.txt index 92f6db34d6..f91b188ee5 100644 --- a/Modules/MapperExt/CMakeLists.txt +++ b/Modules/MapperExt/CMakeLists.txt @@ -1,8 +1,7 @@ MITK_CREATE_MODULE(DEPENDS MitkDataTypesExt MitkLegacyGL PACKAGE_DEPENDS VTK|vtkRenderingVolumeOpenGL WARNINGS_AS_ERRORS ) -if(BUILD_TESTING) - #add_subdirectory(Testing) -endif() +#add_subdirectory(Testing) + diff --git a/Modules/MapperExt/Documentation/Doxygen/Modules.dox b/Modules/MapperExt/doc/Doxygen/Modules.dox similarity index 100% rename from Modules/MapperExt/Documentation/Doxygen/Modules.dox rename to Modules/MapperExt/doc/Doxygen/Modules.dox diff --git a/Modules/MapperExt/files.cmake b/Modules/MapperExt/files.cmake index e834df3099..6a072e68b7 100644 --- a/Modules/MapperExt/files.cmake +++ b/Modules/MapperExt/files.cmake @@ -1,19 +1,21 @@ +file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*") + set(CPP_FILES mitkEnhancedPointSetVtkMapper3D.cpp mitkGPUVolumeMapper3D.cpp mitkMeshMapper2D.cpp mitkMeshVtkMapper3D.cpp mitkSplineVtkMapper3D.cpp mitkUnstructuredGridMapper2D.cpp mitkUnstructuredGridVtkMapper3D.cpp mitkVectorImageMapper2D.cpp vtkMaskedGlyph2D.cpp vtkMaskedGlyph3D.cpp vtkMitkGPUVolumeRayCastMapper.cpp vtkMitkOpenGLVolumeTextureMapper3D.cpp vtkMitkVolumeTextureMapper3D.cpp vtkUnstructuredGridMapper.cpp - Internal/vtkPointSetSlicer.cxx + vtkPointSetSlicer.cxx ) diff --git a/Modules/MapperExt/mitkEnhancedPointSetVtkMapper3D.h b/Modules/MapperExt/include/mitkEnhancedPointSetVtkMapper3D.h similarity index 100% rename from Modules/MapperExt/mitkEnhancedPointSetVtkMapper3D.h rename to Modules/MapperExt/include/mitkEnhancedPointSetVtkMapper3D.h diff --git a/Modules/MapperExt/mitkGPUVolumeMapper3D.h b/Modules/MapperExt/include/mitkGPUVolumeMapper3D.h similarity index 100% rename from Modules/MapperExt/mitkGPUVolumeMapper3D.h rename to Modules/MapperExt/include/mitkGPUVolumeMapper3D.h diff --git a/Modules/MapperExt/mitkMeshMapper2D.h b/Modules/MapperExt/include/mitkMeshMapper2D.h similarity index 100% rename from Modules/MapperExt/mitkMeshMapper2D.h rename to Modules/MapperExt/include/mitkMeshMapper2D.h diff --git a/Modules/MapperExt/mitkMeshVtkMapper3D.h b/Modules/MapperExt/include/mitkMeshVtkMapper3D.h similarity index 100% rename from Modules/MapperExt/mitkMeshVtkMapper3D.h rename to Modules/MapperExt/include/mitkMeshVtkMapper3D.h diff --git a/Modules/MapperExt/mitkSplineVtkMapper3D.h b/Modules/MapperExt/include/mitkSplineVtkMapper3D.h similarity index 100% rename from Modules/MapperExt/mitkSplineVtkMapper3D.h rename to Modules/MapperExt/include/mitkSplineVtkMapper3D.h diff --git a/Modules/MapperExt/mitkUnstructuredGridMapper2D.h b/Modules/MapperExt/include/mitkUnstructuredGridMapper2D.h similarity index 100% rename from Modules/MapperExt/mitkUnstructuredGridMapper2D.h rename to Modules/MapperExt/include/mitkUnstructuredGridMapper2D.h diff --git a/Modules/MapperExt/mitkUnstructuredGridVtkMapper3D.h b/Modules/MapperExt/include/mitkUnstructuredGridVtkMapper3D.h similarity index 100% rename from Modules/MapperExt/mitkUnstructuredGridVtkMapper3D.h rename to Modules/MapperExt/include/mitkUnstructuredGridVtkMapper3D.h diff --git a/Modules/MapperExt/mitkVectorImageMapper2D.h b/Modules/MapperExt/include/mitkVectorImageMapper2D.h similarity index 100% rename from Modules/MapperExt/mitkVectorImageMapper2D.h rename to Modules/MapperExt/include/mitkVectorImageMapper2D.h diff --git a/Modules/MapperExt/vtkMaskedGlyph2D.h b/Modules/MapperExt/include/vtkMaskedGlyph2D.h similarity index 100% rename from Modules/MapperExt/vtkMaskedGlyph2D.h rename to Modules/MapperExt/include/vtkMaskedGlyph2D.h diff --git a/Modules/MapperExt/vtkMaskedGlyph3D.h b/Modules/MapperExt/include/vtkMaskedGlyph3D.h similarity index 100% rename from Modules/MapperExt/vtkMaskedGlyph3D.h rename to Modules/MapperExt/include/vtkMaskedGlyph3D.h diff --git a/Modules/MapperExt/vtkMitkGPUVolumeRayCastMapper.h b/Modules/MapperExt/include/vtkMitkGPUVolumeRayCastMapper.h similarity index 100% rename from Modules/MapperExt/vtkMitkGPUVolumeRayCastMapper.h rename to Modules/MapperExt/include/vtkMitkGPUVolumeRayCastMapper.h diff --git a/Modules/MapperExt/vtkMitkOpenGLVolumeTextureMapper3D.h b/Modules/MapperExt/include/vtkMitkOpenGLVolumeTextureMapper3D.h similarity index 100% rename from Modules/MapperExt/vtkMitkOpenGLVolumeTextureMapper3D.h rename to Modules/MapperExt/include/vtkMitkOpenGLVolumeTextureMapper3D.h diff --git a/Modules/MapperExt/vtkMitkVolumeTextureMapper3D.h b/Modules/MapperExt/include/vtkMitkVolumeTextureMapper3D.h similarity index 100% rename from Modules/MapperExt/vtkMitkVolumeTextureMapper3D.h rename to Modules/MapperExt/include/vtkMitkVolumeTextureMapper3D.h diff --git a/Modules/MapperExt/vtkUnstructuredGridMapper.h b/Modules/MapperExt/include/vtkUnstructuredGridMapper.h similarity index 100% rename from Modules/MapperExt/vtkUnstructuredGridMapper.h rename to Modules/MapperExt/include/vtkUnstructuredGridMapper.h diff --git a/Modules/MapperExt/mitkEnhancedPointSetVtkMapper3D.cpp b/Modules/MapperExt/src/mitkEnhancedPointSetVtkMapper3D.cpp similarity index 100% rename from Modules/MapperExt/mitkEnhancedPointSetVtkMapper3D.cpp rename to Modules/MapperExt/src/mitkEnhancedPointSetVtkMapper3D.cpp diff --git a/Modules/MapperExt/mitkGPUVolumeMapper3D.cpp b/Modules/MapperExt/src/mitkGPUVolumeMapper3D.cpp similarity index 100% rename from Modules/MapperExt/mitkGPUVolumeMapper3D.cpp rename to Modules/MapperExt/src/mitkGPUVolumeMapper3D.cpp diff --git a/Modules/MapperExt/mitkMeshMapper2D.cpp b/Modules/MapperExt/src/mitkMeshMapper2D.cpp similarity index 100% rename from Modules/MapperExt/mitkMeshMapper2D.cpp rename to Modules/MapperExt/src/mitkMeshMapper2D.cpp diff --git a/Modules/MapperExt/mitkMeshVtkMapper3D.cpp b/Modules/MapperExt/src/mitkMeshVtkMapper3D.cpp similarity index 100% rename from Modules/MapperExt/mitkMeshVtkMapper3D.cpp rename to Modules/MapperExt/src/mitkMeshVtkMapper3D.cpp diff --git a/Modules/MapperExt/mitkSplineVtkMapper3D.cpp b/Modules/MapperExt/src/mitkSplineVtkMapper3D.cpp similarity index 100% rename from Modules/MapperExt/mitkSplineVtkMapper3D.cpp rename to Modules/MapperExt/src/mitkSplineVtkMapper3D.cpp diff --git a/Modules/MapperExt/mitkUnstructuredGridMapper2D.cpp b/Modules/MapperExt/src/mitkUnstructuredGridMapper2D.cpp similarity index 99% rename from Modules/MapperExt/mitkUnstructuredGridMapper2D.cpp rename to Modules/MapperExt/src/mitkUnstructuredGridMapper2D.cpp index 8442ff18f3..db4b67c26c 100644 --- a/Modules/MapperExt/mitkUnstructuredGridMapper2D.cpp +++ b/Modules/MapperExt/src/mitkUnstructuredGridMapper2D.cpp @@ -1,574 +1,574 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include #include "mitkUnstructuredGridMapper2D.h" #include "mitkBaseRenderer.h" #include "mitkPlaneGeometry.h" #include "mitkUnstructuredGrid.h" #include "mitkTransferFunction.h" #include "mitkTransferFunctionProperty.h" #include "mitkColorProperty.h" #include "mitkVtkScalarModeProperty.h" #include "mitkProperties.h" #include "mitkAbstractTransformGeometry.h" #include "mitkVtkMapper3D.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include -#include "Internal/vtkPointSetSlicer.h" +#include "vtkPointSetSlicer.h" void mitk::UnstructuredGridMapper2D::GenerateDataForRenderer( mitk::BaseRenderer* renderer ) { BaseLocalStorage *ls = m_LSH.GetLocalStorage(renderer); bool needGenerateData = ls->IsGenerateDataRequired( renderer, this, GetDataNode() ); if(needGenerateData) { ls->UpdateGenerateDataTime(); mitk::DataNode::ConstPointer node = this->GetDataNode(); if ( node.IsNull() ) return; if (!node->GetProperty(m_ScalarMode, "scalar mode")) { m_ScalarMode = mitk::VtkScalarModeProperty::New(0); } if (!node->GetProperty(m_ScalarVisibility, "scalar visibility")) { m_ScalarVisibility = mitk::BoolProperty::New(true); } if (!node->GetProperty(m_Outline, "outline polygons")) { m_Outline = mitk::BoolProperty::New(false); } if (!node->GetProperty(m_Color, "color")) { m_Color = mitk::ColorProperty::New(1.0f, 1.0f, 1.0f); } if (!node->GetProperty(m_LineWidth, "line width")) { m_LineWidth = mitk::IntProperty::New(1); } } mitk::BaseData::Pointer input = const_cast( GetDataNode()->GetData() ); assert( input ); input->Update(); if (m_VtkPointSet) m_VtkPointSet->UnRegister(0); m_VtkPointSet = this->GetVtkPointSet(renderer); assert(m_VtkPointSet); m_VtkPointSet->Register(0); if (m_ScalarVisibility->GetValue()) { mitk::DataNode::ConstPointer node = this->GetDataNode(); mitk::TransferFunctionProperty::Pointer transferFuncProp; node->GetProperty(transferFuncProp, "TransferFunction", renderer); if (transferFuncProp.IsNotNull()) { mitk::TransferFunction::Pointer tf = transferFuncProp->GetValue(); if (m_ScalarsToColors) m_ScalarsToColors->UnRegister(0); m_ScalarsToColors = static_cast(tf->GetColorTransferFunction()); m_ScalarsToColors->Register(0); if (m_ScalarsToOpacity) m_ScalarsToOpacity->UnRegister(0); m_ScalarsToOpacity = tf->GetScalarOpacityFunction(); m_ScalarsToOpacity->Register(0); } else { if (m_ScalarsToColors) m_ScalarsToColors->UnRegister(0); m_ScalarsToColors = this->GetVtkLUT(renderer); assert(m_ScalarsToColors); m_ScalarsToColors->Register(0); float opacity; node->GetOpacity(opacity, renderer); if (m_ScalarsToOpacity) m_ScalarsToOpacity->UnRegister(0); m_ScalarsToOpacity = vtkPiecewiseFunction::New(); double range[2]; m_VtkPointSet->GetScalarRange(range); m_ScalarsToOpacity->AddSegment(range[0], opacity, range[1], opacity); } } } void mitk::UnstructuredGridMapper2D::Paint( mitk::BaseRenderer* renderer ) { bool visible = true; GetDataNode()->GetVisibility(visible, renderer, "visible"); if(!visible) return; vtkLinearTransform * vtktransform = GetDataNode()->GetVtkTransform(); vtkLinearTransform * inversetransform = vtktransform->GetLinearInverse(); PlaneGeometry::ConstPointer worldGeometry = renderer->GetCurrentWorldPlaneGeometry(); PlaneGeometry::ConstPointer worldPlaneGeometry = dynamic_cast( worldGeometry.GetPointer() ); Point3D point; Vector3D normal; if(worldPlaneGeometry.IsNotNull()) { // set up vtkPlane according to worldGeometry point=worldPlaneGeometry->GetOrigin(); normal=worldPlaneGeometry->GetNormal(); normal.Normalize(); m_Plane->SetTransform((vtkAbstractTransform*)NULL); } else { //@FIXME: does not work correctly. Does m_Plane->SetTransform really transforms a "plane plane" into a "curved plane"? return; AbstractTransformGeometry::ConstPointer worldAbstractGeometry = dynamic_cast(renderer->GetCurrentWorldPlaneGeometry()); if(worldAbstractGeometry.IsNotNull()) { // set up vtkPlane according to worldGeometry point=const_cast(worldAbstractGeometry->GetParametricBoundingBox())->GetMinimum(); FillVector3D(normal, 0, 0, 1); m_Plane->SetTransform(worldAbstractGeometry->GetVtkAbstractTransform()->GetInverse()); } else return; } double vp[ 3 ], vnormal[ 3 ]; vnl2vtk(point.GetVnlVector(), vp); vnl2vtk(normal.GetVnlVector(), vnormal); //normally, we would need to transform the surface and cut the transformed surface with the cutter. //This might be quite slow. Thus, the idea is, to perform an inverse transform of the plane instead. //@todo It probably does not work for scaling operations yet:scaling operations have to be //dealed with after the cut is performed by scaling the contour. inversetransform->TransformPoint( vp, vp ); inversetransform->TransformNormalAtPoint( vp, vnormal, vnormal ); m_Plane->SetOrigin( vp ); m_Plane->SetNormal( vnormal ); // set data into cutter m_Slicer->SetInputData( m_VtkPointSet ); // m_Cutter->GenerateCutScalarsOff(); // m_Cutter->SetSortByToSortByCell(); // calculate the cut m_Slicer->Update(); // fetch geometry mitk::DisplayGeometry::Pointer displayGeometry = renderer->GetDisplayGeometry(); assert( displayGeometry ); // float toGL=displayGeometry->GetSizeInDisplayUnits()[1]; //apply color and opacity read from the PropertyList ApplyColorAndOpacityProperties( renderer ); // traverse the cut contour vtkPolyData * contour = m_Slicer->GetOutput(); vtkPoints *vpoints = contour->GetPoints(); vtkCellArray *vlines = contour->GetLines(); vtkCellArray *vpolys = contour->GetPolys(); vtkPointData *vpointdata = contour->GetPointData(); vtkDataArray* vscalars = vpointdata->GetScalars(); vtkCellData *vcelldata = contour->GetCellData(); vtkDataArray* vcellscalars = vcelldata->GetScalars(); const int numberOfLines = contour->GetNumberOfLines(); const int numberOfPolys = contour->GetNumberOfPolys(); const bool useCellData = m_ScalarMode->GetVtkScalarMode() == VTK_SCALAR_MODE_DEFAULT || m_ScalarMode->GetVtkScalarMode() == VTK_SCALAR_MODE_USE_CELL_DATA; const bool usePointData = m_ScalarMode->GetVtkScalarMode() == VTK_SCALAR_MODE_USE_POINT_DATA; Point3D p; Point2D p2d; vlines->InitTraversal(); vpolys->InitTraversal(); mitk::Color outlineColor = m_Color->GetColor(); glLineWidth((float)m_LineWidth->GetValue()); for (int i = 0;i < numberOfLines;++i ) { vtkIdType *cell(0); vtkIdType cellSize(0); vlines->GetNextCell( cellSize, cell ); float rgba[4] = {outlineColor[0], outlineColor[1], outlineColor[2], 1.0f}; if (m_ScalarVisibility->GetValue() && vcellscalars) { if ( useCellData ) { // color each cell according to cell data double scalar = vcellscalars->GetComponent( i, 0 ); double rgb[3] = { 1.0f, 1.0f, 1.0f }; m_ScalarsToColors->GetColor(scalar, rgb); rgba[0] = (float)rgb[0]; rgba[1] = (float)rgb[1]; rgba[2] = (float)rgb[2]; rgba[3] = (float)m_ScalarsToOpacity->GetValue(scalar); } else if ( usePointData ) { double scalar = vscalars->GetComponent( i, 0 ); double rgb[3] = { 1.0f, 1.0f, 1.0f }; m_ScalarsToColors->GetColor(scalar, rgb); rgba[0] = (float)rgb[0]; rgba[1] = (float)rgb[1]; rgba[2] = (float)rgb[2]; rgba[3] = (float)m_ScalarsToOpacity->GetValue(scalar); } } glColor4fv( rgba ); glBegin ( GL_LINE_LOOP ); for ( int j = 0;j < cellSize;++j ) { vpoints->GetPoint( cell[ j ], vp ); //take transformation via vtktransform into account vtktransform->TransformPoint( vp, vp ); vtk2itk( vp, p ); //convert 3D point (in mm) to 2D point on slice (also in mm) worldGeometry->Map( p, p2d ); //convert point (until now mm and in worldcoordinates) to display coordinates (units ) displayGeometry->WorldToDisplay( p2d, p2d ); //convert display coordinates ( (0,0) is top-left ) in GL coordinates ( (0,0) is bottom-left ) //p2d[1]=toGL-p2d[1]; //add the current vertex to the line glVertex2f( p2d[0], p2d[1] ); } glEnd (); } bool polyOutline = m_Outline->GetValue(); bool scalarVisibility = m_ScalarVisibility->GetValue(); // cache the transformed points // a fixed size array is way faster than 'new' // slices through 3d cells usually do not generated // polygons with more than 6 vertices const int maxPolySize = 10; Point2D* cachedPoints = new Point2D[maxPolySize*numberOfPolys]; glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // only draw polygons if there are cell scalars // or the outline property is set to true if (scalarVisibility && vcellscalars) { glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); for (int i = 0;i < numberOfPolys;++i ) { vtkIdType *cell(0); vtkIdType cellSize(0); vpolys->GetNextCell( cellSize, cell ); float rgba[4] = {1.0f, 1.0f, 1.0f, 0}; if (scalarVisibility && vcellscalars) { if ( useCellData ) { // color each cell according to cell data double scalar = vcellscalars->GetComponent( i+numberOfLines, 0 ); double rgb[3] = { 1.0f, 1.0f, 1.0f }; m_ScalarsToColors->GetColor(scalar, rgb); rgba[0] = (float)rgb[0]; rgba[1] = (float)rgb[1]; rgba[2] = (float)rgb[2]; rgba[3] = (float)m_ScalarsToOpacity->GetValue(scalar); } else if ( usePointData ) { double scalar = vscalars->GetComponent( i, 0 ); double rgb[3] = { 1.0f, 1.0f, 1.0f }; m_ScalarsToColors->GetColor(scalar, rgb); rgba[0] = (float)rgb[0]; rgba[1] = (float)rgb[1]; rgba[2] = (float)rgb[2]; rgba[3] = (float)m_ScalarsToOpacity->GetValue(scalar); } } glColor4fv( rgba ); glBegin( GL_POLYGON ); for (int j = 0; j < cellSize; ++j) { vpoints->GetPoint( cell[ j ], vp ); //take transformation via vtktransform into account vtktransform->TransformPoint( vp, vp ); vtk2itk( vp, p ); //convert 3D point (in mm) to 2D point on slice (also in mm) worldGeometry->Map( p, p2d ); //convert point (until now mm and in worldcoordinates) to display coordinates (units ) displayGeometry->WorldToDisplay( p2d, p2d ); //convert display coordinates ( (0,0) is top-left ) in GL coordinates ( (0,0) is bottom-left ) //p2d[1]=toGL-p2d[1]; cachedPoints[i*10+j][0] = p2d[0]; cachedPoints[i*10+j][1] = p2d[1]; //add the current vertex to the line glVertex2f( p2d[0], p2d[1] ); } glEnd(); } if (polyOutline) { vpolys->InitTraversal(); glColor4f(outlineColor[0], outlineColor[1], outlineColor[2], 1.0f); glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); for (int i = 0;i < numberOfPolys;++i) { vtkIdType *cell(0); vtkIdType cellSize(0); vpolys->GetNextCell( cellSize, cell ); glBegin( GL_POLYGON ); //glPolygonOffset(1.0, 1.0); for (int j = 0; j < cellSize; ++j) { //add the current vertex to the line glVertex2f( cachedPoints[i*10+j][0], cachedPoints[i*10+j][1] ); } glEnd(); } } } glDisable(GL_BLEND); delete cachedPoints; } vtkAbstractMapper3D* mitk::UnstructuredGridMapper2D ::GetVtkAbstractMapper3D(mitk::BaseRenderer * renderer) { //MITK_INFO << "GETVTKABSTRACTMAPPER3D\n"; mitk::DataNode::ConstPointer node = this->GetDataNode(); if ( node.IsNull() ) return 0; mitk::VtkMapper::Pointer mitkMapper = dynamic_cast< mitk::VtkMapper* > ( node->GetMapper( 2 ) ); if ( mitkMapper.IsNull() ) { return 0; } mitkMapper->Update(renderer); vtkAssembly* assembly = dynamic_cast(mitkMapper->GetVtkProp(renderer)); if (assembly) { vtkProp3DCollection* collection = assembly->GetParts(); collection->InitTraversal(); vtkProp3D* prop3d = 0; do { prop3d = collection->GetNextProp3D(); vtkActor* actor = dynamic_cast( prop3d ); if (actor) { return dynamic_cast( actor->GetMapper() ); } vtkVolume* volume = dynamic_cast( prop3d ); if (volume) { return dynamic_cast( volume->GetMapper() ); } } while (prop3d != collection->GetLastProp3D()); } else { vtkActor* actor = dynamic_cast( mitkMapper->GetVtkProp(renderer) ); if (actor) { return dynamic_cast( actor->GetMapper() ); } vtkVolume* volume = dynamic_cast( mitkMapper->GetVtkProp(renderer) ); if (volume) { return dynamic_cast( volume->GetMapper() ); } } return 0; } vtkPointSet* mitk::UnstructuredGridMapper2D ::GetVtkPointSet(mitk::BaseRenderer* renderer) { //MITK_INFO << "GETVTKPOINTSET\n"; vtkAbstractMapper3D * abstractMapper = GetVtkAbstractMapper3D(renderer); if ( abstractMapper == 0 ) { // try to get data from the node mitk::DataNode::ConstPointer node = this->GetDataNode(); if ( node.IsNull() ) return 0; mitk::BaseData::Pointer data = node->GetData(); mitk::UnstructuredGrid::Pointer grid = dynamic_cast(data.GetPointer()); if (!grid.IsNull()) return static_cast(grid->GetVtkUnstructuredGrid()); return 0; } else { vtkMapper* mapper = dynamic_cast(abstractMapper); if (mapper) { return dynamic_cast(mapper->GetInput()); } vtkAbstractVolumeMapper* volMapper = dynamic_cast(abstractMapper); if (volMapper) { return dynamic_cast(volMapper->GetDataSetInput()); } } return 0; } vtkScalarsToColors* mitk::UnstructuredGridMapper2D::GetVtkLUT(mitk::BaseRenderer* renderer) { //MITK_INFO << "GETVTKLUT\n"; vtkMapper * mapper = dynamic_cast(GetVtkAbstractMapper3D(renderer)); if (mapper) return mapper->GetLookupTable(); else { mitk::DataNode::ConstPointer node = this->GetDataNode(); if ( node.IsNull() ) return 0; mitk::VtkMapper::Pointer mitkMapper = dynamic_cast< mitk::VtkMapper* > ( node->GetMapper( 2 ) ); if ( mitkMapper.IsNull() ) { //MITK_INFO << "mitkMapper is null\n"; return 0; } mitkMapper->Update(renderer); vtkVolume* volume = dynamic_cast( mitkMapper->GetVtkProp(renderer) ); if (volume) { //MITK_INFO << "found volume prop\n"; return static_cast(volume->GetProperty()->GetRGBTransferFunction()); } vtkAssembly* assembly = dynamic_cast(mitkMapper->GetVtkProp(renderer)); if (assembly) { //MITK_INFO << "found assembly prop\n"; mitk::TransferFunctionProperty::Pointer transferFuncProp; node->GetProperty(transferFuncProp, "TransferFunction", 0); if (transferFuncProp.IsNotNull()) { MITK_INFO << "return colortransferfunction\n"; return static_cast(transferFuncProp->GetValue()->GetColorTransferFunction()); } } return 0; } } bool mitk::UnstructuredGridMapper2D::IsConvertibleToVtkPointSet(mitk::BaseRenderer * renderer) { return ( GetVtkPointSet(renderer) != 0 ); } mitk::UnstructuredGridMapper2D::UnstructuredGridMapper2D() { m_Plane = vtkPlane::New(); m_Slicer = vtkPointSetSlicer::New(); m_Slicer->SetSlicePlane( m_Plane ); m_ScalarsToColors = 0; m_ScalarsToOpacity = 0; m_VtkPointSet = 0; //m_LUT = vtkLookupTable::New(); //m_LUT->SetTableRange( 0, 255 ); //m_LUT->SetNumberOfColors( 255 ); //m_LUT->SetRampToLinear (); //m_LUT->Build(); } mitk::UnstructuredGridMapper2D::~UnstructuredGridMapper2D() { m_Slicer->Delete(); m_Plane->Delete(); if (m_ScalarsToOpacity != 0) m_ScalarsToOpacity->UnRegister(0); if (m_ScalarsToColors != 0) m_ScalarsToColors->UnRegister(0); if (m_VtkPointSet != 0) m_VtkPointSet->UnRegister(0); } diff --git a/Modules/MapperExt/mitkUnstructuredGridVtkMapper3D.cpp b/Modules/MapperExt/src/mitkUnstructuredGridVtkMapper3D.cpp similarity index 100% rename from Modules/MapperExt/mitkUnstructuredGridVtkMapper3D.cpp rename to Modules/MapperExt/src/mitkUnstructuredGridVtkMapper3D.cpp diff --git a/Modules/MapperExt/mitkVectorImageMapper2D.cpp b/Modules/MapperExt/src/mitkVectorImageMapper2D.cpp similarity index 100% rename from Modules/MapperExt/mitkVectorImageMapper2D.cpp rename to Modules/MapperExt/src/mitkVectorImageMapper2D.cpp diff --git a/Modules/MapperExt/vtkMaskedGlyph2D.cpp b/Modules/MapperExt/src/vtkMaskedGlyph2D.cpp similarity index 100% rename from Modules/MapperExt/vtkMaskedGlyph2D.cpp rename to Modules/MapperExt/src/vtkMaskedGlyph2D.cpp diff --git a/Modules/MapperExt/vtkMaskedGlyph3D.cpp b/Modules/MapperExt/src/vtkMaskedGlyph3D.cpp similarity index 100% rename from Modules/MapperExt/vtkMaskedGlyph3D.cpp rename to Modules/MapperExt/src/vtkMaskedGlyph3D.cpp diff --git a/Modules/MapperExt/vtkMitkGPUVolumeRayCastMapper.cpp b/Modules/MapperExt/src/vtkMitkGPUVolumeRayCastMapper.cpp similarity index 100% rename from Modules/MapperExt/vtkMitkGPUVolumeRayCastMapper.cpp rename to Modules/MapperExt/src/vtkMitkGPUVolumeRayCastMapper.cpp diff --git a/Modules/MapperExt/vtkMitkOpenGLVolumeTextureMapper3D.cpp b/Modules/MapperExt/src/vtkMitkOpenGLVolumeTextureMapper3D.cpp similarity index 100% rename from Modules/MapperExt/vtkMitkOpenGLVolumeTextureMapper3D.cpp rename to Modules/MapperExt/src/vtkMitkOpenGLVolumeTextureMapper3D.cpp diff --git a/Modules/MapperExt/vtkMitkVolumeTextureMapper3D.cpp b/Modules/MapperExt/src/vtkMitkVolumeTextureMapper3D.cpp similarity index 100% rename from Modules/MapperExt/vtkMitkVolumeTextureMapper3D.cpp rename to Modules/MapperExt/src/vtkMitkVolumeTextureMapper3D.cpp diff --git a/Modules/MapperExt/Internal/vtkPointSetSlicer.cxx b/Modules/MapperExt/src/vtkPointSetSlicer.cxx similarity index 100% rename from Modules/MapperExt/Internal/vtkPointSetSlicer.cxx rename to Modules/MapperExt/src/vtkPointSetSlicer.cxx diff --git a/Modules/MapperExt/Internal/vtkPointSetSlicer.h b/Modules/MapperExt/src/vtkPointSetSlicer.h similarity index 100% rename from Modules/MapperExt/Internal/vtkPointSetSlicer.h rename to Modules/MapperExt/src/vtkPointSetSlicer.h diff --git a/Modules/MapperExt/vtkUnstructuredGridMapper.cpp b/Modules/MapperExt/src/vtkUnstructuredGridMapper.cpp similarity index 100% rename from Modules/MapperExt/vtkUnstructuredGridMapper.cpp rename to Modules/MapperExt/src/vtkUnstructuredGridMapper.cpp diff --git a/Modules/PlanarFigure/CMakeLists.txt b/Modules/PlanarFigure/CMakeLists.txt index 34264f3cfb..6dfb7341aa 100644 --- a/Modules/PlanarFigure/CMakeLists.txt +++ b/Modules/PlanarFigure/CMakeLists.txt @@ -1,9 +1,8 @@ MITK_CREATE_MODULE( - INCLUDE_DIRS Algorithms DataManagement Interactions IO Rendering + INCLUDE_DIRS PRIVATE src/Algorithms src/DataManagement src/Interactions src/IO src/Rendering DEPENDS MitkLegacyIO MitkSceneSerializationBase MitkLegacyGL MitkOverlays WARNINGS_AS_ERRORS ) -IF( BUILD_TESTING ) -add_subdirectory(Testing) -ENDIF() +add_subdirectory(test) + diff --git a/Modules/PlanarFigure/Testing/mitkPlanarFigureObjectFactoryTest.cpp b/Modules/PlanarFigure/Testing/mitkPlanarFigureObjectFactoryTest.cpp deleted file mode 100644 index 7e6544aa24..0000000000 --- a/Modules/PlanarFigure/Testing/mitkPlanarFigureObjectFactoryTest.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#include "mitkTestingMacros.h" - -#include "mitkCoreObjectFactory.h" -#include "mitkPlanarFigureObjectFactory.cpp" - -/**Documentation - * Test for factory registration - */ -int mitkPlanarFigureObjectFactoryTest(int /* argc */, char* /*argv*/[]) -{ - // always start with this! - MITK_TEST_BEGIN("PlanarFigureObjectFactoryTest"); - - // always end with this! - MITK_TEST_END(); -} diff --git a/Modules/PlanarFigure/Documentation/doxygen/Modules.dox b/Modules/PlanarFigure/doc/doxygen/Modules.dox similarity index 100% rename from Modules/PlanarFigure/Documentation/doxygen/Modules.dox rename to Modules/PlanarFigure/doc/doxygen/Modules.dox diff --git a/Modules/PlanarFigure/Documentation/doxygen/PlanarFigureProperties.dox b/Modules/PlanarFigure/doc/doxygen/PlanarFigureProperties.dox similarity index 100% rename from Modules/PlanarFigure/Documentation/doxygen/PlanarFigureProperties.dox rename to Modules/PlanarFigure/doc/doxygen/PlanarFigureProperties.dox diff --git a/Modules/PlanarFigure/files.cmake b/Modules/PlanarFigure/files.cmake index a17d51c551..dc4d3b3be2 100644 --- a/Modules/PlanarFigure/files.cmake +++ b/Modules/PlanarFigure/files.cmake @@ -1,35 +1,37 @@ +file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*") + set(CPP_FILES Algorithms/mitkExtrudePlanarFigureFilter.cpp Algorithms/mitkImageToPlanarFigureFilter.cpp Algorithms/mitkPlanarFigureObjectFactory.cpp Algorithms/mitkPlanarFigureSource.cpp Algorithms/mitkPlanarFigureToPlanarFigureFilter.cpp DataManagement/mitkPlanarAngle.cpp DataManagement/mitkPlanarBezierCurve.cpp DataManagement/mitkPlanarCircle.cpp DataManagement/mitkPlanarDoubleEllipse.cpp DataManagement/mitkPlanarEllipse.cpp DataManagement/mitkPlanarCross.cpp DataManagement/mitkPlanarFigure.cpp DataManagement/mitkPlanarFourPointAngle.cpp DataManagement/mitkPlanarLine.cpp DataManagement/mitkPlanarArrow.cpp DataManagement/mitkPlanarPolygon.cpp DataManagement/mitkPlanarSubdivisionPolygon.cpp DataManagement/mitkPlanarRectangle.cpp DataManagement/mitkPlanarFigureControlPointStyleProperty.cpp IO/mitkPlanarFigureIOFactory.cpp IO/mitkPlanarFigureReader.cpp IO/mitkPlanarFigureWriter.cpp IO/mitkPlanarFigureWriterFactory.cpp IO/mitkPlanarFigureSerializer.cpp IO/mitkPlanarFigureSubclassesSerializer.cpp Interactions/mitkPlanarFigureInteractor.cpp Rendering/mitkPlanarFigureMapper2D.cpp Rendering/mitkPlanarFigureVtkMapper3D.cpp ) set(RESOURCE_FILES Interactions/PlanarFigureConfig.xml Interactions/PlanarFigureInteraction.xml -) \ No newline at end of file +) diff --git a/Modules/PlanarFigure/Algorithms/mitkExtrudePlanarFigureFilter.h b/Modules/PlanarFigure/include/mitkExtrudePlanarFigureFilter.h similarity index 100% rename from Modules/PlanarFigure/Algorithms/mitkExtrudePlanarFigureFilter.h rename to Modules/PlanarFigure/include/mitkExtrudePlanarFigureFilter.h diff --git a/Modules/PlanarFigure/Algorithms/mitkImageToPlanarFigureFilter.h b/Modules/PlanarFigure/include/mitkImageToPlanarFigureFilter.h similarity index 100% rename from Modules/PlanarFigure/Algorithms/mitkImageToPlanarFigureFilter.h rename to Modules/PlanarFigure/include/mitkImageToPlanarFigureFilter.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarAngle.h b/Modules/PlanarFigure/include/mitkPlanarAngle.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarAngle.h rename to Modules/PlanarFigure/include/mitkPlanarAngle.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarArrow.h b/Modules/PlanarFigure/include/mitkPlanarArrow.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarArrow.h rename to Modules/PlanarFigure/include/mitkPlanarArrow.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarBezierCurve.h b/Modules/PlanarFigure/include/mitkPlanarBezierCurve.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarBezierCurve.h rename to Modules/PlanarFigure/include/mitkPlanarBezierCurve.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarCircle.h b/Modules/PlanarFigure/include/mitkPlanarCircle.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarCircle.h rename to Modules/PlanarFigure/include/mitkPlanarCircle.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarCross.h b/Modules/PlanarFigure/include/mitkPlanarCross.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarCross.h rename to Modules/PlanarFigure/include/mitkPlanarCross.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarDoubleEllipse.h b/Modules/PlanarFigure/include/mitkPlanarDoubleEllipse.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarDoubleEllipse.h rename to Modules/PlanarFigure/include/mitkPlanarDoubleEllipse.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarEllipse.h b/Modules/PlanarFigure/include/mitkPlanarEllipse.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarEllipse.h rename to Modules/PlanarFigure/include/mitkPlanarEllipse.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarFigure.h b/Modules/PlanarFigure/include/mitkPlanarFigure.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarFigure.h rename to Modules/PlanarFigure/include/mitkPlanarFigure.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarFigureControlPointStyleProperty.h b/Modules/PlanarFigure/include/mitkPlanarFigureControlPointStyleProperty.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarFigureControlPointStyleProperty.h rename to Modules/PlanarFigure/include/mitkPlanarFigureControlPointStyleProperty.h diff --git a/Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.h b/Modules/PlanarFigure/include/mitkPlanarFigureInteractor.h similarity index 100% rename from Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.h rename to Modules/PlanarFigure/include/mitkPlanarFigureInteractor.h diff --git a/Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.h b/Modules/PlanarFigure/include/mitkPlanarFigureMapper2D.h similarity index 100% rename from Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.h rename to Modules/PlanarFigure/include/mitkPlanarFigureMapper2D.h diff --git a/Modules/PlanarFigure/Algorithms/mitkPlanarFigureObjectFactory.h b/Modules/PlanarFigure/include/mitkPlanarFigureObjectFactory.h similarity index 100% rename from Modules/PlanarFigure/Algorithms/mitkPlanarFigureObjectFactory.h rename to Modules/PlanarFigure/include/mitkPlanarFigureObjectFactory.h diff --git a/Modules/PlanarFigure/IO/mitkPlanarFigureReader.h b/Modules/PlanarFigure/include/mitkPlanarFigureReader.h similarity index 100% rename from Modules/PlanarFigure/IO/mitkPlanarFigureReader.h rename to Modules/PlanarFigure/include/mitkPlanarFigureReader.h diff --git a/Modules/PlanarFigure/Algorithms/mitkPlanarFigureSource.h b/Modules/PlanarFigure/include/mitkPlanarFigureSource.h similarity index 100% rename from Modules/PlanarFigure/Algorithms/mitkPlanarFigureSource.h rename to Modules/PlanarFigure/include/mitkPlanarFigureSource.h diff --git a/Modules/PlanarFigure/Algorithms/mitkPlanarFigureToPlanarFigureFilter.h b/Modules/PlanarFigure/include/mitkPlanarFigureToPlanarFigureFilter.h similarity index 100% rename from Modules/PlanarFigure/Algorithms/mitkPlanarFigureToPlanarFigureFilter.h rename to Modules/PlanarFigure/include/mitkPlanarFigureToPlanarFigureFilter.h diff --git a/Modules/PlanarFigure/Rendering/mitkPlanarFigureVtkMapper3D.h b/Modules/PlanarFigure/include/mitkPlanarFigureVtkMapper3D.h similarity index 100% rename from Modules/PlanarFigure/Rendering/mitkPlanarFigureVtkMapper3D.h rename to Modules/PlanarFigure/include/mitkPlanarFigureVtkMapper3D.h diff --git a/Modules/PlanarFigure/IO/mitkPlanarFigureWriter.h b/Modules/PlanarFigure/include/mitkPlanarFigureWriter.h similarity index 100% rename from Modules/PlanarFigure/IO/mitkPlanarFigureWriter.h rename to Modules/PlanarFigure/include/mitkPlanarFigureWriter.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarFourPointAngle.h b/Modules/PlanarFigure/include/mitkPlanarFourPointAngle.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarFourPointAngle.h rename to Modules/PlanarFigure/include/mitkPlanarFourPointAngle.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarLine.h b/Modules/PlanarFigure/include/mitkPlanarLine.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarLine.h rename to Modules/PlanarFigure/include/mitkPlanarLine.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarPolygon.h b/Modules/PlanarFigure/include/mitkPlanarPolygon.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarPolygon.h rename to Modules/PlanarFigure/include/mitkPlanarPolygon.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarRectangle.h b/Modules/PlanarFigure/include/mitkPlanarRectangle.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarRectangle.h rename to Modules/PlanarFigure/include/mitkPlanarRectangle.h diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarSubdivisionPolygon.h b/Modules/PlanarFigure/include/mitkPlanarSubdivisionPolygon.h similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarSubdivisionPolygon.h rename to Modules/PlanarFigure/include/mitkPlanarSubdivisionPolygon.h diff --git a/Modules/PlanarFigure/Resources/Interactions/PlanarFigureConfig.xml b/Modules/PlanarFigure/resource/Interactions/PlanarFigureConfig.xml similarity index 100% rename from Modules/PlanarFigure/Resources/Interactions/PlanarFigureConfig.xml rename to Modules/PlanarFigure/resource/Interactions/PlanarFigureConfig.xml diff --git a/Modules/PlanarFigure/Resources/Interactions/PlanarFigureInteraction.xml b/Modules/PlanarFigure/resource/Interactions/PlanarFigureInteraction.xml similarity index 100% rename from Modules/PlanarFigure/Resources/Interactions/PlanarFigureInteraction.xml rename to Modules/PlanarFigure/resource/Interactions/PlanarFigureInteraction.xml diff --git a/Modules/PlanarFigure/Algorithms/mitkExtrudePlanarFigureFilter.cpp b/Modules/PlanarFigure/src/Algorithms/mitkExtrudePlanarFigureFilter.cpp similarity index 100% rename from Modules/PlanarFigure/Algorithms/mitkExtrudePlanarFigureFilter.cpp rename to Modules/PlanarFigure/src/Algorithms/mitkExtrudePlanarFigureFilter.cpp diff --git a/Modules/PlanarFigure/Algorithms/mitkImageToPlanarFigureFilter.cpp b/Modules/PlanarFigure/src/Algorithms/mitkImageToPlanarFigureFilter.cpp similarity index 100% rename from Modules/PlanarFigure/Algorithms/mitkImageToPlanarFigureFilter.cpp rename to Modules/PlanarFigure/src/Algorithms/mitkImageToPlanarFigureFilter.cpp diff --git a/Modules/PlanarFigure/Algorithms/mitkPlanarFigureObjectFactory.cpp b/Modules/PlanarFigure/src/Algorithms/mitkPlanarFigureObjectFactory.cpp similarity index 100% rename from Modules/PlanarFigure/Algorithms/mitkPlanarFigureObjectFactory.cpp rename to Modules/PlanarFigure/src/Algorithms/mitkPlanarFigureObjectFactory.cpp diff --git a/Modules/PlanarFigure/Algorithms/mitkPlanarFigureSource.cpp b/Modules/PlanarFigure/src/Algorithms/mitkPlanarFigureSource.cpp similarity index 100% rename from Modules/PlanarFigure/Algorithms/mitkPlanarFigureSource.cpp rename to Modules/PlanarFigure/src/Algorithms/mitkPlanarFigureSource.cpp diff --git a/Modules/PlanarFigure/Algorithms/mitkPlanarFigureToPlanarFigureFilter.cpp b/Modules/PlanarFigure/src/Algorithms/mitkPlanarFigureToPlanarFigureFilter.cpp similarity index 100% rename from Modules/PlanarFigure/Algorithms/mitkPlanarFigureToPlanarFigureFilter.cpp rename to Modules/PlanarFigure/src/Algorithms/mitkPlanarFigureToPlanarFigureFilter.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarAngle.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarAngle.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarAngle.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarAngle.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarArrow.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarArrow.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarArrow.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarArrow.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarBezierCurve.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarBezierCurve.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarBezierCurve.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarBezierCurve.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarCircle.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarCircle.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarCircle.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarCircle.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarCross.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarCross.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarCross.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarCross.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarDoubleEllipse.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarDoubleEllipse.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarDoubleEllipse.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarDoubleEllipse.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarEllipse.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarEllipse.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarEllipse.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarEllipse.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarFigure.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarFigure.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarFigure.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarFigure.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarFigureControlPointStyleProperty.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarFigureControlPointStyleProperty.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarFigureControlPointStyleProperty.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarFigureControlPointStyleProperty.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarFourPointAngle.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarFourPointAngle.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarFourPointAngle.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarFourPointAngle.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarLine.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarLine.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarLine.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarLine.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarPolygon.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarPolygon.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarPolygon.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarPolygon.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarRectangle.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarRectangle.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarRectangle.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarRectangle.cpp diff --git a/Modules/PlanarFigure/DataManagement/mitkPlanarSubdivisionPolygon.cpp b/Modules/PlanarFigure/src/DataManagement/mitkPlanarSubdivisionPolygon.cpp similarity index 100% rename from Modules/PlanarFigure/DataManagement/mitkPlanarSubdivisionPolygon.cpp rename to Modules/PlanarFigure/src/DataManagement/mitkPlanarSubdivisionPolygon.cpp diff --git a/Modules/PlanarFigure/IO/mitkPlanarFigureIOFactory.cpp b/Modules/PlanarFigure/src/IO/mitkPlanarFigureIOFactory.cpp similarity index 100% rename from Modules/PlanarFigure/IO/mitkPlanarFigureIOFactory.cpp rename to Modules/PlanarFigure/src/IO/mitkPlanarFigureIOFactory.cpp diff --git a/Modules/PlanarFigure/IO/mitkPlanarFigureIOFactory.h b/Modules/PlanarFigure/src/IO/mitkPlanarFigureIOFactory.h similarity index 94% rename from Modules/PlanarFigure/IO/mitkPlanarFigureIOFactory.h rename to Modules/PlanarFigure/src/IO/mitkPlanarFigureIOFactory.h index 09323b79fe..8a73bc630f 100644 --- a/Modules/PlanarFigure/IO/mitkPlanarFigureIOFactory.h +++ b/Modules/PlanarFigure/src/IO/mitkPlanarFigureIOFactory.h @@ -1,75 +1,74 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef __mitkPlanarFigureIOFactory_h #define __mitkPlanarFigureIOFactory_h #ifdef _MSC_VER #pragma warning ( disable : 4786 ) #endif #include "itkObjectFactoryBase.h" -#include #include "mitkBaseData.h" namespace mitk { //##Documentation //## @brief Create instances of PlanarFigureReader objects using an object factory. //## //## @ingroup MitkPlanarFigureModule -class MITKPLANARFIGURE_EXPORT PlanarFigureIOFactory : public itk::ObjectFactoryBase +class PlanarFigureIOFactory : public itk::ObjectFactoryBase { public: /** Standard class typedefs. */ typedef PlanarFigureIOFactory Self; typedef itk::ObjectFactoryBase Superclass; typedef itk::SmartPointer Pointer; typedef itk::SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ virtual const char* GetITKSourceVersion(void) const; virtual const char* GetDescription(void) const; /** Method for class instantiation. */ itkFactorylessNewMacro(Self); static PlanarFigureIOFactory* FactoryNew() { return new PlanarFigureIOFactory;} /** Run-time type information (and related methods). */ itkTypeMacro(PlanarFigureIOFactory, ObjectFactoryBase); /** * Register one factory of this type * \deprecatedSince{2013_09} */ DEPRECATED(static void RegisterOneFactory(void)) { PlanarFigureIOFactory::Pointer PlanarFigureIOFactory = PlanarFigureIOFactory::New(); ObjectFactoryBase::RegisterFactory(PlanarFigureIOFactory); } protected: PlanarFigureIOFactory(); ~PlanarFigureIOFactory(); private: PlanarFigureIOFactory(const Self&); //purposely not implemented void operator=(const Self&); //purposely not implemented }; } // end namespace mitk #endif diff --git a/Modules/PlanarFigure/IO/mitkPlanarFigureReader.cpp b/Modules/PlanarFigure/src/IO/mitkPlanarFigureReader.cpp similarity index 100% rename from Modules/PlanarFigure/IO/mitkPlanarFigureReader.cpp rename to Modules/PlanarFigure/src/IO/mitkPlanarFigureReader.cpp diff --git a/Modules/PlanarFigure/IO/mitkPlanarFigureSerializer.cpp b/Modules/PlanarFigure/src/IO/mitkPlanarFigureSerializer.cpp similarity index 100% rename from Modules/PlanarFigure/IO/mitkPlanarFigureSerializer.cpp rename to Modules/PlanarFigure/src/IO/mitkPlanarFigureSerializer.cpp diff --git a/Modules/PlanarFigure/IO/mitkPlanarFigureSerializer.h b/Modules/PlanarFigure/src/IO/mitkPlanarFigureSerializer.h similarity index 89% rename from Modules/PlanarFigure/IO/mitkPlanarFigureSerializer.h rename to Modules/PlanarFigure/src/IO/mitkPlanarFigureSerializer.h index 717cb2ceee..c91c352bd6 100644 --- a/Modules/PlanarFigure/IO/mitkPlanarFigureSerializer.h +++ b/Modules/PlanarFigure/src/IO/mitkPlanarFigureSerializer.h @@ -1,40 +1,39 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef mitkPlanarFigureSerializer_h_included #define mitkPlanarFigureSerializer_h_included -#include #include "mitkBaseDataSerializer.h" namespace mitk { /** \brief Serializes mitk::Surface for mitk::SceneIO */ -class MITKPLANARFIGURE_EXPORT PlanarFigureSerializer : public BaseDataSerializer +class PlanarFigureSerializer : public BaseDataSerializer { public: mitkClassMacro( PlanarFigureSerializer, BaseDataSerializer ) itkFactorylessNewMacro(Self) itkCloneMacro(Self) virtual std::string Serialize(); protected: PlanarFigureSerializer(); virtual ~PlanarFigureSerializer(); }; } // namespace #endif diff --git a/Modules/PlanarFigure/IO/mitkPlanarFigureSubclassesSerializer.cpp b/Modules/PlanarFigure/src/IO/mitkPlanarFigureSubclassesSerializer.cpp similarity index 94% rename from Modules/PlanarFigure/IO/mitkPlanarFigureSubclassesSerializer.cpp rename to Modules/PlanarFigure/src/IO/mitkPlanarFigureSubclassesSerializer.cpp index 03b80f89c7..627d59f0b8 100644 --- a/Modules/PlanarFigure/IO/mitkPlanarFigureSubclassesSerializer.cpp +++ b/Modules/PlanarFigure/src/IO/mitkPlanarFigureSubclassesSerializer.cpp @@ -1,57 +1,57 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef mitkPlanarFiguresSubclassesSerializer_h_included #define mitkPlanarFiguresSubclassesSerializer_h_included #include "mitkPlanarFigureSerializer.h" #define MITK_REGISTER_PF_SUB_SERIALIZER(classname) \ \ namespace mitk \ { \ \ -class MITKPLANARFIGURE_EXPORT classname ## Serializer : public PlanarFigureSerializer \ +class classname ## Serializer : public PlanarFigureSerializer \ { \ public: \ \ mitkClassMacro( classname ## Serializer, PlanarFigureSerializer ) \ itkFactorylessNewMacro(Self) \ itkCloneMacro(Self) \ \ protected: \ \ classname ## Serializer () {} \ virtual ~classname ## Serializer () {} \ }; \ \ } \ \ MITK_REGISTER_SERIALIZER( classname ## Serializer ); MITK_REGISTER_PF_SUB_SERIALIZER(PlanarAngle) MITK_REGISTER_PF_SUB_SERIALIZER(PlanarCircle) MITK_REGISTER_PF_SUB_SERIALIZER(PlanarCross) MITK_REGISTER_PF_SUB_SERIALIZER(PlanarFourPointAngle) MITK_REGISTER_PF_SUB_SERIALIZER(PlanarLine) MITK_REGISTER_PF_SUB_SERIALIZER(PlanarPolygon) MITK_REGISTER_PF_SUB_SERIALIZER(PlanarRectangle) MITK_REGISTER_PF_SUB_SERIALIZER(PlanarEllipse) MITK_REGISTER_PF_SUB_SERIALIZER(PlanarDoubleEllipse) MITK_REGISTER_PF_SUB_SERIALIZER(PlanarBezierCurve) MITK_REGISTER_PF_SUB_SERIALIZER(PlanarSubdivisionPolygon) #endif diff --git a/Modules/PlanarFigure/IO/mitkPlanarFigureWriter.cpp b/Modules/PlanarFigure/src/IO/mitkPlanarFigureWriter.cpp similarity index 100% rename from Modules/PlanarFigure/IO/mitkPlanarFigureWriter.cpp rename to Modules/PlanarFigure/src/IO/mitkPlanarFigureWriter.cpp diff --git a/Modules/PlanarFigure/IO/mitkPlanarFigureWriterFactory.cpp b/Modules/PlanarFigure/src/IO/mitkPlanarFigureWriterFactory.cpp similarity index 100% rename from Modules/PlanarFigure/IO/mitkPlanarFigureWriterFactory.cpp rename to Modules/PlanarFigure/src/IO/mitkPlanarFigureWriterFactory.cpp diff --git a/Modules/PlanarFigure/IO/mitkPlanarFigureWriterFactory.h b/Modules/PlanarFigure/src/IO/mitkPlanarFigureWriterFactory.h similarity index 92% rename from Modules/PlanarFigure/IO/mitkPlanarFigureWriterFactory.h rename to Modules/PlanarFigure/src/IO/mitkPlanarFigureWriterFactory.h index d51f6cf609..1fdc64178f 100644 --- a/Modules/PlanarFigure/IO/mitkPlanarFigureWriterFactory.h +++ b/Modules/PlanarFigure/src/IO/mitkPlanarFigureWriterFactory.h @@ -1,68 +1,67 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef PLANARFIGURE_WRITERFACTORY_H_HEADER_INCLUDED #define PLANARFIGURE_WRITERFACTORY_H_HEADER_INCLUDED #include "itkObjectFactoryBase.h" -#include #include "mitkBaseData.h" namespace mitk { -class MITKPLANARFIGURE_EXPORT PlanarFigureWriterFactory : public itk::ObjectFactoryBase +class PlanarFigureWriterFactory : public itk::ObjectFactoryBase { public: mitkClassMacro( mitk::PlanarFigureWriterFactory, itk::ObjectFactoryBase ) /** Class methods used to interface with the registered factories. */ virtual const char* GetITKSourceVersion(void) const; virtual const char* GetDescription(void) const; /** Method for class instantiation. */ itkFactorylessNewMacro(Self) /** * Register one factory of this type * \deprecatedSince{2013_09} */ DEPRECATED(static void RegisterOneFactory(void)); /** * UnRegister one factory of this type * \deprecatedSince{2013_09} */ DEPRECATED(static void UnRegisterOneFactory(void)); protected: PlanarFigureWriterFactory(); ~PlanarFigureWriterFactory(); private: PlanarFigureWriterFactory(const Self&); //purposely not implemented void operator=(const Self&); //purposely not implemented static itk::ObjectFactoryBase::Pointer GetInstance(); }; } // end namespace mitk #endif // PLANARFIGURE_WRITERFACTORY_H_HEADER_INCLUDED diff --git a/Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.cpp b/Modules/PlanarFigure/src/Interactions/mitkPlanarFigureInteractor.cpp similarity index 100% rename from Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.cpp rename to Modules/PlanarFigure/src/Interactions/mitkPlanarFigureInteractor.cpp diff --git a/Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.cpp b/Modules/PlanarFigure/src/Rendering/mitkPlanarFigureMapper2D.cpp similarity index 100% rename from Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.cpp rename to Modules/PlanarFigure/src/Rendering/mitkPlanarFigureMapper2D.cpp diff --git a/Modules/PlanarFigure/Rendering/mitkPlanarFigureVtkMapper3D.cpp b/Modules/PlanarFigure/src/Rendering/mitkPlanarFigureVtkMapper3D.cpp similarity index 100% rename from Modules/PlanarFigure/Rendering/mitkPlanarFigureVtkMapper3D.cpp rename to Modules/PlanarFigure/src/Rendering/mitkPlanarFigureVtkMapper3D.cpp diff --git a/Modules/PlanarFigure/Testing/CMakeLists.txt b/Modules/PlanarFigure/test/CMakeLists.txt similarity index 100% rename from Modules/PlanarFigure/Testing/CMakeLists.txt rename to Modules/PlanarFigure/test/CMakeLists.txt diff --git a/Modules/PlanarFigure/Testing/files.cmake b/Modules/PlanarFigure/test/files.cmake similarity index 91% rename from Modules/PlanarFigure/Testing/files.cmake rename to Modules/PlanarFigure/test/files.cmake index 5c683c9c48..5644cbb13b 100644 --- a/Modules/PlanarFigure/Testing/files.cmake +++ b/Modules/PlanarFigure/test/files.cmake @@ -1,19 +1,18 @@ set(MODULE_TESTS mitkPlanarCrossTest.cpp mitkPlanarPolygonTest.cpp mitkPlanarSubdivisionPolygonTest.cpp mitkPlanarFigureIOTest.cpp - mitkPlanarFigureObjectFactoryTest.cpp mitkPlanarArrowTest.cpp ) set(MODULE_CUSTOM_TESTS mitkViewportRenderingTest.cpp ) if(MITK_ENABLE_RENDERING_TESTING) #since mitkInteractionTestHelper is currently creating a vtkRenderWindow set(MODULE_TESTS ${MODULE_TESTS} mitkPlanarFigureInteractionTest.cpp ) endif() diff --git a/Modules/PlanarFigure/Testing/mitkPlanarArrowTest.cpp b/Modules/PlanarFigure/test/mitkPlanarArrowTest.cpp similarity index 100% rename from Modules/PlanarFigure/Testing/mitkPlanarArrowTest.cpp rename to Modules/PlanarFigure/test/mitkPlanarArrowTest.cpp diff --git a/Modules/PlanarFigure/Testing/mitkPlanarCrossTest.cpp b/Modules/PlanarFigure/test/mitkPlanarCrossTest.cpp similarity index 100% rename from Modules/PlanarFigure/Testing/mitkPlanarCrossTest.cpp rename to Modules/PlanarFigure/test/mitkPlanarCrossTest.cpp diff --git a/Modules/PlanarFigure/Testing/mitkPlanarFigureIOTest.cpp b/Modules/PlanarFigure/test/mitkPlanarFigureIOTest.cpp similarity index 100% rename from Modules/PlanarFigure/Testing/mitkPlanarFigureIOTest.cpp rename to Modules/PlanarFigure/test/mitkPlanarFigureIOTest.cpp diff --git a/Modules/PlanarFigure/Testing/mitkPlanarFigureInteractionTest.cpp b/Modules/PlanarFigure/test/mitkPlanarFigureInteractionTest.cpp similarity index 100% rename from Modules/PlanarFigure/Testing/mitkPlanarFigureInteractionTest.cpp rename to Modules/PlanarFigure/test/mitkPlanarFigureInteractionTest.cpp diff --git a/Modules/PlanarFigure/Testing/mitkPlanarPolygonTest.cpp b/Modules/PlanarFigure/test/mitkPlanarPolygonTest.cpp similarity index 100% rename from Modules/PlanarFigure/Testing/mitkPlanarPolygonTest.cpp rename to Modules/PlanarFigure/test/mitkPlanarPolygonTest.cpp diff --git a/Modules/PlanarFigure/Testing/mitkPlanarSubdivisionPolygonTest.cpp b/Modules/PlanarFigure/test/mitkPlanarSubdivisionPolygonTest.cpp similarity index 100% rename from Modules/PlanarFigure/Testing/mitkPlanarSubdivisionPolygonTest.cpp rename to Modules/PlanarFigure/test/mitkPlanarSubdivisionPolygonTest.cpp diff --git a/Modules/PlanarFigure/Testing/mitkViewportRenderingTest.cpp b/Modules/PlanarFigure/test/mitkViewportRenderingTest.cpp similarity index 100% rename from Modules/PlanarFigure/Testing/mitkViewportRenderingTest.cpp rename to Modules/PlanarFigure/test/mitkViewportRenderingTest.cpp diff --git a/Modules/PlanarFigureSegmentation/files.cmake b/Modules/PlanarFigureSegmentation/files.cmake index 4a2f2baa73..2a18d8c1c8 100644 --- a/Modules/PlanarFigureSegmentation/files.cmake +++ b/Modules/PlanarFigureSegmentation/files.cmake @@ -1,3 +1,5 @@ +file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*") + set(CPP_FILES mitkPlanarFigureSegmentationController.cpp ) diff --git a/Modules/PlanarFigureSegmentation/mitkPlanarFigureSegmentationController.h b/Modules/PlanarFigureSegmentation/include/mitkPlanarFigureSegmentationController.h similarity index 100% rename from Modules/PlanarFigureSegmentation/mitkPlanarFigureSegmentationController.h rename to Modules/PlanarFigureSegmentation/include/mitkPlanarFigureSegmentationController.h diff --git a/Modules/PlanarFigureSegmentation/mitkPlanarFigureSegmentationController.cpp b/Modules/PlanarFigureSegmentation/src/mitkPlanarFigureSegmentationController.cpp similarity index 100% rename from Modules/PlanarFigureSegmentation/mitkPlanarFigureSegmentationController.cpp rename to Modules/PlanarFigureSegmentation/src/mitkPlanarFigureSegmentationController.cpp diff --git a/Modules/QtWidgets/CMakeLists.txt b/Modules/QtWidgets/CMakeLists.txt index f44a5bf93d..94b31c19d1 100644 --- a/Modules/QtWidgets/CMakeLists.txt +++ b/Modules/QtWidgets/CMakeLists.txt @@ -1,7 +1,8 @@ MITK_CREATE_MODULE( + INCLUDE_DIRS PRIVATE resource # for xpm includes DEPENDS MitkPlanarFigure MitkOverlays PACKAGE_DEPENDS PUBLIC VTK|vtkGUISupportQt+vtkGUISupportQtOpenGL Qt4|QtGui+QtOpenGL Qt5|Widgets+OpenGL SUBPROJECTS MITK-CoreUI ) -add_subdirectory(Testing) +add_subdirectory(test) diff --git a/Modules/QtWidgets/Documentation/Doxygen/Modules.dox b/Modules/QtWidgets/doc/Doxygen/Modules.dox similarity index 100% rename from Modules/QtWidgets/Documentation/Doxygen/Modules.dox rename to Modules/QtWidgets/doc/Doxygen/Modules.dox diff --git a/Modules/QtWidgets/files.cmake b/Modules/QtWidgets/files.cmake index 89fe404056..142bc7f93e 100644 --- a/Modules/QtWidgets/files.cmake +++ b/Modules/QtWidgets/files.cmake @@ -1,82 +1,79 @@ +file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*") + set(CPP_FILES QmitkApplicationCursor.cpp QmitkDataStorageComboBox.cpp QmitkDataStorageListModel.cpp QmitkDataStorageTableModel.cpp QmitkDataStorageTreeModel.cpp QmitkEventAdapter.cpp QmitkFileReaderOptionsDialog.cpp QmitkFileReaderWriterOptionsWidget.cpp QmitkFileWriterOptionsDialog.cpp QmitkIOUtil.cpp QmitkLevelWindowPresetDefinitionDialog.cpp QmitkLevelWindowRangeChangeDialog.cpp QmitkLevelWindowWidgetContextMenu.cpp QmitkLevelWindowWidget.cpp QmitkLineEditLevelWindowWidget.cpp QmitkMemoryUsageIndicatorView.cpp QmitkMimeTypes.cpp QmitkNodeDescriptor.cpp QmitkNodeDescriptorManager.cpp QmitkRenderWindowMenu.cpp QmitkProgressBar.cpp QmitkPropertiesTableEditor.cpp QmitkPropertiesTableModel.cpp QmitkPropertyDelegate.cpp QmitkRegisterClasses.cpp QmitkRenderingManager.cpp QmitkRenderingManagerFactory.cpp QmitkRenderWindow.cpp QmitkServiceListWidget.cpp QmitkSliderLevelWindowWidget.cpp QmitkStdMultiWidget.cpp QmitkMouseModeSwitcher.cpp QmitkDataStorageFilterProxyModel.cpp QmitkDataStorageComboBoxWithSelectNone.cpp ) -set(H_FILES -QmitkCustomVariants.h -QmitkEnums.h -) - set(MOC_H_FILES -QmitkDataStorageComboBox.h -QmitkDataStorageTableModel.h -QmitkFileReaderOptionsDialog.h -QmitkFileReaderWriterOptionsWidget.h -QmitkFileWriterOptionsDialog.h -QmitkLevelWindowPresetDefinitionDialog.h -QmitkLevelWindowRangeChangeDialog.h -QmitkLevelWindowWidgetContextMenu.h -QmitkLevelWindowWidget.h -QmitkLineEditLevelWindowWidget.h -QmitkMemoryUsageIndicatorView.h -QmitkNodeDescriptor.h -QmitkNodeDescriptorManager.h -QmitkRenderWindowMenu.h -QmitkProgressBar.h -QmitkPropertiesTableEditor.h -QmitkPropertyDelegate.h -QmitkRenderingManager.h -QmitkRenderWindow.h -QmitkServiceListWidget.h -QmitkSliderLevelWindowWidget.h -QmitkStdMultiWidget.h -QmitkMouseModeSwitcher.h -QmitkDataStorageComboBoxWithSelectNone.h + include/QmitkDataStorageComboBox.h + include/QmitkDataStorageTableModel.h + include/QmitkFileReaderOptionsDialog.h + include/QmitkFileReaderWriterOptionsWidget.h + include/QmitkFileWriterOptionsDialog.h + include/QmitkLevelWindowPresetDefinitionDialog.h + include/QmitkLevelWindowRangeChangeDialog.h + include/QmitkLevelWindowWidgetContextMenu.h + include/QmitkLevelWindowWidget.h + include/QmitkLineEditLevelWindowWidget.h + include/QmitkMemoryUsageIndicatorView.h + include/QmitkNodeDescriptor.h + include/QmitkNodeDescriptorManager.h + include/QmitkRenderWindowMenu.h + include/QmitkProgressBar.h + include/QmitkPropertiesTableEditor.h + include/QmitkPropertyDelegate.h + include/QmitkRenderingManager.h + include/QmitkRenderWindow.h + include/QmitkServiceListWidget.h + include/QmitkSliderLevelWindowWidget.h + include/QmitkStdMultiWidget.h + include/QmitkMouseModeSwitcher.h + include/QmitkDataStorageComboBoxWithSelectNone.h ) set(UI_FILES -QmitkFileReaderOptionsDialog.ui -QmitkFileWriterOptionsDialog.ui -QmitkLevelWindowPresetDefinition.ui -QmitkLevelWindowWidget.ui -QmitkLevelWindowRangeChange.ui -QmitkMemoryUsageIndicator.ui -QmitkServiceListWidgetControls.ui + src/QmitkFileReaderOptionsDialog.ui + src/QmitkFileWriterOptionsDialog.ui + src/QmitkLevelWindowPresetDefinition.ui + src/QmitkLevelWindowWidget.ui + src/QmitkLevelWindowRangeChange.ui + src/QmitkMemoryUsageIndicator.ui + src/QmitkServiceListWidgetControls.ui ) set(QRC_FILES - Qmitk.qrc + resource/Qmitk.qrc ) diff --git a/Modules/QtWidgets/QmitkApplicationCursor.h b/Modules/QtWidgets/include/QmitkApplicationCursor.h similarity index 100% rename from Modules/QtWidgets/QmitkApplicationCursor.h rename to Modules/QtWidgets/include/QmitkApplicationCursor.h diff --git a/Modules/QtWidgets/QmitkCustomVariants.h b/Modules/QtWidgets/include/QmitkCustomVariants.h similarity index 100% rename from Modules/QtWidgets/QmitkCustomVariants.h rename to Modules/QtWidgets/include/QmitkCustomVariants.h diff --git a/Modules/QtWidgets/QmitkDataStorageComboBox.h b/Modules/QtWidgets/include/QmitkDataStorageComboBox.h similarity index 100% rename from Modules/QtWidgets/QmitkDataStorageComboBox.h rename to Modules/QtWidgets/include/QmitkDataStorageComboBox.h diff --git a/Modules/QtWidgets/QmitkDataStorageComboBoxWithSelectNone.h b/Modules/QtWidgets/include/QmitkDataStorageComboBoxWithSelectNone.h similarity index 100% rename from Modules/QtWidgets/QmitkDataStorageComboBoxWithSelectNone.h rename to Modules/QtWidgets/include/QmitkDataStorageComboBoxWithSelectNone.h diff --git a/Modules/QtWidgets/QmitkDataStorageFilterProxyModel.h b/Modules/QtWidgets/include/QmitkDataStorageFilterProxyModel.h similarity index 100% rename from Modules/QtWidgets/QmitkDataStorageFilterProxyModel.h rename to Modules/QtWidgets/include/QmitkDataStorageFilterProxyModel.h diff --git a/Modules/QtWidgets/QmitkDataStorageListModel.h b/Modules/QtWidgets/include/QmitkDataStorageListModel.h similarity index 100% rename from Modules/QtWidgets/QmitkDataStorageListModel.h rename to Modules/QtWidgets/include/QmitkDataStorageListModel.h diff --git a/Modules/QtWidgets/QmitkDataStorageTableModel.h b/Modules/QtWidgets/include/QmitkDataStorageTableModel.h similarity index 100% rename from Modules/QtWidgets/QmitkDataStorageTableModel.h rename to Modules/QtWidgets/include/QmitkDataStorageTableModel.h diff --git a/Modules/QtWidgets/QmitkDataStorageTreeModel.h b/Modules/QtWidgets/include/QmitkDataStorageTreeModel.h similarity index 100% rename from Modules/QtWidgets/QmitkDataStorageTreeModel.h rename to Modules/QtWidgets/include/QmitkDataStorageTreeModel.h diff --git a/Modules/QtWidgets/QmitkEnums.h b/Modules/QtWidgets/include/QmitkEnums.h similarity index 100% rename from Modules/QtWidgets/QmitkEnums.h rename to Modules/QtWidgets/include/QmitkEnums.h diff --git a/Modules/QtWidgets/QmitkEventAdapter.h b/Modules/QtWidgets/include/QmitkEventAdapter.h similarity index 100% rename from Modules/QtWidgets/QmitkEventAdapter.h rename to Modules/QtWidgets/include/QmitkEventAdapter.h diff --git a/Modules/QtWidgets/QmitkFileReaderOptionsDialog.h b/Modules/QtWidgets/include/QmitkFileReaderOptionsDialog.h similarity index 100% rename from Modules/QtWidgets/QmitkFileReaderOptionsDialog.h rename to Modules/QtWidgets/include/QmitkFileReaderOptionsDialog.h diff --git a/Modules/QtWidgets/QmitkFileReaderWriterOptionsWidget.h b/Modules/QtWidgets/include/QmitkFileReaderWriterOptionsWidget.h similarity index 100% rename from Modules/QtWidgets/QmitkFileReaderWriterOptionsWidget.h rename to Modules/QtWidgets/include/QmitkFileReaderWriterOptionsWidget.h diff --git a/Modules/QtWidgets/QmitkFileWriterOptionsDialog.h b/Modules/QtWidgets/include/QmitkFileWriterOptionsDialog.h similarity index 100% rename from Modules/QtWidgets/QmitkFileWriterOptionsDialog.h rename to Modules/QtWidgets/include/QmitkFileWriterOptionsDialog.h diff --git a/Modules/QtWidgets/QmitkIOUtil.h b/Modules/QtWidgets/include/QmitkIOUtil.h similarity index 100% rename from Modules/QtWidgets/QmitkIOUtil.h rename to Modules/QtWidgets/include/QmitkIOUtil.h diff --git a/Modules/QtWidgets/QmitkLevelWindowPresetDefinitionDialog.h b/Modules/QtWidgets/include/QmitkLevelWindowPresetDefinitionDialog.h similarity index 100% rename from Modules/QtWidgets/QmitkLevelWindowPresetDefinitionDialog.h rename to Modules/QtWidgets/include/QmitkLevelWindowPresetDefinitionDialog.h diff --git a/Modules/QtWidgets/QmitkLevelWindowRangeChangeDialog.h b/Modules/QtWidgets/include/QmitkLevelWindowRangeChangeDialog.h similarity index 100% rename from Modules/QtWidgets/QmitkLevelWindowRangeChangeDialog.h rename to Modules/QtWidgets/include/QmitkLevelWindowRangeChangeDialog.h diff --git a/Modules/QtWidgets/QmitkLevelWindowWidget.h b/Modules/QtWidgets/include/QmitkLevelWindowWidget.h similarity index 100% rename from Modules/QtWidgets/QmitkLevelWindowWidget.h rename to Modules/QtWidgets/include/QmitkLevelWindowWidget.h diff --git a/Modules/QtWidgets/QmitkLevelWindowWidgetContextMenu.h b/Modules/QtWidgets/include/QmitkLevelWindowWidgetContextMenu.h similarity index 100% rename from Modules/QtWidgets/QmitkLevelWindowWidgetContextMenu.h rename to Modules/QtWidgets/include/QmitkLevelWindowWidgetContextMenu.h diff --git a/Modules/QtWidgets/QmitkLineEditLevelWindowWidget.h b/Modules/QtWidgets/include/QmitkLineEditLevelWindowWidget.h similarity index 100% rename from Modules/QtWidgets/QmitkLineEditLevelWindowWidget.h rename to Modules/QtWidgets/include/QmitkLineEditLevelWindowWidget.h diff --git a/Modules/QtWidgets/QmitkMemoryUsageIndicatorView.h b/Modules/QtWidgets/include/QmitkMemoryUsageIndicatorView.h similarity index 100% rename from Modules/QtWidgets/QmitkMemoryUsageIndicatorView.h rename to Modules/QtWidgets/include/QmitkMemoryUsageIndicatorView.h diff --git a/Modules/QtWidgets/QmitkMimeTypes.h b/Modules/QtWidgets/include/QmitkMimeTypes.h similarity index 100% rename from Modules/QtWidgets/QmitkMimeTypes.h rename to Modules/QtWidgets/include/QmitkMimeTypes.h diff --git a/Modules/QtWidgets/QmitkMouseModeSwitcher.h b/Modules/QtWidgets/include/QmitkMouseModeSwitcher.h similarity index 100% rename from Modules/QtWidgets/QmitkMouseModeSwitcher.h rename to Modules/QtWidgets/include/QmitkMouseModeSwitcher.h diff --git a/Modules/QtWidgets/QmitkNodeDescriptor.h b/Modules/QtWidgets/include/QmitkNodeDescriptor.h similarity index 100% rename from Modules/QtWidgets/QmitkNodeDescriptor.h rename to Modules/QtWidgets/include/QmitkNodeDescriptor.h diff --git a/Modules/QtWidgets/QmitkNodeDescriptorManager.h b/Modules/QtWidgets/include/QmitkNodeDescriptorManager.h similarity index 100% rename from Modules/QtWidgets/QmitkNodeDescriptorManager.h rename to Modules/QtWidgets/include/QmitkNodeDescriptorManager.h diff --git a/Modules/QtWidgets/QmitkProgressBar.h b/Modules/QtWidgets/include/QmitkProgressBar.h similarity index 100% rename from Modules/QtWidgets/QmitkProgressBar.h rename to Modules/QtWidgets/include/QmitkProgressBar.h diff --git a/Modules/QtWidgets/QmitkPropertiesTableEditor.h b/Modules/QtWidgets/include/QmitkPropertiesTableEditor.h similarity index 100% rename from Modules/QtWidgets/QmitkPropertiesTableEditor.h rename to Modules/QtWidgets/include/QmitkPropertiesTableEditor.h diff --git a/Modules/QtWidgets/QmitkPropertiesTableModel.h b/Modules/QtWidgets/include/QmitkPropertiesTableModel.h similarity index 100% rename from Modules/QtWidgets/QmitkPropertiesTableModel.h rename to Modules/QtWidgets/include/QmitkPropertiesTableModel.h diff --git a/Modules/QtWidgets/QmitkPropertyDelegate.h b/Modules/QtWidgets/include/QmitkPropertyDelegate.h similarity index 100% rename from Modules/QtWidgets/QmitkPropertyDelegate.h rename to Modules/QtWidgets/include/QmitkPropertyDelegate.h diff --git a/Modules/QtWidgets/QmitkRegisterClasses.h b/Modules/QtWidgets/include/QmitkRegisterClasses.h similarity index 100% rename from Modules/QtWidgets/QmitkRegisterClasses.h rename to Modules/QtWidgets/include/QmitkRegisterClasses.h diff --git a/Modules/QtWidgets/QmitkRenderWindow.h b/Modules/QtWidgets/include/QmitkRenderWindow.h similarity index 100% rename from Modules/QtWidgets/QmitkRenderWindow.h rename to Modules/QtWidgets/include/QmitkRenderWindow.h diff --git a/Modules/QtWidgets/QmitkRenderWindowMenu.h b/Modules/QtWidgets/include/QmitkRenderWindowMenu.h similarity index 100% rename from Modules/QtWidgets/QmitkRenderWindowMenu.h rename to Modules/QtWidgets/include/QmitkRenderWindowMenu.h diff --git a/Modules/QtWidgets/QmitkRenderingManager.h b/Modules/QtWidgets/include/QmitkRenderingManager.h similarity index 100% rename from Modules/QtWidgets/QmitkRenderingManager.h rename to Modules/QtWidgets/include/QmitkRenderingManager.h diff --git a/Modules/QtWidgets/QmitkRenderingManagerFactory.h b/Modules/QtWidgets/include/QmitkRenderingManagerFactory.h similarity index 100% rename from Modules/QtWidgets/QmitkRenderingManagerFactory.h rename to Modules/QtWidgets/include/QmitkRenderingManagerFactory.h diff --git a/Modules/QtWidgets/QmitkServiceListWidget.h b/Modules/QtWidgets/include/QmitkServiceListWidget.h similarity index 100% rename from Modules/QtWidgets/QmitkServiceListWidget.h rename to Modules/QtWidgets/include/QmitkServiceListWidget.h diff --git a/Modules/QtWidgets/QmitkSliderLevelWindowWidget.h b/Modules/QtWidgets/include/QmitkSliderLevelWindowWidget.h similarity index 100% rename from Modules/QtWidgets/QmitkSliderLevelWindowWidget.h rename to Modules/QtWidgets/include/QmitkSliderLevelWindowWidget.h diff --git a/Modules/QtWidgets/QmitkStdMultiWidget.h b/Modules/QtWidgets/include/QmitkStdMultiWidget.h similarity index 100% rename from Modules/QtWidgets/QmitkStdMultiWidget.h rename to Modules/QtWidgets/include/QmitkStdMultiWidget.h diff --git a/Modules/QtWidgets/Binaerbilder_48.png b/Modules/QtWidgets/resource/Binaerbilder_48.png similarity index 100% rename from Modules/QtWidgets/Binaerbilder_48.png rename to Modules/QtWidgets/resource/Binaerbilder_48.png diff --git a/Modules/QtWidgets/DataTypeUnknown_48.png b/Modules/QtWidgets/resource/DataTypeUnknown_48.png similarity index 100% rename from Modules/QtWidgets/DataTypeUnknown_48.png rename to Modules/QtWidgets/resource/DataTypeUnknown_48.png diff --git a/Modules/QtWidgets/Images_48.png b/Modules/QtWidgets/resource/Images_48.png similarity index 100% rename from Modules/QtWidgets/Images_48.png rename to Modules/QtWidgets/resource/Images_48.png diff --git a/Modules/QtWidgets/PointSet_48.png b/Modules/QtWidgets/resource/PointSet_48.png similarity index 100% rename from Modules/QtWidgets/PointSet_48.png rename to Modules/QtWidgets/resource/PointSet_48.png diff --git a/Modules/QtWidgets/Qmitk.qrc b/Modules/QtWidgets/resource/Qmitk.qrc similarity index 100% rename from Modules/QtWidgets/Qmitk.qrc rename to Modules/QtWidgets/resource/Qmitk.qrc diff --git a/Modules/QtWidgets/QmitkMemoryUsageIndicatorImagesGreen.xpm b/Modules/QtWidgets/resource/QmitkMemoryUsageIndicatorImagesGreen.xpm similarity index 100% rename from Modules/QtWidgets/QmitkMemoryUsageIndicatorImagesGreen.xpm rename to Modules/QtWidgets/resource/QmitkMemoryUsageIndicatorImagesGreen.xpm diff --git a/Modules/QtWidgets/QmitkMemoryUsageIndicatorImagesOrange.xpm b/Modules/QtWidgets/resource/QmitkMemoryUsageIndicatorImagesOrange.xpm similarity index 100% rename from Modules/QtWidgets/QmitkMemoryUsageIndicatorImagesOrange.xpm rename to Modules/QtWidgets/resource/QmitkMemoryUsageIndicatorImagesOrange.xpm diff --git a/Modules/QtWidgets/QmitkMemoryUsageIndicatorImagesRed.xpm b/Modules/QtWidgets/resource/QmitkMemoryUsageIndicatorImagesRed.xpm similarity index 100% rename from Modules/QtWidgets/QmitkMemoryUsageIndicatorImagesRed.xpm rename to Modules/QtWidgets/resource/QmitkMemoryUsageIndicatorImagesRed.xpm diff --git a/Modules/QtWidgets/QmitkMemoryUsageIndicatorImagesYellow.xpm b/Modules/QtWidgets/resource/QmitkMemoryUsageIndicatorImagesYellow.xpm similarity index 100% rename from Modules/QtWidgets/QmitkMemoryUsageIndicatorImagesYellow.xpm rename to Modules/QtWidgets/resource/QmitkMemoryUsageIndicatorImagesYellow.xpm diff --git a/Modules/QtWidgets/Segmentation_48.png b/Modules/QtWidgets/resource/Segmentation_48.png similarity index 100% rename from Modules/QtWidgets/Segmentation_48.png rename to Modules/QtWidgets/resource/Segmentation_48.png diff --git a/Modules/QtWidgets/Surface_48.png b/Modules/QtWidgets/resource/Surface_48.png similarity index 100% rename from Modules/QtWidgets/Surface_48.png rename to Modules/QtWidgets/resource/Surface_48.png diff --git a/Modules/QtWidgets/iconClose.xpm b/Modules/QtWidgets/resource/iconClose.xpm similarity index 100% rename from Modules/QtWidgets/iconClose.xpm rename to Modules/QtWidgets/resource/iconClose.xpm diff --git a/Modules/QtWidgets/iconCrosshairMode.xpm b/Modules/QtWidgets/resource/iconCrosshairMode.xpm similarity index 100% rename from Modules/QtWidgets/iconCrosshairMode.xpm rename to Modules/QtWidgets/resource/iconCrosshairMode.xpm diff --git a/Modules/QtWidgets/iconFullScreen.xpm b/Modules/QtWidgets/resource/iconFullScreen.xpm similarity index 100% rename from Modules/QtWidgets/iconFullScreen.xpm rename to Modules/QtWidgets/resource/iconFullScreen.xpm diff --git a/Modules/QtWidgets/iconHoriSplit.xpm b/Modules/QtWidgets/resource/iconHoriSplit.xpm similarity index 100% rename from Modules/QtWidgets/iconHoriSplit.xpm rename to Modules/QtWidgets/resource/iconHoriSplit.xpm diff --git a/Modules/QtWidgets/iconLeaveFullScreen.xpm b/Modules/QtWidgets/resource/iconLeaveFullScreen.xpm similarity index 100% rename from Modules/QtWidgets/iconLeaveFullScreen.xpm rename to Modules/QtWidgets/resource/iconLeaveFullScreen.xpm diff --git a/Modules/QtWidgets/iconSettings.xpm b/Modules/QtWidgets/resource/iconSettings.xpm similarity index 100% rename from Modules/QtWidgets/iconSettings.xpm rename to Modules/QtWidgets/resource/iconSettings.xpm diff --git a/Modules/QtWidgets/iconVertiSplit.xpm b/Modules/QtWidgets/resource/iconVertiSplit.xpm similarity index 100% rename from Modules/QtWidgets/iconVertiSplit.xpm rename to Modules/QtWidgets/resource/iconVertiSplit.xpm diff --git a/Modules/QtWidgets/mm_contrast.png b/Modules/QtWidgets/resource/mm_contrast.png similarity index 100% rename from Modules/QtWidgets/mm_contrast.png rename to Modules/QtWidgets/resource/mm_contrast.png diff --git a/Modules/QtWidgets/mm_pan.png b/Modules/QtWidgets/resource/mm_pan.png similarity index 100% rename from Modules/QtWidgets/mm_pan.png rename to Modules/QtWidgets/resource/mm_pan.png diff --git a/Modules/QtWidgets/mm_pointer.png b/Modules/QtWidgets/resource/mm_pointer.png similarity index 100% rename from Modules/QtWidgets/mm_pointer.png rename to Modules/QtWidgets/resource/mm_pointer.png diff --git a/Modules/QtWidgets/mm_scroll.png b/Modules/QtWidgets/resource/mm_scroll.png similarity index 100% rename from Modules/QtWidgets/mm_scroll.png rename to Modules/QtWidgets/resource/mm_scroll.png diff --git a/Modules/QtWidgets/mm_zoom.png b/Modules/QtWidgets/resource/mm_zoom.png similarity index 100% rename from Modules/QtWidgets/mm_zoom.png rename to Modules/QtWidgets/resource/mm_zoom.png diff --git a/Modules/QtWidgets/mousemodes.xcf b/Modules/QtWidgets/resource/mousemodes.xcf similarity index 100% rename from Modules/QtWidgets/mousemodes.xcf rename to Modules/QtWidgets/resource/mousemodes.xcf diff --git a/Modules/QtWidgets/QmitkApplicationCursor.cpp b/Modules/QtWidgets/src/QmitkApplicationCursor.cpp similarity index 100% rename from Modules/QtWidgets/QmitkApplicationCursor.cpp rename to Modules/QtWidgets/src/QmitkApplicationCursor.cpp diff --git a/Modules/QtWidgets/QmitkDataStorageComboBox.cpp b/Modules/QtWidgets/src/QmitkDataStorageComboBox.cpp similarity index 100% rename from Modules/QtWidgets/QmitkDataStorageComboBox.cpp rename to Modules/QtWidgets/src/QmitkDataStorageComboBox.cpp diff --git a/Modules/QtWidgets/QmitkDataStorageComboBoxWithSelectNone.cpp b/Modules/QtWidgets/src/QmitkDataStorageComboBoxWithSelectNone.cpp similarity index 100% rename from Modules/QtWidgets/QmitkDataStorageComboBoxWithSelectNone.cpp rename to Modules/QtWidgets/src/QmitkDataStorageComboBoxWithSelectNone.cpp diff --git a/Modules/QtWidgets/QmitkDataStorageFilterProxyModel.cpp b/Modules/QtWidgets/src/QmitkDataStorageFilterProxyModel.cpp similarity index 100% rename from Modules/QtWidgets/QmitkDataStorageFilterProxyModel.cpp rename to Modules/QtWidgets/src/QmitkDataStorageFilterProxyModel.cpp diff --git a/Modules/QtWidgets/QmitkDataStorageListModel.cpp b/Modules/QtWidgets/src/QmitkDataStorageListModel.cpp similarity index 100% rename from Modules/QtWidgets/QmitkDataStorageListModel.cpp rename to Modules/QtWidgets/src/QmitkDataStorageListModel.cpp diff --git a/Modules/QtWidgets/QmitkDataStorageTableModel.cpp b/Modules/QtWidgets/src/QmitkDataStorageTableModel.cpp similarity index 100% rename from Modules/QtWidgets/QmitkDataStorageTableModel.cpp rename to Modules/QtWidgets/src/QmitkDataStorageTableModel.cpp diff --git a/Modules/QtWidgets/QmitkDataStorageTreeModel.cpp b/Modules/QtWidgets/src/QmitkDataStorageTreeModel.cpp similarity index 100% rename from Modules/QtWidgets/QmitkDataStorageTreeModel.cpp rename to Modules/QtWidgets/src/QmitkDataStorageTreeModel.cpp diff --git a/Modules/QtWidgets/QmitkEventAdapter.cpp b/Modules/QtWidgets/src/QmitkEventAdapter.cpp similarity index 100% rename from Modules/QtWidgets/QmitkEventAdapter.cpp rename to Modules/QtWidgets/src/QmitkEventAdapter.cpp diff --git a/Modules/QtWidgets/QmitkFileReaderOptionsDialog.cpp b/Modules/QtWidgets/src/QmitkFileReaderOptionsDialog.cpp similarity index 100% rename from Modules/QtWidgets/QmitkFileReaderOptionsDialog.cpp rename to Modules/QtWidgets/src/QmitkFileReaderOptionsDialog.cpp diff --git a/Modules/QtWidgets/QmitkFileReaderOptionsDialog.ui b/Modules/QtWidgets/src/QmitkFileReaderOptionsDialog.ui similarity index 100% rename from Modules/QtWidgets/QmitkFileReaderOptionsDialog.ui rename to Modules/QtWidgets/src/QmitkFileReaderOptionsDialog.ui diff --git a/Modules/QtWidgets/QmitkFileReaderWriterOptionsWidget.cpp b/Modules/QtWidgets/src/QmitkFileReaderWriterOptionsWidget.cpp similarity index 100% rename from Modules/QtWidgets/QmitkFileReaderWriterOptionsWidget.cpp rename to Modules/QtWidgets/src/QmitkFileReaderWriterOptionsWidget.cpp diff --git a/Modules/QtWidgets/QmitkFileWriterOptionsDialog.cpp b/Modules/QtWidgets/src/QmitkFileWriterOptionsDialog.cpp similarity index 100% rename from Modules/QtWidgets/QmitkFileWriterOptionsDialog.cpp rename to Modules/QtWidgets/src/QmitkFileWriterOptionsDialog.cpp diff --git a/Modules/QtWidgets/QmitkFileWriterOptionsDialog.ui b/Modules/QtWidgets/src/QmitkFileWriterOptionsDialog.ui similarity index 100% rename from Modules/QtWidgets/QmitkFileWriterOptionsDialog.ui rename to Modules/QtWidgets/src/QmitkFileWriterOptionsDialog.ui diff --git a/Modules/QtWidgets/QmitkIOUtil.cpp b/Modules/QtWidgets/src/QmitkIOUtil.cpp similarity index 100% rename from Modules/QtWidgets/QmitkIOUtil.cpp rename to Modules/QtWidgets/src/QmitkIOUtil.cpp diff --git a/Modules/QtWidgets/QmitkLevelWindowPresetDefinition.ui b/Modules/QtWidgets/src/QmitkLevelWindowPresetDefinition.ui similarity index 100% rename from Modules/QtWidgets/QmitkLevelWindowPresetDefinition.ui rename to Modules/QtWidgets/src/QmitkLevelWindowPresetDefinition.ui diff --git a/Modules/QtWidgets/QmitkLevelWindowPresetDefinitionDialog.cpp b/Modules/QtWidgets/src/QmitkLevelWindowPresetDefinitionDialog.cpp similarity index 100% rename from Modules/QtWidgets/QmitkLevelWindowPresetDefinitionDialog.cpp rename to Modules/QtWidgets/src/QmitkLevelWindowPresetDefinitionDialog.cpp diff --git a/Modules/QtWidgets/QmitkLevelWindowRangeChange.ui b/Modules/QtWidgets/src/QmitkLevelWindowRangeChange.ui similarity index 100% rename from Modules/QtWidgets/QmitkLevelWindowRangeChange.ui rename to Modules/QtWidgets/src/QmitkLevelWindowRangeChange.ui diff --git a/Modules/QtWidgets/QmitkLevelWindowRangeChangeDialog.cpp b/Modules/QtWidgets/src/QmitkLevelWindowRangeChangeDialog.cpp similarity index 100% rename from Modules/QtWidgets/QmitkLevelWindowRangeChangeDialog.cpp rename to Modules/QtWidgets/src/QmitkLevelWindowRangeChangeDialog.cpp diff --git a/Modules/QtWidgets/QmitkLevelWindowWidget.cpp b/Modules/QtWidgets/src/QmitkLevelWindowWidget.cpp similarity index 100% rename from Modules/QtWidgets/QmitkLevelWindowWidget.cpp rename to Modules/QtWidgets/src/QmitkLevelWindowWidget.cpp diff --git a/Modules/QtWidgets/QmitkLevelWindowWidget.ui b/Modules/QtWidgets/src/QmitkLevelWindowWidget.ui similarity index 100% rename from Modules/QtWidgets/QmitkLevelWindowWidget.ui rename to Modules/QtWidgets/src/QmitkLevelWindowWidget.ui diff --git a/Modules/QtWidgets/QmitkLevelWindowWidgetContextMenu.cpp b/Modules/QtWidgets/src/QmitkLevelWindowWidgetContextMenu.cpp similarity index 100% rename from Modules/QtWidgets/QmitkLevelWindowWidgetContextMenu.cpp rename to Modules/QtWidgets/src/QmitkLevelWindowWidgetContextMenu.cpp diff --git a/Modules/QtWidgets/QmitkLineEditLevelWindowWidget.cpp b/Modules/QtWidgets/src/QmitkLineEditLevelWindowWidget.cpp similarity index 100% rename from Modules/QtWidgets/QmitkLineEditLevelWindowWidget.cpp rename to Modules/QtWidgets/src/QmitkLineEditLevelWindowWidget.cpp diff --git a/Modules/QtWidgets/QmitkMemoryUsageIndicator.ui b/Modules/QtWidgets/src/QmitkMemoryUsageIndicator.ui similarity index 100% rename from Modules/QtWidgets/QmitkMemoryUsageIndicator.ui rename to Modules/QtWidgets/src/QmitkMemoryUsageIndicator.ui diff --git a/Modules/QtWidgets/QmitkMemoryUsageIndicatorView.cpp b/Modules/QtWidgets/src/QmitkMemoryUsageIndicatorView.cpp similarity index 100% rename from Modules/QtWidgets/QmitkMemoryUsageIndicatorView.cpp rename to Modules/QtWidgets/src/QmitkMemoryUsageIndicatorView.cpp diff --git a/Modules/QtWidgets/QmitkMimeTypes.cpp b/Modules/QtWidgets/src/QmitkMimeTypes.cpp similarity index 100% rename from Modules/QtWidgets/QmitkMimeTypes.cpp rename to Modules/QtWidgets/src/QmitkMimeTypes.cpp diff --git a/Modules/QtWidgets/QmitkMouseModeSwitcher.cpp b/Modules/QtWidgets/src/QmitkMouseModeSwitcher.cpp similarity index 100% rename from Modules/QtWidgets/QmitkMouseModeSwitcher.cpp rename to Modules/QtWidgets/src/QmitkMouseModeSwitcher.cpp diff --git a/Modules/QtWidgets/QmitkNodeDescriptor.cpp b/Modules/QtWidgets/src/QmitkNodeDescriptor.cpp similarity index 100% rename from Modules/QtWidgets/QmitkNodeDescriptor.cpp rename to Modules/QtWidgets/src/QmitkNodeDescriptor.cpp diff --git a/Modules/QtWidgets/QmitkNodeDescriptorManager.cpp b/Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp similarity index 100% rename from Modules/QtWidgets/QmitkNodeDescriptorManager.cpp rename to Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp diff --git a/Modules/QtWidgets/QmitkProgressBar.cpp b/Modules/QtWidgets/src/QmitkProgressBar.cpp similarity index 100% rename from Modules/QtWidgets/QmitkProgressBar.cpp rename to Modules/QtWidgets/src/QmitkProgressBar.cpp diff --git a/Modules/QtWidgets/QmitkPropertiesTableEditor.cpp b/Modules/QtWidgets/src/QmitkPropertiesTableEditor.cpp similarity index 100% rename from Modules/QtWidgets/QmitkPropertiesTableEditor.cpp rename to Modules/QtWidgets/src/QmitkPropertiesTableEditor.cpp diff --git a/Modules/QtWidgets/QmitkPropertiesTableModel.cpp b/Modules/QtWidgets/src/QmitkPropertiesTableModel.cpp similarity index 100% rename from Modules/QtWidgets/QmitkPropertiesTableModel.cpp rename to Modules/QtWidgets/src/QmitkPropertiesTableModel.cpp diff --git a/Modules/QtWidgets/QmitkPropertyDelegate.cpp b/Modules/QtWidgets/src/QmitkPropertyDelegate.cpp similarity index 100% rename from Modules/QtWidgets/QmitkPropertyDelegate.cpp rename to Modules/QtWidgets/src/QmitkPropertyDelegate.cpp diff --git a/Modules/QtWidgets/QmitkRegisterClasses.cpp b/Modules/QtWidgets/src/QmitkRegisterClasses.cpp similarity index 100% rename from Modules/QtWidgets/QmitkRegisterClasses.cpp rename to Modules/QtWidgets/src/QmitkRegisterClasses.cpp diff --git a/Modules/QtWidgets/QmitkRenderWindow.cpp b/Modules/QtWidgets/src/QmitkRenderWindow.cpp similarity index 100% rename from Modules/QtWidgets/QmitkRenderWindow.cpp rename to Modules/QtWidgets/src/QmitkRenderWindow.cpp diff --git a/Modules/QtWidgets/QmitkRenderWindowMenu.cpp b/Modules/QtWidgets/src/QmitkRenderWindowMenu.cpp similarity index 100% rename from Modules/QtWidgets/QmitkRenderWindowMenu.cpp rename to Modules/QtWidgets/src/QmitkRenderWindowMenu.cpp diff --git a/Modules/QtWidgets/QmitkRenderingManager.cpp b/Modules/QtWidgets/src/QmitkRenderingManager.cpp similarity index 100% rename from Modules/QtWidgets/QmitkRenderingManager.cpp rename to Modules/QtWidgets/src/QmitkRenderingManager.cpp diff --git a/Modules/QtWidgets/QmitkRenderingManagerFactory.cpp b/Modules/QtWidgets/src/QmitkRenderingManagerFactory.cpp similarity index 100% rename from Modules/QtWidgets/QmitkRenderingManagerFactory.cpp rename to Modules/QtWidgets/src/QmitkRenderingManagerFactory.cpp diff --git a/Modules/QtWidgets/QmitkServiceListWidget.cpp b/Modules/QtWidgets/src/QmitkServiceListWidget.cpp similarity index 100% rename from Modules/QtWidgets/QmitkServiceListWidget.cpp rename to Modules/QtWidgets/src/QmitkServiceListWidget.cpp diff --git a/Modules/QtWidgets/QmitkServiceListWidgetControls.ui b/Modules/QtWidgets/src/QmitkServiceListWidgetControls.ui similarity index 100% rename from Modules/QtWidgets/QmitkServiceListWidgetControls.ui rename to Modules/QtWidgets/src/QmitkServiceListWidgetControls.ui diff --git a/Modules/QtWidgets/QmitkSliderLevelWindowWidget.cpp b/Modules/QtWidgets/src/QmitkSliderLevelWindowWidget.cpp similarity index 100% rename from Modules/QtWidgets/QmitkSliderLevelWindowWidget.cpp rename to Modules/QtWidgets/src/QmitkSliderLevelWindowWidget.cpp diff --git a/Modules/QtWidgets/QmitkStdMultiWidget.cpp b/Modules/QtWidgets/src/QmitkStdMultiWidget.cpp similarity index 100% rename from Modules/QtWidgets/QmitkStdMultiWidget.cpp rename to Modules/QtWidgets/src/QmitkStdMultiWidget.cpp diff --git a/Modules/QtWidgets/Testing/CMakeLists.txt b/Modules/QtWidgets/test/CMakeLists.txt similarity index 100% rename from Modules/QtWidgets/Testing/CMakeLists.txt rename to Modules/QtWidgets/test/CMakeLists.txt diff --git a/Modules/QtWidgets/Testing/QmitkThreadedLogTest.cpp b/Modules/QtWidgets/test/QmitkThreadedLogTest.cpp similarity index 100% rename from Modules/QtWidgets/Testing/QmitkThreadedLogTest.cpp rename to Modules/QtWidgets/test/QmitkThreadedLogTest.cpp diff --git a/Modules/QtWidgets/Testing/files.cmake b/Modules/QtWidgets/test/files.cmake similarity index 100% rename from Modules/QtWidgets/Testing/files.cmake rename to Modules/QtWidgets/test/files.cmake diff --git a/Modules/QtWidgetsExt/files.cmake b/Modules/QtWidgetsExt/files.cmake index 5986b01ad1..9e2e365382 100644 --- a/Modules/QtWidgetsExt/files.cmake +++ b/Modules/QtWidgetsExt/files.cmake @@ -1,114 +1,116 @@ +file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*") + set(CPP_FILES - QmitkAboutDialog/QmitkAboutDialog.cpp - QmitkPropertyObservers/QmitkBasePropertyView.cpp - QmitkPropertyObservers/QmitkBoolPropertyWidget.cpp - QmitkPropertyObservers/QmitkColorPropertyEditor.cpp - QmitkPropertyObservers/QmitkColorPropertyView.cpp - QmitkPropertyObservers/QmitkEnumerationPropertyWidget.cpp - QmitkPropertyObservers/QmitkNumberPropertyEditor.cpp - QmitkPropertyObservers/QmitkNumberPropertySlider.cpp - QmitkPropertyObservers/QmitkNumberPropertyView.cpp - QmitkPropertyObservers/QmitkPropertyViewFactory.cpp - QmitkPropertyObservers/QmitkStringPropertyEditor.cpp - QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.cpp - QmitkPropertyObservers/QmitkStringPropertyView.cpp - QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.cpp qclickablelabel.cpp + QmitkAboutDialog.cpp + QmitkBasePropertyView.cpp + QmitkBoolPropertyWidget.cpp QmitkBoundingObjectWidget.cpp QmitkCallbackFromGUIThread.cpp + QmitkColorPropertyEditor.cpp + QmitkColorPropertyView.cpp QmitkColorTransferFunctionCanvas.cpp QmitkCorrespondingPointSetsModel.cpp QmitkCorrespondingPointSetsView.cpp QmitkCorrespondingPointSetsWidget.cpp QmitkCrossWidget.cpp QmitkEditPointDialog.cpp + QmitkEnumerationPropertyWidget.cpp QmitkFileChooser.cpp QmitkGnuplotWidget.cpp QmitkHistogram.cpp QmitkHistogramJSWidget.cpp QmitkHistogramWidget.cpp QmitkHotkeyLineEdit.cpp QmitkModulesDialog.cpp QmitkModuleTableModel.cpp + QmitkNumberPropertyEditor.cpp + QmitkNumberPropertySlider.cpp + QmitkNumberPropertyView.cpp QmitkPiecewiseFunctionCanvas.cpp - QmitkPlotWidget.cpp QmitkPlotDialog.cpp + QmitkPlotWidget.cpp QmitkPointListModel.cpp QmitkPointListView.cpp QmitkPointListViewWidget.cpp QmitkPointListWidget.cpp QmitkPrimitiveMovieNavigatorWidget.cpp + QmitkPropertyViewFactory.cpp QmitkSelectableGLWidget.cpp QmitkSliceWidget.cpp QmitkSliderNavigatorWidget.cpp QmitkStandardViews.cpp QmitkStepperAdapter.cpp + QmitkStringPropertyEditor.cpp + QmitkStringPropertyOnDemandEdit.cpp + QmitkStringPropertyView.cpp QmitkTransferFunctionCanvas.cpp QmitkTransferFunctionGeneratorWidget.cpp QmitkTransferFunctionWidget.cpp + QmitkUGCombinedRepresentationPropertyWidget.cpp QmitkVideoBackground.cpp QmitkWebPage.cpp QtWidgetsExtRegisterClasses.cpp ) set(MOC_H_FILES - QmitkAboutDialog/QmitkAboutDialog.h - QmitkPropertyObservers/QmitkBasePropertyView.h - QmitkPropertyObservers/QmitkBoolPropertyWidget.h - QmitkPropertyObservers/QmitkColorPropertyEditor.h - QmitkPropertyObservers/QmitkColorPropertyView.h - QmitkPropertyObservers/QmitkEnumerationPropertyWidget.h - QmitkPropertyObservers/QmitkNumberPropertyEditor.h - QmitkPropertyObservers/QmitkNumberPropertySlider.h - QmitkPropertyObservers/QmitkNumberPropertyView.h - QmitkPropertyObservers/QmitkStringPropertyEditor.h - QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.h - QmitkPropertyObservers/QmitkStringPropertyView.h - QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.h - qclickablelabel.h - QmitkBoundingObjectWidget.h - QmitkCallbackFromGUIThread.h - QmitkColorTransferFunctionCanvas.h - QmitkCorrespondingPointSetsModel.h - QmitkCorrespondingPointSetsView.h - QmitkCorrespondingPointSetsWidget.h - QmitkCrossWidget.h - QmitkEditPointDialog.h - QmitkFileChooser.h - QmitkGnuplotWidget.h - QmitkHistogramJSWidget.h - QmitkHistogramWidget.h - QmitkHotkeyLineEdit.h - QmitkPiecewiseFunctionCanvas.h - QmitkPlotWidget.h - QmitkPointListModel.h - QmitkPointListView.h - QmitkPointListViewWidget.h - QmitkPointListWidget.h - QmitkPrimitiveMovieNavigatorWidget.h - QmitkSelectableGLWidget.h - QmitkSliceWidget.h - QmitkSliderNavigatorWidget.h - QmitkStandardViews.h - QmitkStepperAdapter.h - QmitkTransferFunctionCanvas.h - QmitkTransferFunctionGeneratorWidget.h - QmitkTransferFunctionWidget.h - QmitkVideoBackground.h - QmitkWebPage.h + include/qclickablelabel.h + include/QmitkAboutDialog.h + include/QmitkBasePropertyView.h + include/QmitkBoolPropertyWidget.h + include/QmitkBoundingObjectWidget.h + include/QmitkCallbackFromGUIThread.h + include/QmitkColorPropertyEditor.h + include/QmitkColorPropertyView.h + include/QmitkColorTransferFunctionCanvas.h + include/QmitkCorrespondingPointSetsModel.h + include/QmitkCorrespondingPointSetsView.h + include/QmitkCorrespondingPointSetsWidget.h + include/QmitkCrossWidget.h + include/QmitkEditPointDialog.h + include/QmitkEnumerationPropertyWidget.h + include/QmitkFileChooser.h + include/QmitkGnuplotWidget.h + include/QmitkHistogramJSWidget.h + include/QmitkHistogramWidget.h + include/QmitkHotkeyLineEdit.h + include/QmitkNumberPropertyEditor.h + include/QmitkNumberPropertySlider.h + include/QmitkNumberPropertyView.h + include/QmitkPiecewiseFunctionCanvas.h + include/QmitkPlotWidget.h + include/QmitkPointListModel.h + include/QmitkPointListView.h + include/QmitkPointListViewWidget.h + include/QmitkPointListWidget.h + include/QmitkPrimitiveMovieNavigatorWidget.h + include/QmitkSelectableGLWidget.h + include/QmitkSliceWidget.h + include/QmitkSliderNavigatorWidget.h + include/QmitkStandardViews.h + include/QmitkStepperAdapter.h + include/QmitkStringPropertyEditor.h + include/QmitkStringPropertyOnDemandEdit.h + include/QmitkStringPropertyView.h + include/QmitkTransferFunctionCanvas.h + include/QmitkTransferFunctionGeneratorWidget.h + include/QmitkTransferFunctionWidget.h + include/QmitkUGCombinedRepresentationPropertyWidget.h + include/QmitkVideoBackground.h + include/QmitkWebPage.h ) set(UI_FILES - QmitkAboutDialog/QmitkAboutDialogGUI.ui - QmitkGnuplotWidget.ui - QmitkPrimitiveMovieNavigatorWidget.ui - QmitkSelectableGLWidget.ui - QmitkSliceWidget.ui - QmitkSliderNavigator.ui - QmitkTransferFunctionGeneratorWidget.ui - QmitkTransferFunctionWidget.ui + src/QmitkAboutDialogGUI.ui + src/QmitkGnuplotWidget.ui + src/QmitkPrimitiveMovieNavigatorWidget.ui + src/QmitkSelectableGLWidget.ui + src/QmitkSliceWidget.ui + src/QmitkSliderNavigator.ui + src/QmitkTransferFunctionGeneratorWidget.ui + src/QmitkTransferFunctionWidget.ui ) set(QRC_FILES - resources/QtWidgetsExt.qrc + resource/QtWidgetsExt.qrc ) diff --git a/Modules/QtWidgetsExt/QmitkAboutDialog/QmitkAboutDialog.h b/Modules/QtWidgetsExt/include/QmitkAboutDialog.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkAboutDialog/QmitkAboutDialog.h rename to Modules/QtWidgetsExt/include/QmitkAboutDialog.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkBasePropertyView.h b/Modules/QtWidgetsExt/include/QmitkBasePropertyView.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkBasePropertyView.h rename to Modules/QtWidgetsExt/include/QmitkBasePropertyView.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkBoolPropertyWidget.h b/Modules/QtWidgetsExt/include/QmitkBoolPropertyWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkBoolPropertyWidget.h rename to Modules/QtWidgetsExt/include/QmitkBoolPropertyWidget.h diff --git a/Modules/QtWidgetsExt/QmitkBoundingObjectWidget.h b/Modules/QtWidgetsExt/include/QmitkBoundingObjectWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkBoundingObjectWidget.h rename to Modules/QtWidgetsExt/include/QmitkBoundingObjectWidget.h diff --git a/Modules/QtWidgetsExt/QmitkCallbackFromGUIThread.h b/Modules/QtWidgetsExt/include/QmitkCallbackFromGUIThread.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkCallbackFromGUIThread.h rename to Modules/QtWidgetsExt/include/QmitkCallbackFromGUIThread.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkColorPropertyEditor.h b/Modules/QtWidgetsExt/include/QmitkColorPropertyEditor.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkColorPropertyEditor.h rename to Modules/QtWidgetsExt/include/QmitkColorPropertyEditor.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkColorPropertyView.h b/Modules/QtWidgetsExt/include/QmitkColorPropertyView.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkColorPropertyView.h rename to Modules/QtWidgetsExt/include/QmitkColorPropertyView.h diff --git a/Modules/QtWidgetsExt/QmitkColorTransferFunctionCanvas.h b/Modules/QtWidgetsExt/include/QmitkColorTransferFunctionCanvas.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkColorTransferFunctionCanvas.h rename to Modules/QtWidgetsExt/include/QmitkColorTransferFunctionCanvas.h diff --git a/Modules/QtWidgetsExt/QmitkCorrespondingPointSetsModel.h b/Modules/QtWidgetsExt/include/QmitkCorrespondingPointSetsModel.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkCorrespondingPointSetsModel.h rename to Modules/QtWidgetsExt/include/QmitkCorrespondingPointSetsModel.h diff --git a/Modules/QtWidgetsExt/QmitkCorrespondingPointSetsView.h b/Modules/QtWidgetsExt/include/QmitkCorrespondingPointSetsView.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkCorrespondingPointSetsView.h rename to Modules/QtWidgetsExt/include/QmitkCorrespondingPointSetsView.h diff --git a/Modules/QtWidgetsExt/QmitkCorrespondingPointSetsWidget.h b/Modules/QtWidgetsExt/include/QmitkCorrespondingPointSetsWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkCorrespondingPointSetsWidget.h rename to Modules/QtWidgetsExt/include/QmitkCorrespondingPointSetsWidget.h diff --git a/Modules/QtWidgetsExt/QmitkCrossWidget.h b/Modules/QtWidgetsExt/include/QmitkCrossWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkCrossWidget.h rename to Modules/QtWidgetsExt/include/QmitkCrossWidget.h diff --git a/Modules/QtWidgetsExt/QmitkEditPointDialog.h b/Modules/QtWidgetsExt/include/QmitkEditPointDialog.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkEditPointDialog.h rename to Modules/QtWidgetsExt/include/QmitkEditPointDialog.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkEnumerationPropertyWidget.h b/Modules/QtWidgetsExt/include/QmitkEnumerationPropertyWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkEnumerationPropertyWidget.h rename to Modules/QtWidgetsExt/include/QmitkEnumerationPropertyWidget.h diff --git a/Modules/QtWidgetsExt/QmitkFileChooser.h b/Modules/QtWidgetsExt/include/QmitkFileChooser.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkFileChooser.h rename to Modules/QtWidgetsExt/include/QmitkFileChooser.h diff --git a/Modules/QtWidgetsExt/QmitkFunctionalityComponentContainer.h b/Modules/QtWidgetsExt/include/QmitkFunctionalityComponentContainer.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkFunctionalityComponentContainer.h rename to Modules/QtWidgetsExt/include/QmitkFunctionalityComponentContainer.h diff --git a/Modules/QtWidgetsExt/QmitkGnuplotWidget.h b/Modules/QtWidgetsExt/include/QmitkGnuplotWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkGnuplotWidget.h rename to Modules/QtWidgetsExt/include/QmitkGnuplotWidget.h diff --git a/Modules/QtWidgetsExt/QmitkHistogram.h b/Modules/QtWidgetsExt/include/QmitkHistogram.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkHistogram.h rename to Modules/QtWidgetsExt/include/QmitkHistogram.h diff --git a/Modules/QtWidgetsExt/QmitkHistogramJSWidget.h b/Modules/QtWidgetsExt/include/QmitkHistogramJSWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkHistogramJSWidget.h rename to Modules/QtWidgetsExt/include/QmitkHistogramJSWidget.h diff --git a/Modules/QtWidgetsExt/QmitkHistogramWidget.h b/Modules/QtWidgetsExt/include/QmitkHistogramWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkHistogramWidget.h rename to Modules/QtWidgetsExt/include/QmitkHistogramWidget.h diff --git a/Modules/QtWidgetsExt/QmitkHotkeyLineEdit.h b/Modules/QtWidgetsExt/include/QmitkHotkeyLineEdit.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkHotkeyLineEdit.h rename to Modules/QtWidgetsExt/include/QmitkHotkeyLineEdit.h diff --git a/Modules/QtWidgetsExt/QmitkModuleTableModel.h b/Modules/QtWidgetsExt/include/QmitkModuleTableModel.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkModuleTableModel.h rename to Modules/QtWidgetsExt/include/QmitkModuleTableModel.h diff --git a/Modules/QtWidgetsExt/QmitkModulesDialog.h b/Modules/QtWidgetsExt/include/QmitkModulesDialog.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkModulesDialog.h rename to Modules/QtWidgetsExt/include/QmitkModulesDialog.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkNumberPropertyEditor.h b/Modules/QtWidgetsExt/include/QmitkNumberPropertyEditor.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkNumberPropertyEditor.h rename to Modules/QtWidgetsExt/include/QmitkNumberPropertyEditor.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkNumberPropertySlider.h b/Modules/QtWidgetsExt/include/QmitkNumberPropertySlider.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkNumberPropertySlider.h rename to Modules/QtWidgetsExt/include/QmitkNumberPropertySlider.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkNumberPropertyView.h b/Modules/QtWidgetsExt/include/QmitkNumberPropertyView.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkNumberPropertyView.h rename to Modules/QtWidgetsExt/include/QmitkNumberPropertyView.h diff --git a/Modules/QtWidgetsExt/QmitkPiecewiseFunctionCanvas.h b/Modules/QtWidgetsExt/include/QmitkPiecewiseFunctionCanvas.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPiecewiseFunctionCanvas.h rename to Modules/QtWidgetsExt/include/QmitkPiecewiseFunctionCanvas.h diff --git a/Modules/QtWidgetsExt/QmitkPlotDialog.h b/Modules/QtWidgetsExt/include/QmitkPlotDialog.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPlotDialog.h rename to Modules/QtWidgetsExt/include/QmitkPlotDialog.h diff --git a/Modules/QtWidgetsExt/QmitkPlotWidget.h b/Modules/QtWidgetsExt/include/QmitkPlotWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPlotWidget.h rename to Modules/QtWidgetsExt/include/QmitkPlotWidget.h diff --git a/Modules/QtWidgetsExt/QmitkPointListModel.h b/Modules/QtWidgetsExt/include/QmitkPointListModel.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPointListModel.h rename to Modules/QtWidgetsExt/include/QmitkPointListModel.h diff --git a/Modules/QtWidgetsExt/QmitkPointListView.h b/Modules/QtWidgetsExt/include/QmitkPointListView.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPointListView.h rename to Modules/QtWidgetsExt/include/QmitkPointListView.h diff --git a/Modules/QtWidgetsExt/QmitkPointListViewWidget.h b/Modules/QtWidgetsExt/include/QmitkPointListViewWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPointListViewWidget.h rename to Modules/QtWidgetsExt/include/QmitkPointListViewWidget.h diff --git a/Modules/QtWidgetsExt/QmitkPointListWidget.h b/Modules/QtWidgetsExt/include/QmitkPointListWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPointListWidget.h rename to Modules/QtWidgetsExt/include/QmitkPointListWidget.h diff --git a/Modules/QtWidgetsExt/QmitkPrimitiveMovieNavigatorWidget.h b/Modules/QtWidgetsExt/include/QmitkPrimitiveMovieNavigatorWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPrimitiveMovieNavigatorWidget.h rename to Modules/QtWidgetsExt/include/QmitkPrimitiveMovieNavigatorWidget.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyListPopup.h b/Modules/QtWidgetsExt/include/QmitkPropertyListPopup.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyListPopup.h rename to Modules/QtWidgetsExt/include/QmitkPropertyListPopup.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkPropertyViewFactory.h b/Modules/QtWidgetsExt/include/QmitkPropertyViewFactory.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkPropertyViewFactory.h rename to Modules/QtWidgetsExt/include/QmitkPropertyViewFactory.h diff --git a/Modules/QtWidgetsExt/QmitkSelectableGLWidget.h b/Modules/QtWidgetsExt/include/QmitkSelectableGLWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkSelectableGLWidget.h rename to Modules/QtWidgetsExt/include/QmitkSelectableGLWidget.h diff --git a/Modules/QtWidgetsExt/QmitkSliceWidget.h b/Modules/QtWidgetsExt/include/QmitkSliceWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkSliceWidget.h rename to Modules/QtWidgetsExt/include/QmitkSliceWidget.h diff --git a/Modules/QtWidgetsExt/QmitkSliderNavigatorWidget.h b/Modules/QtWidgetsExt/include/QmitkSliderNavigatorWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkSliderNavigatorWidget.h rename to Modules/QtWidgetsExt/include/QmitkSliderNavigatorWidget.h diff --git a/Modules/QtWidgetsExt/QmitkStandardViews.h b/Modules/QtWidgetsExt/include/QmitkStandardViews.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkStandardViews.h rename to Modules/QtWidgetsExt/include/QmitkStandardViews.h diff --git a/Modules/QtWidgetsExt/QmitkStepperAdapter.h b/Modules/QtWidgetsExt/include/QmitkStepperAdapter.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkStepperAdapter.h rename to Modules/QtWidgetsExt/include/QmitkStepperAdapter.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkStringPropertyEditor.h b/Modules/QtWidgetsExt/include/QmitkStringPropertyEditor.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkStringPropertyEditor.h rename to Modules/QtWidgetsExt/include/QmitkStringPropertyEditor.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.h b/Modules/QtWidgetsExt/include/QmitkStringPropertyOnDemandEdit.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.h rename to Modules/QtWidgetsExt/include/QmitkStringPropertyOnDemandEdit.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkStringPropertyView.h b/Modules/QtWidgetsExt/include/QmitkStringPropertyView.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkStringPropertyView.h rename to Modules/QtWidgetsExt/include/QmitkStringPropertyView.h diff --git a/Modules/QtWidgetsExt/QmitkTransferFunctionCanvas.h b/Modules/QtWidgetsExt/include/QmitkTransferFunctionCanvas.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkTransferFunctionCanvas.h rename to Modules/QtWidgetsExt/include/QmitkTransferFunctionCanvas.h diff --git a/Modules/QtWidgetsExt/QmitkTransferFunctionGeneratorWidget.h b/Modules/QtWidgetsExt/include/QmitkTransferFunctionGeneratorWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkTransferFunctionGeneratorWidget.h rename to Modules/QtWidgetsExt/include/QmitkTransferFunctionGeneratorWidget.h diff --git a/Modules/QtWidgetsExt/QmitkTransferFunctionWidget.h b/Modules/QtWidgetsExt/include/QmitkTransferFunctionWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkTransferFunctionWidget.h rename to Modules/QtWidgetsExt/include/QmitkTransferFunctionWidget.h diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.h b/Modules/QtWidgetsExt/include/QmitkUGCombinedRepresentationPropertyWidget.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.h rename to Modules/QtWidgetsExt/include/QmitkUGCombinedRepresentationPropertyWidget.h diff --git a/Modules/QtWidgetsExt/QmitkVideoBackground.h b/Modules/QtWidgetsExt/include/QmitkVideoBackground.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkVideoBackground.h rename to Modules/QtWidgetsExt/include/QmitkVideoBackground.h diff --git a/Modules/QtWidgetsExt/QmitkWebPage.h b/Modules/QtWidgetsExt/include/QmitkWebPage.h similarity index 100% rename from Modules/QtWidgetsExt/QmitkWebPage.h rename to Modules/QtWidgetsExt/include/QmitkWebPage.h diff --git a/Modules/QtWidgetsExt/QtWidgetsExtRegisterClasses.h b/Modules/QtWidgetsExt/include/QtWidgetsExtRegisterClasses.h similarity index 100% rename from Modules/QtWidgetsExt/QtWidgetsExtRegisterClasses.h rename to Modules/QtWidgetsExt/include/QtWidgetsExtRegisterClasses.h diff --git a/Modules/QtWidgetsExt/qclickablelabel.h b/Modules/QtWidgetsExt/include/qclickablelabel.h similarity index 100% rename from Modules/QtWidgetsExt/qclickablelabel.h rename to Modules/QtWidgetsExt/include/qclickablelabel.h diff --git a/Modules/QtWidgetsExt/resources/Histogram.css b/Modules/QtWidgetsExt/resource/Histogram.css similarity index 100% rename from Modules/QtWidgetsExt/resources/Histogram.css rename to Modules/QtWidgetsExt/resource/Histogram.css diff --git a/Modules/QtWidgetsExt/resources/Histogram.html b/Modules/QtWidgetsExt/resource/Histogram.html similarity index 100% rename from Modules/QtWidgetsExt/resources/Histogram.html rename to Modules/QtWidgetsExt/resource/Histogram.html diff --git a/Modules/QtWidgetsExt/resources/Histogram.js b/Modules/QtWidgetsExt/resource/Histogram.js similarity index 100% rename from Modules/QtWidgetsExt/resources/Histogram.js rename to Modules/QtWidgetsExt/resource/Histogram.js diff --git a/Modules/QtWidgetsExt/resources/Logo_mbiATdkfz_gross.png b/Modules/QtWidgetsExt/resource/Logo_mbiATdkfz_gross.png similarity index 100% rename from Modules/QtWidgetsExt/resources/Logo_mbiATdkfz_gross.png rename to Modules/QtWidgetsExt/resource/Logo_mbiATdkfz_gross.png diff --git a/Modules/QtWidgetsExt/resources/Logo_mbiATdkfz_small.png b/Modules/QtWidgetsExt/resource/Logo_mbiATdkfz_small.png similarity index 100% rename from Modules/QtWidgetsExt/resources/Logo_mbiATdkfz_small.png rename to Modules/QtWidgetsExt/resource/Logo_mbiATdkfz_small.png diff --git a/Modules/QtWidgetsExt/resources/ModuleView.png b/Modules/QtWidgetsExt/resource/ModuleView.png similarity index 100% rename from Modules/QtWidgetsExt/resources/ModuleView.png rename to Modules/QtWidgetsExt/resource/ModuleView.png diff --git a/Modules/QtWidgetsExt/resources/PlanarAngle_48.png b/Modules/QtWidgetsExt/resource/PlanarAngle_48.png similarity index 100% rename from Modules/QtWidgetsExt/resources/PlanarAngle_48.png rename to Modules/QtWidgetsExt/resource/PlanarAngle_48.png diff --git a/Modules/QtWidgetsExt/resources/PlanarBezierCurve_48.png b/Modules/QtWidgetsExt/resource/PlanarBezierCurve_48.png similarity index 100% rename from Modules/QtWidgetsExt/resources/PlanarBezierCurve_48.png rename to Modules/QtWidgetsExt/resource/PlanarBezierCurve_48.png diff --git a/Modules/QtWidgetsExt/resources/PlanarCircle_48.png b/Modules/QtWidgetsExt/resource/PlanarCircle_48.png similarity index 100% rename from Modules/QtWidgetsExt/resources/PlanarCircle_48.png rename to Modules/QtWidgetsExt/resource/PlanarCircle_48.png diff --git a/Modules/QtWidgetsExt/resources/PlanarDoubleEllipse_48.png b/Modules/QtWidgetsExt/resource/PlanarDoubleEllipse_48.png similarity index 100% rename from Modules/QtWidgetsExt/resources/PlanarDoubleEllipse_48.png rename to Modules/QtWidgetsExt/resource/PlanarDoubleEllipse_48.png diff --git a/Modules/QtWidgetsExt/resources/PlanarEllipse_48.png b/Modules/QtWidgetsExt/resource/PlanarEllipse_48.png similarity index 100% rename from Modules/QtWidgetsExt/resources/PlanarEllipse_48.png rename to Modules/QtWidgetsExt/resource/PlanarEllipse_48.png diff --git a/Modules/QtWidgetsExt/resources/PlanarFourPointAngle_48.png b/Modules/QtWidgetsExt/resource/PlanarFourPointAngle_48.png similarity index 100% rename from Modules/QtWidgetsExt/resources/PlanarFourPointAngle_48.png rename to Modules/QtWidgetsExt/resource/PlanarFourPointAngle_48.png diff --git a/Modules/QtWidgetsExt/resources/PlanarLine_48.png b/Modules/QtWidgetsExt/resource/PlanarLine_48.png similarity index 100% rename from Modules/QtWidgetsExt/resources/PlanarLine_48.png rename to Modules/QtWidgetsExt/resource/PlanarLine_48.png diff --git a/Modules/QtWidgetsExt/resources/PlanarPath_48.png b/Modules/QtWidgetsExt/resource/PlanarPath_48.png similarity index 100% rename from Modules/QtWidgetsExt/resources/PlanarPath_48.png rename to Modules/QtWidgetsExt/resource/PlanarPath_48.png diff --git a/Modules/QtWidgetsExt/resources/PlanarPolygon_48.png b/Modules/QtWidgetsExt/resource/PlanarPolygon_48.png similarity index 100% rename from Modules/QtWidgetsExt/resources/PlanarPolygon_48.png rename to Modules/QtWidgetsExt/resource/PlanarPolygon_48.png diff --git a/Modules/QtWidgetsExt/resources/PlanarRectangle_48.png b/Modules/QtWidgetsExt/resource/PlanarRectangle_48.png similarity index 100% rename from Modules/QtWidgetsExt/resources/PlanarRectangle_48.png rename to Modules/QtWidgetsExt/resource/PlanarRectangle_48.png diff --git a/Modules/QtWidgetsExt/resources/PlanarSubdivisionPolygon_48.png b/Modules/QtWidgetsExt/resource/PlanarSubdivisionPolygon_48.png similarity index 100% rename from Modules/QtWidgetsExt/resources/PlanarSubdivisionPolygon_48.png rename to Modules/QtWidgetsExt/resource/PlanarSubdivisionPolygon_48.png diff --git a/Modules/QtWidgetsExt/resources/QmitkStandardViews.png b/Modules/QtWidgetsExt/resource/QmitkStandardViews.png similarity index 100% rename from Modules/QtWidgetsExt/resources/QmitkStandardViews.png rename to Modules/QtWidgetsExt/resource/QmitkStandardViews.png diff --git a/Modules/QtWidgetsExt/resources/QmitkStandardViews.svg b/Modules/QtWidgetsExt/resource/QmitkStandardViews.svg similarity index 100% rename from Modules/QtWidgetsExt/resources/QmitkStandardViews.svg rename to Modules/QtWidgetsExt/resource/QmitkStandardViews.svg diff --git a/Modules/QtWidgetsExt/resources/QmitkStandardViewsDialogBar.xpm b/Modules/QtWidgetsExt/resource/QmitkStandardViewsDialogBar.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/QmitkStandardViewsDialogBar.xpm rename to Modules/QtWidgetsExt/resource/QmitkStandardViewsDialogBar.xpm diff --git a/Modules/QtWidgetsExt/resources/QtWidgetsExt.qrc b/Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc similarity index 100% rename from Modules/QtWidgetsExt/resources/QtWidgetsExt.qrc rename to Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc diff --git a/Modules/QtWidgetsExt/resources/btnAddPointSet.png b/Modules/QtWidgetsExt/resource/btnAddPointSet.png similarity index 100% rename from Modules/QtWidgetsExt/resources/btnAddPointSet.png rename to Modules/QtWidgetsExt/resource/btnAddPointSet.png diff --git a/Modules/QtWidgetsExt/resources/btnClear.xpm b/Modules/QtWidgetsExt/resource/btnClear.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/btnClear.xpm rename to Modules/QtWidgetsExt/resource/btnClear.xpm diff --git a/Modules/QtWidgetsExt/resources/btnCube.xpm b/Modules/QtWidgetsExt/resource/btnCube.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/btnCube.xpm rename to Modules/QtWidgetsExt/resource/btnCube.xpm diff --git a/Modules/QtWidgetsExt/resources/btnCylinder.xpm b/Modules/QtWidgetsExt/resource/btnCylinder.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/btnCylinder.xpm rename to Modules/QtWidgetsExt/resource/btnCylinder.xpm diff --git a/Modules/QtWidgetsExt/resources/btnDown.xpm b/Modules/QtWidgetsExt/resource/btnDown.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/btnDown.xpm rename to Modules/QtWidgetsExt/resource/btnDown.xpm diff --git a/Modules/QtWidgetsExt/resources/btnEllipsoid.xpm b/Modules/QtWidgetsExt/resource/btnEllipsoid.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/btnEllipsoid.xpm rename to Modules/QtWidgetsExt/resource/btnEllipsoid.xpm diff --git a/Modules/QtWidgetsExt/resources/btnLoad.xpm b/Modules/QtWidgetsExt/resource/btnLoad.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/btnLoad.xpm rename to Modules/QtWidgetsExt/resource/btnLoad.xpm diff --git a/Modules/QtWidgetsExt/resources/btnMoveDown.png b/Modules/QtWidgetsExt/resource/btnMoveDown.png similarity index 100% rename from Modules/QtWidgetsExt/resources/btnMoveDown.png rename to Modules/QtWidgetsExt/resource/btnMoveDown.png diff --git a/Modules/QtWidgetsExt/resources/btnMoveUp.png b/Modules/QtWidgetsExt/resource/btnMoveUp.png similarity index 100% rename from Modules/QtWidgetsExt/resources/btnMoveUp.png rename to Modules/QtWidgetsExt/resource/btnMoveUp.png diff --git a/Modules/QtWidgetsExt/resources/btnPyramid.xpm b/Modules/QtWidgetsExt/resource/btnPyramid.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/btnPyramid.xpm rename to Modules/QtWidgetsExt/resource/btnPyramid.xpm diff --git a/Modules/QtWidgetsExt/resources/btnRemovePoint.png b/Modules/QtWidgetsExt/resource/btnRemovePoint.png similarity index 100% rename from Modules/QtWidgetsExt/resources/btnRemovePoint.png rename to Modules/QtWidgetsExt/resource/btnRemovePoint.png diff --git a/Modules/QtWidgetsExt/resources/btnSave.xpm b/Modules/QtWidgetsExt/resource/btnSave.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/btnSave.xpm rename to Modules/QtWidgetsExt/resource/btnSave.xpm diff --git a/Modules/QtWidgetsExt/resources/btnSetPoints.png b/Modules/QtWidgetsExt/resource/btnSetPoints.png similarity index 100% rename from Modules/QtWidgetsExt/resources/btnSetPoints.png rename to Modules/QtWidgetsExt/resource/btnSetPoints.png diff --git a/Modules/QtWidgetsExt/resources/btnSetPoints.xpm b/Modules/QtWidgetsExt/resource/btnSetPoints.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/btnSetPoints.xpm rename to Modules/QtWidgetsExt/resource/btnSetPoints.xpm diff --git a/Modules/QtWidgetsExt/resources/btnSetPointsManually.xpm b/Modules/QtWidgetsExt/resource/btnSetPointsManually.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/btnSetPointsManually.xpm rename to Modules/QtWidgetsExt/resource/btnSetPointsManually.xpm diff --git a/Modules/QtWidgetsExt/resources/btnSetSeedPoint.xpm b/Modules/QtWidgetsExt/resource/btnSetSeedPoint.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/btnSetSeedPoint.xpm rename to Modules/QtWidgetsExt/resource/btnSetSeedPoint.xpm diff --git a/Modules/QtWidgetsExt/resources/btnSwapSets.png b/Modules/QtWidgetsExt/resource/btnSwapSets.png similarity index 100% rename from Modules/QtWidgetsExt/resources/btnSwapSets.png rename to Modules/QtWidgetsExt/resource/btnSwapSets.png diff --git a/Modules/QtWidgetsExt/resources/btnUp.xpm b/Modules/QtWidgetsExt/resource/btnUp.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/btnUp.xpm rename to Modules/QtWidgetsExt/resource/btnUp.xpm diff --git a/Modules/QtWidgetsExt/resources/cross.png b/Modules/QtWidgetsExt/resource/cross.png similarity index 100% rename from Modules/QtWidgetsExt/resources/cross.png rename to Modules/QtWidgetsExt/resource/cross.png diff --git a/Modules/QtWidgetsExt/resources/d3.v2.js b/Modules/QtWidgetsExt/resource/d3.v2.js similarity index 100% rename from Modules/QtWidgetsExt/resources/d3.v2.js rename to Modules/QtWidgetsExt/resource/d3.v2.js diff --git a/Modules/QtWidgetsExt/resources/icon_seedpoint.png b/Modules/QtWidgetsExt/resource/icon_seedpoint.png similarity index 100% rename from Modules/QtWidgetsExt/resources/icon_seedpoint.png rename to Modules/QtWidgetsExt/resource/icon_seedpoint.png diff --git a/Modules/QtWidgetsExt/resources/logo_mint-medical.png b/Modules/QtWidgetsExt/resource/logo_mint-medical.png similarity index 100% rename from Modules/QtWidgetsExt/resources/logo_mint-medical.png rename to Modules/QtWidgetsExt/resource/logo_mint-medical.png diff --git a/Modules/QtWidgetsExt/resources/play.xpm b/Modules/QtWidgetsExt/resource/play.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/play.xpm rename to Modules/QtWidgetsExt/resource/play.xpm diff --git a/Modules/QtWidgetsExt/resources/stop.xpm b/Modules/QtWidgetsExt/resource/stop.xpm similarity index 100% rename from Modules/QtWidgetsExt/resources/stop.xpm rename to Modules/QtWidgetsExt/resource/stop.xpm diff --git a/Modules/QtWidgetsExt/QmitkAboutDialog/QmitkAboutDialog.cpp b/Modules/QtWidgetsExt/src/QmitkAboutDialog.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkAboutDialog/QmitkAboutDialog.cpp rename to Modules/QtWidgetsExt/src/QmitkAboutDialog.cpp diff --git a/Modules/QtWidgetsExt/QmitkAboutDialog/QmitkAboutDialog.ui b/Modules/QtWidgetsExt/src/QmitkAboutDialog.ui similarity index 100% rename from Modules/QtWidgetsExt/QmitkAboutDialog/QmitkAboutDialog.ui rename to Modules/QtWidgetsExt/src/QmitkAboutDialog.ui diff --git a/Modules/QtWidgetsExt/QmitkAboutDialog/QmitkAboutDialogGUI.ui b/Modules/QtWidgetsExt/src/QmitkAboutDialogGUI.ui similarity index 100% rename from Modules/QtWidgetsExt/QmitkAboutDialog/QmitkAboutDialogGUI.ui rename to Modules/QtWidgetsExt/src/QmitkAboutDialogGUI.ui diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkBasePropertyView.cpp b/Modules/QtWidgetsExt/src/QmitkBasePropertyView.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkBasePropertyView.cpp rename to Modules/QtWidgetsExt/src/QmitkBasePropertyView.cpp diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkBoolPropertyWidget.cpp b/Modules/QtWidgetsExt/src/QmitkBoolPropertyWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkBoolPropertyWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkBoolPropertyWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkBoundingObjectWidget.cpp b/Modules/QtWidgetsExt/src/QmitkBoundingObjectWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkBoundingObjectWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkBoundingObjectWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkCallbackFromGUIThread.cpp b/Modules/QtWidgetsExt/src/QmitkCallbackFromGUIThread.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkCallbackFromGUIThread.cpp rename to Modules/QtWidgetsExt/src/QmitkCallbackFromGUIThread.cpp diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkColorPropertyEditor.cpp b/Modules/QtWidgetsExt/src/QmitkColorPropertyEditor.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkColorPropertyEditor.cpp rename to Modules/QtWidgetsExt/src/QmitkColorPropertyEditor.cpp diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkColorPropertyView.cpp b/Modules/QtWidgetsExt/src/QmitkColorPropertyView.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkColorPropertyView.cpp rename to Modules/QtWidgetsExt/src/QmitkColorPropertyView.cpp diff --git a/Modules/QtWidgetsExt/QmitkColorTransferFunctionCanvas.cpp b/Modules/QtWidgetsExt/src/QmitkColorTransferFunctionCanvas.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkColorTransferFunctionCanvas.cpp rename to Modules/QtWidgetsExt/src/QmitkColorTransferFunctionCanvas.cpp diff --git a/Modules/QtWidgetsExt/QmitkCorrespondingPointSetsModel.cpp b/Modules/QtWidgetsExt/src/QmitkCorrespondingPointSetsModel.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkCorrespondingPointSetsModel.cpp rename to Modules/QtWidgetsExt/src/QmitkCorrespondingPointSetsModel.cpp diff --git a/Modules/QtWidgetsExt/QmitkCorrespondingPointSetsView.cpp b/Modules/QtWidgetsExt/src/QmitkCorrespondingPointSetsView.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkCorrespondingPointSetsView.cpp rename to Modules/QtWidgetsExt/src/QmitkCorrespondingPointSetsView.cpp diff --git a/Modules/QtWidgetsExt/QmitkCorrespondingPointSetsWidget.cpp b/Modules/QtWidgetsExt/src/QmitkCorrespondingPointSetsWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkCorrespondingPointSetsWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkCorrespondingPointSetsWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkCrossWidget.cpp b/Modules/QtWidgetsExt/src/QmitkCrossWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkCrossWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkCrossWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkEditPointDialog.cpp b/Modules/QtWidgetsExt/src/QmitkEditPointDialog.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkEditPointDialog.cpp rename to Modules/QtWidgetsExt/src/QmitkEditPointDialog.cpp diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkEnumerationPropertyWidget.cpp b/Modules/QtWidgetsExt/src/QmitkEnumerationPropertyWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkEnumerationPropertyWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkEnumerationPropertyWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkFileChooser.cpp b/Modules/QtWidgetsExt/src/QmitkFileChooser.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkFileChooser.cpp rename to Modules/QtWidgetsExt/src/QmitkFileChooser.cpp diff --git a/Modules/QtWidgetsExt/QmitkFunctionalityComponentContainer.cpp b/Modules/QtWidgetsExt/src/QmitkFunctionalityComponentContainer.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkFunctionalityComponentContainer.cpp rename to Modules/QtWidgetsExt/src/QmitkFunctionalityComponentContainer.cpp diff --git a/Modules/QtWidgetsExt/QmitkGnuplotWidget.cpp b/Modules/QtWidgetsExt/src/QmitkGnuplotWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkGnuplotWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkGnuplotWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkGnuplotWidget.ui b/Modules/QtWidgetsExt/src/QmitkGnuplotWidget.ui similarity index 100% rename from Modules/QtWidgetsExt/QmitkGnuplotWidget.ui rename to Modules/QtWidgetsExt/src/QmitkGnuplotWidget.ui diff --git a/Modules/QtWidgetsExt/QmitkHistogram.cpp b/Modules/QtWidgetsExt/src/QmitkHistogram.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkHistogram.cpp rename to Modules/QtWidgetsExt/src/QmitkHistogram.cpp diff --git a/Modules/QtWidgetsExt/QmitkHistogramJSWidget.cpp b/Modules/QtWidgetsExt/src/QmitkHistogramJSWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkHistogramJSWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkHistogramJSWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkHistogramWidget.cpp b/Modules/QtWidgetsExt/src/QmitkHistogramWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkHistogramWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkHistogramWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkHotkeyLineEdit.cpp b/Modules/QtWidgetsExt/src/QmitkHotkeyLineEdit.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkHotkeyLineEdit.cpp rename to Modules/QtWidgetsExt/src/QmitkHotkeyLineEdit.cpp diff --git a/Modules/QtWidgetsExt/QmitkModuleTableModel.cpp b/Modules/QtWidgetsExt/src/QmitkModuleTableModel.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkModuleTableModel.cpp rename to Modules/QtWidgetsExt/src/QmitkModuleTableModel.cpp diff --git a/Modules/QtWidgetsExt/QmitkModulesDialog.cpp b/Modules/QtWidgetsExt/src/QmitkModulesDialog.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkModulesDialog.cpp rename to Modules/QtWidgetsExt/src/QmitkModulesDialog.cpp diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkNumberPropertyEditor.cpp b/Modules/QtWidgetsExt/src/QmitkNumberPropertyEditor.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkNumberPropertyEditor.cpp rename to Modules/QtWidgetsExt/src/QmitkNumberPropertyEditor.cpp diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkNumberPropertySlider.cpp b/Modules/QtWidgetsExt/src/QmitkNumberPropertySlider.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkNumberPropertySlider.cpp rename to Modules/QtWidgetsExt/src/QmitkNumberPropertySlider.cpp diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkNumberPropertyView.cpp b/Modules/QtWidgetsExt/src/QmitkNumberPropertyView.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkNumberPropertyView.cpp rename to Modules/QtWidgetsExt/src/QmitkNumberPropertyView.cpp diff --git a/Modules/QtWidgetsExt/QmitkPiecewiseFunctionCanvas.cpp b/Modules/QtWidgetsExt/src/QmitkPiecewiseFunctionCanvas.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPiecewiseFunctionCanvas.cpp rename to Modules/QtWidgetsExt/src/QmitkPiecewiseFunctionCanvas.cpp diff --git a/Modules/QtWidgetsExt/QmitkPlotDialog.cpp b/Modules/QtWidgetsExt/src/QmitkPlotDialog.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPlotDialog.cpp rename to Modules/QtWidgetsExt/src/QmitkPlotDialog.cpp diff --git a/Modules/QtWidgetsExt/QmitkPlotWidget.cpp b/Modules/QtWidgetsExt/src/QmitkPlotWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPlotWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkPlotWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkPointListModel.cpp b/Modules/QtWidgetsExt/src/QmitkPointListModel.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPointListModel.cpp rename to Modules/QtWidgetsExt/src/QmitkPointListModel.cpp diff --git a/Modules/QtWidgetsExt/QmitkPointListView.cpp b/Modules/QtWidgetsExt/src/QmitkPointListView.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPointListView.cpp rename to Modules/QtWidgetsExt/src/QmitkPointListView.cpp diff --git a/Modules/QtWidgetsExt/QmitkPointListViewWidget.cpp b/Modules/QtWidgetsExt/src/QmitkPointListViewWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPointListViewWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkPointListViewWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkPointListWidget.cpp b/Modules/QtWidgetsExt/src/QmitkPointListWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPointListWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkPointListWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkPrimitiveMovieNavigatorWidget.cpp b/Modules/QtWidgetsExt/src/QmitkPrimitiveMovieNavigatorWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPrimitiveMovieNavigatorWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkPrimitiveMovieNavigatorWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkPrimitiveMovieNavigatorWidget.ui b/Modules/QtWidgetsExt/src/QmitkPrimitiveMovieNavigatorWidget.ui similarity index 100% rename from Modules/QtWidgetsExt/QmitkPrimitiveMovieNavigatorWidget.ui rename to Modules/QtWidgetsExt/src/QmitkPrimitiveMovieNavigatorWidget.ui diff --git a/Modules/QtWidgetsExt/QmitkPropertyListPopup.cpp b/Modules/QtWidgetsExt/src/QmitkPropertyListPopup.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyListPopup.cpp rename to Modules/QtWidgetsExt/src/QmitkPropertyListPopup.cpp diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkPropertyViewFactory.cpp b/Modules/QtWidgetsExt/src/QmitkPropertyViewFactory.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkPropertyViewFactory.cpp rename to Modules/QtWidgetsExt/src/QmitkPropertyViewFactory.cpp diff --git a/Modules/QtWidgetsExt/QmitkSelectableGLWidget.cpp b/Modules/QtWidgetsExt/src/QmitkSelectableGLWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkSelectableGLWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkSelectableGLWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkSelectableGLWidget.ui b/Modules/QtWidgetsExt/src/QmitkSelectableGLWidget.ui similarity index 100% rename from Modules/QtWidgetsExt/QmitkSelectableGLWidget.ui rename to Modules/QtWidgetsExt/src/QmitkSelectableGLWidget.ui diff --git a/Modules/QtWidgetsExt/QmitkSliceWidget.cpp b/Modules/QtWidgetsExt/src/QmitkSliceWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkSliceWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkSliceWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkSliceWidget.ui b/Modules/QtWidgetsExt/src/QmitkSliceWidget.ui similarity index 100% rename from Modules/QtWidgetsExt/QmitkSliceWidget.ui rename to Modules/QtWidgetsExt/src/QmitkSliceWidget.ui diff --git a/Modules/QtWidgetsExt/QmitkSliderNavigator.ui b/Modules/QtWidgetsExt/src/QmitkSliderNavigator.ui similarity index 100% rename from Modules/QtWidgetsExt/QmitkSliderNavigator.ui rename to Modules/QtWidgetsExt/src/QmitkSliderNavigator.ui diff --git a/Modules/QtWidgetsExt/QmitkSliderNavigatorWidget.cpp b/Modules/QtWidgetsExt/src/QmitkSliderNavigatorWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkSliderNavigatorWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkSliderNavigatorWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkStandardViews.cpp b/Modules/QtWidgetsExt/src/QmitkStandardViews.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkStandardViews.cpp rename to Modules/QtWidgetsExt/src/QmitkStandardViews.cpp diff --git a/Modules/QtWidgetsExt/QmitkStepperAdapter.cpp b/Modules/QtWidgetsExt/src/QmitkStepperAdapter.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkStepperAdapter.cpp rename to Modules/QtWidgetsExt/src/QmitkStepperAdapter.cpp diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkStringPropertyEditor.cpp b/Modules/QtWidgetsExt/src/QmitkStringPropertyEditor.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkStringPropertyEditor.cpp rename to Modules/QtWidgetsExt/src/QmitkStringPropertyEditor.cpp diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.cpp b/Modules/QtWidgetsExt/src/QmitkStringPropertyOnDemandEdit.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.cpp rename to Modules/QtWidgetsExt/src/QmitkStringPropertyOnDemandEdit.cpp diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkStringPropertyView.cpp b/Modules/QtWidgetsExt/src/QmitkStringPropertyView.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkStringPropertyView.cpp rename to Modules/QtWidgetsExt/src/QmitkStringPropertyView.cpp diff --git a/Modules/QtWidgetsExt/QmitkTransferFunctionCanvas.cpp b/Modules/QtWidgetsExt/src/QmitkTransferFunctionCanvas.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkTransferFunctionCanvas.cpp rename to Modules/QtWidgetsExt/src/QmitkTransferFunctionCanvas.cpp diff --git a/Modules/QtWidgetsExt/QmitkTransferFunctionGeneratorWidget.cpp b/Modules/QtWidgetsExt/src/QmitkTransferFunctionGeneratorWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkTransferFunctionGeneratorWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkTransferFunctionGeneratorWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkTransferFunctionGeneratorWidget.ui b/Modules/QtWidgetsExt/src/QmitkTransferFunctionGeneratorWidget.ui similarity index 100% rename from Modules/QtWidgetsExt/QmitkTransferFunctionGeneratorWidget.ui rename to Modules/QtWidgetsExt/src/QmitkTransferFunctionGeneratorWidget.ui diff --git a/Modules/QtWidgetsExt/QmitkTransferFunctionWidget.cpp b/Modules/QtWidgetsExt/src/QmitkTransferFunctionWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkTransferFunctionWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkTransferFunctionWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkTransferFunctionWidget.ui b/Modules/QtWidgetsExt/src/QmitkTransferFunctionWidget.ui similarity index 100% rename from Modules/QtWidgetsExt/QmitkTransferFunctionWidget.ui rename to Modules/QtWidgetsExt/src/QmitkTransferFunctionWidget.ui diff --git a/Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.cpp b/Modules/QtWidgetsExt/src/QmitkUGCombinedRepresentationPropertyWidget.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.cpp rename to Modules/QtWidgetsExt/src/QmitkUGCombinedRepresentationPropertyWidget.cpp diff --git a/Modules/QtWidgetsExt/QmitkVideoBackground.cpp b/Modules/QtWidgetsExt/src/QmitkVideoBackground.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkVideoBackground.cpp rename to Modules/QtWidgetsExt/src/QmitkVideoBackground.cpp diff --git a/Modules/QtWidgetsExt/QmitkWebPage.cpp b/Modules/QtWidgetsExt/src/QmitkWebPage.cpp similarity index 100% rename from Modules/QtWidgetsExt/QmitkWebPage.cpp rename to Modules/QtWidgetsExt/src/QmitkWebPage.cpp diff --git a/Modules/QtWidgetsExt/QtWidgetsExtRegisterClasses.cpp b/Modules/QtWidgetsExt/src/QtWidgetsExtRegisterClasses.cpp similarity index 100% rename from Modules/QtWidgetsExt/QtWidgetsExtRegisterClasses.cpp rename to Modules/QtWidgetsExt/src/QtWidgetsExtRegisterClasses.cpp diff --git a/Modules/QtWidgetsExt/qclickablelabel.cpp b/Modules/QtWidgetsExt/src/qclickablelabel.cpp similarity index 100% rename from Modules/QtWidgetsExt/qclickablelabel.cpp rename to Modules/QtWidgetsExt/src/qclickablelabel.cpp diff --git a/Modules/SceneSerialization/CMakeLists.txt b/Modules/SceneSerialization/CMakeLists.txt index 375c6bd3c7..d272a20950 100644 --- a/Modules/SceneSerialization/CMakeLists.txt +++ b/Modules/SceneSerialization/CMakeLists.txt @@ -1,8 +1,8 @@ MITK_CREATE_MODULE( INCLUDE_DIRS BaseDataSerializer DEPENDS MitkSceneSerializationBase PACKAGE_DEPENDS PUBLIC Poco|Zip WARNINGS_AS_ERRORS ) -add_subdirectory(Testing) +add_subdirectory(test) diff --git a/Modules/SceneSerialization/files.cmake b/Modules/SceneSerialization/files.cmake index df4684987f..c8477eaa56 100644 --- a/Modules/SceneSerialization/files.cmake +++ b/Modules/SceneSerialization/files.cmake @@ -1,8 +1,13 @@ -# Do not glob files in the Testing directory -file(GLOB SRCS - *.cpp - BaseDataSerializer/*.cpp - ) +file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*") -set(CPP_FILES ${SRCS}) +set(CPP_FILES + mitkImageSerializer.cpp + mitkPointSetSerializer.cpp + mitkPropertyListDeserializer.cpp + mitkPropertyListDeserializerV1.cpp + mitkSceneIO.cpp + mitkSceneReader.cpp + mitkSceneReaderV1.cpp + mitkSurfaceSerializer.cpp +) diff --git a/Modules/SceneSerialization/mitkSceneIO.h b/Modules/SceneSerialization/include/mitkSceneIO.h similarity index 100% rename from Modules/SceneSerialization/mitkSceneIO.h rename to Modules/SceneSerialization/include/mitkSceneIO.h diff --git a/Modules/SceneSerialization/mitkSceneReader.h b/Modules/SceneSerialization/include/mitkSceneReader.h similarity index 100% rename from Modules/SceneSerialization/mitkSceneReader.h rename to Modules/SceneSerialization/include/mitkSceneReader.h diff --git a/Modules/SceneSerialization/BaseDataSerializer/mitkImageSerializer.cpp b/Modules/SceneSerialization/src/mitkImageSerializer.cpp similarity index 100% rename from Modules/SceneSerialization/BaseDataSerializer/mitkImageSerializer.cpp rename to Modules/SceneSerialization/src/mitkImageSerializer.cpp diff --git a/Modules/SceneSerialization/BaseDataSerializer/mitkImageSerializer.h b/Modules/SceneSerialization/src/mitkImageSerializer.h similarity index 88% rename from Modules/SceneSerialization/BaseDataSerializer/mitkImageSerializer.h rename to Modules/SceneSerialization/src/mitkImageSerializer.h index 6b5eeec778..1f2aa85414 100644 --- a/Modules/SceneSerialization/BaseDataSerializer/mitkImageSerializer.h +++ b/Modules/SceneSerialization/src/mitkImageSerializer.h @@ -1,49 +1,47 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef mitkImageSerializer_h_included #define mitkImageSerializer_h_included -#include - #include "mitkBaseDataSerializer.h" namespace mitk { /** \brief Serializes mitk::Image for mitk::SceneIO */ -class MITKSCENESERIALIZATION_EXPORT ImageSerializer : public BaseDataSerializer +class ImageSerializer : public BaseDataSerializer { public: mitkClassMacro( ImageSerializer, BaseDataSerializer ); itkFactorylessNewMacro(Self) itkCloneMacro(Self) virtual std::string Serialize(); protected: ImageSerializer(); virtual ~ImageSerializer(); }; } // namespace #endif diff --git a/Modules/SceneSerialization/BaseDataSerializer/mitkPointSetSerializer.cpp b/Modules/SceneSerialization/src/mitkPointSetSerializer.cpp similarity index 100% rename from Modules/SceneSerialization/BaseDataSerializer/mitkPointSetSerializer.cpp rename to Modules/SceneSerialization/src/mitkPointSetSerializer.cpp diff --git a/Modules/SceneSerialization/BaseDataSerializer/mitkPointSetSerializer.h b/Modules/SceneSerialization/src/mitkPointSetSerializer.h similarity index 88% rename from Modules/SceneSerialization/BaseDataSerializer/mitkPointSetSerializer.h rename to Modules/SceneSerialization/src/mitkPointSetSerializer.h index 1013a1be25..3575bb22fc 100644 --- a/Modules/SceneSerialization/BaseDataSerializer/mitkPointSetSerializer.h +++ b/Modules/SceneSerialization/src/mitkPointSetSerializer.h @@ -1,40 +1,39 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef mitkPointSetSerializer_h_included #define mitkPointSetSerializer_h_included -#include #include "mitkBaseDataSerializer.h" namespace mitk { /** \brief Serializes mitk::Surface for mitk::SceneIO */ -class MITKSCENESERIALIZATION_EXPORT PointSetSerializer : public BaseDataSerializer +class PointSetSerializer : public BaseDataSerializer { public: mitkClassMacro( PointSetSerializer, BaseDataSerializer ); itkFactorylessNewMacro(Self) itkCloneMacro(Self) virtual std::string Serialize(); protected: PointSetSerializer(); virtual ~PointSetSerializer(); }; } // namespace #endif diff --git a/Modules/SceneSerialization/mitkPropertyListDeserializer.cpp b/Modules/SceneSerialization/src/mitkPropertyListDeserializer.cpp similarity index 100% rename from Modules/SceneSerialization/mitkPropertyListDeserializer.cpp rename to Modules/SceneSerialization/src/mitkPropertyListDeserializer.cpp diff --git a/Modules/SceneSerialization/mitkPropertyListDeserializer.h b/Modules/SceneSerialization/src/mitkPropertyListDeserializer.h similarity index 91% rename from Modules/SceneSerialization/mitkPropertyListDeserializer.h rename to Modules/SceneSerialization/src/mitkPropertyListDeserializer.h index 99c576428b..7f0accac97 100644 --- a/Modules/SceneSerialization/mitkPropertyListDeserializer.h +++ b/Modules/SceneSerialization/src/mitkPropertyListDeserializer.h @@ -1,61 +1,59 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef mitkPropertyListDeserializer_h_included #define mitkPropertyListDeserializer_h_included -#include - #include "mitkPropertyList.h" namespace mitk { /** \brief Deserializes a mitk::PropertyList */ -class MITKSCENESERIALIZATION_EXPORT PropertyListDeserializer : public itk::Object +class PropertyListDeserializer : public itk::Object { public: mitkClassMacro( PropertyListDeserializer, itk::Object ); itkFactorylessNewMacro(Self) // is this needed? should never be instantiated, only subclasses should itkCloneMacro(Self) itkSetStringMacro(Filename); itkGetStringMacro(Filename); /** \brief Reads a propertylist from file \return success of deserialization */ virtual bool Deserialize(); virtual PropertyList::Pointer GetOutput(); protected: PropertyListDeserializer(); virtual ~PropertyListDeserializer(); std::string m_Filename; PropertyList::Pointer m_PropertyList; }; } // namespace #endif diff --git a/Modules/SceneSerialization/mitkPropertyListDeserializerV1.cpp b/Modules/SceneSerialization/src/mitkPropertyListDeserializerV1.cpp similarity index 100% rename from Modules/SceneSerialization/mitkPropertyListDeserializerV1.cpp rename to Modules/SceneSerialization/src/mitkPropertyListDeserializerV1.cpp diff --git a/Modules/SceneSerialization/mitkPropertyListDeserializerV1.h b/Modules/SceneSerialization/src/mitkPropertyListDeserializerV1.h similarity index 92% rename from Modules/SceneSerialization/mitkPropertyListDeserializerV1.h rename to Modules/SceneSerialization/src/mitkPropertyListDeserializerV1.h index e130f0b5cb..da6030d10d 100644 --- a/Modules/SceneSerialization/mitkPropertyListDeserializerV1.h +++ b/Modules/SceneSerialization/src/mitkPropertyListDeserializerV1.h @@ -1,51 +1,51 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef mitkPropertyListDeserializerV1_h_included #define mitkPropertyListDeserializerV1_h_included #include "mitkPropertyListDeserializer.h" namespace mitk { /** \brief Deserializes a mitk::PropertyList */ -class MITKSCENESERIALIZATION_EXPORT PropertyListDeserializerV1 : public PropertyListDeserializer +class PropertyListDeserializerV1 : public PropertyListDeserializer { public: mitkClassMacro( PropertyListDeserializerV1, PropertyListDeserializer ); itkFactorylessNewMacro(Self) // is this needed? should never be instantiated, only subclasses should itkCloneMacro(Self) /** \brief Reads a propertylist from file. Get result via GetOutput() \return success of deserialization */ virtual bool Deserialize(); protected: PropertyListDeserializerV1(); virtual ~PropertyListDeserializerV1(); }; } // namespace #endif diff --git a/Modules/SceneSerialization/mitkSceneIO.cpp b/Modules/SceneSerialization/src/mitkSceneIO.cpp similarity index 100% rename from Modules/SceneSerialization/mitkSceneIO.cpp rename to Modules/SceneSerialization/src/mitkSceneIO.cpp diff --git a/Modules/SceneSerialization/mitkSceneReader.cpp b/Modules/SceneSerialization/src/mitkSceneReader.cpp similarity index 100% rename from Modules/SceneSerialization/mitkSceneReader.cpp rename to Modules/SceneSerialization/src/mitkSceneReader.cpp diff --git a/Modules/SceneSerialization/mitkSceneReaderV1.cpp b/Modules/SceneSerialization/src/mitkSceneReaderV1.cpp similarity index 100% rename from Modules/SceneSerialization/mitkSceneReaderV1.cpp rename to Modules/SceneSerialization/src/mitkSceneReaderV1.cpp diff --git a/Modules/SceneSerialization/mitkSceneReaderV1.h b/Modules/SceneSerialization/src/mitkSceneReaderV1.h similarity index 100% rename from Modules/SceneSerialization/mitkSceneReaderV1.h rename to Modules/SceneSerialization/src/mitkSceneReaderV1.h diff --git a/Modules/SceneSerialization/BaseDataSerializer/mitkSurfaceSerializer.cpp b/Modules/SceneSerialization/src/mitkSurfaceSerializer.cpp similarity index 100% rename from Modules/SceneSerialization/BaseDataSerializer/mitkSurfaceSerializer.cpp rename to Modules/SceneSerialization/src/mitkSurfaceSerializer.cpp diff --git a/Modules/SceneSerialization/BaseDataSerializer/mitkSurfaceSerializer.h b/Modules/SceneSerialization/src/mitkSurfaceSerializer.h similarity index 88% rename from Modules/SceneSerialization/BaseDataSerializer/mitkSurfaceSerializer.h rename to Modules/SceneSerialization/src/mitkSurfaceSerializer.h index 1b03060a2f..f565c0640c 100644 --- a/Modules/SceneSerialization/BaseDataSerializer/mitkSurfaceSerializer.h +++ b/Modules/SceneSerialization/src/mitkSurfaceSerializer.h @@ -1,49 +1,47 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef mitkSurfaceSerializer_h_included #define mitkSurfaceSerializer_h_included -#include - #include "mitkBaseDataSerializer.h" namespace mitk { /** \brief Serializes mitk::Surface for mitk::SceneIO */ -class MITKSCENESERIALIZATION_EXPORT SurfaceSerializer : public BaseDataSerializer +class SurfaceSerializer : public BaseDataSerializer { public: mitkClassMacro( SurfaceSerializer, BaseDataSerializer ); itkFactorylessNewMacro(Self) itkCloneMacro(Self) virtual std::string Serialize(); protected: SurfaceSerializer(); virtual ~SurfaceSerializer(); }; } // namespace #endif diff --git a/Modules/SceneSerialization/Testing/CMakeLists.txt b/Modules/SceneSerialization/test/CMakeLists.txt similarity index 100% rename from Modules/SceneSerialization/Testing/CMakeLists.txt rename to Modules/SceneSerialization/test/CMakeLists.txt diff --git a/Modules/SceneSerialization/Testing/files.cmake b/Modules/SceneSerialization/test/files.cmake similarity index 100% rename from Modules/SceneSerialization/Testing/files.cmake rename to Modules/SceneSerialization/test/files.cmake diff --git a/Modules/SceneSerialization/Testing/mitkSceneIOTest.cpp b/Modules/SceneSerialization/test/mitkSceneIOTest.cpp similarity index 100% rename from Modules/SceneSerialization/Testing/mitkSceneIOTest.cpp rename to Modules/SceneSerialization/test/mitkSceneIOTest.cpp diff --git a/Modules/SceneSerializationBase/CMakeLists.txt b/Modules/SceneSerializationBase/CMakeLists.txt index c158b59f88..bd2755cbd3 100644 --- a/Modules/SceneSerializationBase/CMakeLists.txt +++ b/Modules/SceneSerializationBase/CMakeLists.txt @@ -1,8 +1,8 @@ MITK_CREATE_MODULE( INCLUDE_DIRS PUBLIC BasePropertySerializer DEPENDS MitkCore PACKAGE_DEPENDS PUBLIC tinyxml WARNINGS_AS_ERRORS ) -add_subdirectory(Testing) +add_subdirectory(test) diff --git a/Modules/SceneSerializationBase/files.cmake b/Modules/SceneSerializationBase/files.cmake index 4312dec70a..5e34cffa7f 100644 --- a/Modules/SceneSerializationBase/files.cmake +++ b/Modules/SceneSerializationBase/files.cmake @@ -1,8 +1,32 @@ -# Do not glob files in the Testing directory -file(GLOB SRCS - *.cpp - BasePropertySerializer/*.cpp - ) +file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*") -set(CPP_FILES ${SRCS}) +set(CPP_FILES + mitkAnnotationPropertySerializer.cpp + mitkBaseDataSerializer.cpp + mitkBasePropertySerializer.cpp + mitkBoolLookupTablePropertySerializer.cpp + mitkBoolPropertySerializer.cpp + mitkClippingPropertySerializer.cpp + mitkColorPropertySerializer.cpp + mitkDoublePropertySerializer.cpp + mitkEnumerationPropertySerializer.cpp + mitkEnumerationSubclassesSerializer.cpp + mitkFloatLookupTablePropertySerializer.cpp + mitkFloatPropertySerializer.cpp + mitkGroupTagPropertySerializer.cpp + mitkIntLookupTablePropertySerializer.cpp + mitkIntPropertySerializer.cpp + mitkLevelWindowPropertySerializer.cpp + mitkLookupTablePropertySerializer.cpp + mitkPoint3dPropertySerializer.cpp + mitkPoint3iPropertySerializer.cpp + mitkPoint4dPropertySerializer.cpp + mitkPropertyListSerializer.cpp + mitkStringLookupTablePropertySerializer.cpp + mitkStringPropertySerializer.cpp + mitkTransferFunctionPropertySerializer.cpp + mitkUIntPropertySerializer.cpp + mitkUShortPropertySerializer.cpp + mitkVector3DPropertySerializer.cpp +) diff --git a/Modules/SceneSerializationBase/mitkBaseDataSerializer.h b/Modules/SceneSerializationBase/include/mitkBaseDataSerializer.h similarity index 100% rename from Modules/SceneSerializationBase/mitkBaseDataSerializer.h rename to Modules/SceneSerializationBase/include/mitkBaseDataSerializer.h diff --git a/Modules/SceneSerializationBase/mitkBasePropertySerializer.h b/Modules/SceneSerializationBase/include/mitkBasePropertySerializer.h similarity index 100% rename from Modules/SceneSerializationBase/mitkBasePropertySerializer.h rename to Modules/SceneSerializationBase/include/mitkBasePropertySerializer.h diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkEnumerationPropertySerializer.h b/Modules/SceneSerializationBase/include/mitkEnumerationPropertySerializer.h similarity index 54% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkEnumerationPropertySerializer.h rename to Modules/SceneSerializationBase/include/mitkEnumerationPropertySerializer.h index decceaea60..b49593e358 100644 --- a/Modules/SceneSerializationBase/BasePropertySerializer/mitkEnumerationPropertySerializer.h +++ b/Modules/SceneSerializationBase/include/mitkEnumerationPropertySerializer.h @@ -1,58 +1,44 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef mitkEnumerationPropertySerializer_h_included #define mitkEnumerationPropertySerializer_h_included #include "mitkBasePropertySerializer.h" #include "mitkEnumerationProperty.h" -#include - namespace mitk { -class EnumerationPropertySerializer : public BasePropertySerializer +class MITKSCENESERIALIZATIONBASE_EXPORT EnumerationPropertySerializer : public BasePropertySerializer { public: mitkClassMacro( EnumerationPropertySerializer, BasePropertySerializer ); - virtual TiXmlElement* Serialize() - { - if (const EnumerationProperty* prop = dynamic_cast(m_Property.GetPointer())) - { - TiXmlElement* element = new TiXmlElement("enum"); - element->SetAttribute("value", prop->GetValueAsString()); - return element; - } - else return NULL; - } + virtual TiXmlElement* Serialize(); protected: - EnumerationPropertySerializer() {} - virtual ~EnumerationPropertySerializer() {} + EnumerationPropertySerializer(); + virtual ~EnumerationPropertySerializer(); }; } // namespace -// important to put this into the GLOBAL namespace (because it starts with 'namespace mitk') -MITK_REGISTER_SERIALIZER(EnumerationPropertySerializer); - #endif diff --git a/Modules/SceneSerializationBase/mitkPropertyListSerializer.h b/Modules/SceneSerializationBase/include/mitkPropertyListSerializer.h similarity index 100% rename from Modules/SceneSerializationBase/mitkPropertyListSerializer.h rename to Modules/SceneSerializationBase/include/mitkPropertyListSerializer.h diff --git a/Modules/SceneSerializationBase/mitkSerializerMacros.h b/Modules/SceneSerializationBase/include/mitkSerializerMacros.h similarity index 100% rename from Modules/SceneSerializationBase/mitkSerializerMacros.h rename to Modules/SceneSerializationBase/include/mitkSerializerMacros.h diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkTransferFunctionPropertySerializer.h b/Modules/SceneSerializationBase/include/mitkTransferFunctionPropertySerializer.h similarity index 96% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkTransferFunctionPropertySerializer.h rename to Modules/SceneSerializationBase/include/mitkTransferFunctionPropertySerializer.h index 66dc0f09bf..18a19d2494 100644 --- a/Modules/SceneSerializationBase/BasePropertySerializer/mitkTransferFunctionPropertySerializer.h +++ b/Modules/SceneSerializationBase/include/mitkTransferFunctionPropertySerializer.h @@ -1,44 +1,42 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "mitkTransferFunctionProperty.h" #include "mitkBasePropertySerializer.h" -#include - namespace mitk { class MITKSCENESERIALIZATIONBASE_EXPORT TransferFunctionPropertySerializer : public BasePropertySerializer { public: mitkClassMacro( TransferFunctionPropertySerializer, BasePropertySerializer ); itkFactorylessNewMacro(Self) itkCloneMacro(Self) virtual TiXmlElement* Serialize(); virtual BaseProperty::Pointer Deserialize(TiXmlElement* element); static bool SerializeTransferFunction( const char * filename, TransferFunction::Pointer tf ); static TransferFunction::Pointer DeserializeTransferFunction( const char *filePath ); protected: TransferFunctionPropertySerializer(); virtual ~TransferFunctionPropertySerializer(); }; } // namespace diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkAnnotationPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkAnnotationPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkAnnotationPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkAnnotationPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/mitkBaseDataSerializer.cpp b/Modules/SceneSerializationBase/src/mitkBaseDataSerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/mitkBaseDataSerializer.cpp rename to Modules/SceneSerializationBase/src/mitkBaseDataSerializer.cpp diff --git a/Modules/SceneSerializationBase/mitkBasePropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkBasePropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/mitkBasePropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkBasePropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkBoolLookupTablePropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkBoolLookupTablePropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkBoolLookupTablePropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkBoolLookupTablePropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkBoolPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkBoolPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkBoolPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkBoolPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkClippingPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkClippingPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkClippingPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkClippingPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkColorPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkColorPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkColorPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkColorPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkDoublePropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkDoublePropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkDoublePropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkDoublePropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/src/mitkEnumerationPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkEnumerationPropertySerializer.cpp new file mode 100644 index 0000000000..23e0e58d16 --- /dev/null +++ b/Modules/SceneSerializationBase/src/mitkEnumerationPropertySerializer.cpp @@ -0,0 +1,43 @@ +/*=================================================================== + +The Medical Imaging Interaction Toolkit (MITK) + +Copyright (c) German Cancer Research Center, +Division of Medical and Biological Informatics. +All rights reserved. + +This software is distributed WITHOUT ANY WARRANTY; without +even the implied warranty of MERCHANTABILITY or FITNESS FOR +A PARTICULAR PURPOSE. + +See LICENSE.txt or http://www.mitk.org for details. + +===================================================================*/ + +#include "mitkEnumerationPropertySerializer.h" + +namespace mitk +{ + +TiXmlElement* EnumerationPropertySerializer::Serialize() +{ + if (const EnumerationProperty* prop = dynamic_cast(m_Property.GetPointer())) + { + TiXmlElement* element = new TiXmlElement("enum"); + element->SetAttribute("value", prop->GetValueAsString()); + return element; + } + else return NULL; +} + +EnumerationPropertySerializer::EnumerationPropertySerializer() +{} + +EnumerationPropertySerializer::~EnumerationPropertySerializer() +{} + +} // namespace + +// important to put this into the GLOBAL namespace (because it starts with 'namespace mitk') +MITK_REGISTER_SERIALIZER(EnumerationPropertySerializer); + diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkEnumerationSubclassesSerializer.cpp b/Modules/SceneSerializationBase/src/mitkEnumerationSubclassesSerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkEnumerationSubclassesSerializer.cpp rename to Modules/SceneSerializationBase/src/mitkEnumerationSubclassesSerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkFloatLookupTablePropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkFloatLookupTablePropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkFloatLookupTablePropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkFloatLookupTablePropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkFloatPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkFloatPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkFloatPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkFloatPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkGroupTagPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkGroupTagPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkGroupTagPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkGroupTagPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkIntLookupTablePropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkIntLookupTablePropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkIntLookupTablePropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkIntLookupTablePropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkIntPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkIntPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkIntPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkIntPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkLevelWindowPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkLevelWindowPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkLevelWindowPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkLevelWindowPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkLookupTablePropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkLookupTablePropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkLookupTablePropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkLookupTablePropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkPoint3dPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkPoint3dPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkPoint3dPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkPoint3dPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkPoint3iPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkPoint3iPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkPoint3iPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkPoint3iPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkPoint4dPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkPoint4dPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkPoint4dPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkPoint4dPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/mitkPropertyListSerializer.cpp b/Modules/SceneSerializationBase/src/mitkPropertyListSerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/mitkPropertyListSerializer.cpp rename to Modules/SceneSerializationBase/src/mitkPropertyListSerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkStringLookupTablePropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkStringLookupTablePropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkStringLookupTablePropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkStringLookupTablePropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkStringPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkStringPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkStringPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkStringPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkTransferFunctionPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkTransferFunctionPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkTransferFunctionPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkTransferFunctionPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkUIntPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkUIntPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkUIntPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkUIntPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkUShortPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkUShortPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkUShortPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkUShortPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/BasePropertySerializer/mitkVector3DPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkVector3DPropertySerializer.cpp similarity index 100% rename from Modules/SceneSerializationBase/BasePropertySerializer/mitkVector3DPropertySerializer.cpp rename to Modules/SceneSerializationBase/src/mitkVector3DPropertySerializer.cpp diff --git a/Modules/SceneSerializationBase/Testing/CMakeLists.txt b/Modules/SceneSerializationBase/test/CMakeLists.txt similarity index 100% rename from Modules/SceneSerializationBase/Testing/CMakeLists.txt rename to Modules/SceneSerializationBase/test/CMakeLists.txt diff --git a/Modules/SceneSerializationBase/Testing/files.cmake b/Modules/SceneSerializationBase/test/files.cmake similarity index 100% rename from Modules/SceneSerializationBase/Testing/files.cmake rename to Modules/SceneSerializationBase/test/files.cmake diff --git a/Modules/SceneSerializationBase/Testing/mitkPropertySerializationTest.cpp b/Modules/SceneSerializationBase/test/mitkPropertySerializationTest.cpp similarity index 100% rename from Modules/SceneSerializationBase/Testing/mitkPropertySerializationTest.cpp rename to Modules/SceneSerializationBase/test/mitkPropertySerializationTest.cpp diff --git a/Modules/VtkShaders/files.cmake b/Modules/VtkShaders/files.cmake index 108dba95f3..1e8df320a0 100644 --- a/Modules/VtkShaders/files.cmake +++ b/Modules/VtkShaders/files.cmake @@ -1,20 +1,13 @@ -SET(CPP_FILES +set(CPP_FILES vtkXMLMaterial.cpp vtkXMLMaterialParser.cpp vtkXMLShader.cpp mitkVtkShaderRepository.cpp mitkVtkShadersActivator.cpp mitkVtkShaderProgram.cpp ) -SET(H_FILES - vtkXMLMaterial.h - vtkXMLMaterialParser.h - vtkXMLShader.h - mitkVtkShaderRepository.h - mitkVtkShaderProgram.h -) set(RESOURCE_FILES Shaders/mitkShaderLighting.xml ) diff --git a/Modules/VtkShaders/Resources/Shaders/mitkShaderLighting.xml b/Modules/VtkShaders/resource/Shaders/mitkShaderLighting.xml similarity index 100% rename from Modules/VtkShaders/Resources/Shaders/mitkShaderLighting.xml rename to Modules/VtkShaders/resource/Shaders/mitkShaderLighting.xml diff --git a/Modules/VtkShaders/mitkVtkShaderProgram.cpp b/Modules/VtkShaders/src/mitkVtkShaderProgram.cpp similarity index 100% rename from Modules/VtkShaders/mitkVtkShaderProgram.cpp rename to Modules/VtkShaders/src/mitkVtkShaderProgram.cpp diff --git a/Modules/VtkShaders/mitkVtkShaderProgram.h b/Modules/VtkShaders/src/mitkVtkShaderProgram.h similarity index 100% rename from Modules/VtkShaders/mitkVtkShaderProgram.h rename to Modules/VtkShaders/src/mitkVtkShaderProgram.h diff --git a/Modules/VtkShaders/mitkVtkShaderRepository.cpp b/Modules/VtkShaders/src/mitkVtkShaderRepository.cpp similarity index 100% rename from Modules/VtkShaders/mitkVtkShaderRepository.cpp rename to Modules/VtkShaders/src/mitkVtkShaderRepository.cpp diff --git a/Modules/VtkShaders/mitkVtkShaderRepository.h b/Modules/VtkShaders/src/mitkVtkShaderRepository.h similarity index 100% rename from Modules/VtkShaders/mitkVtkShaderRepository.h rename to Modules/VtkShaders/src/mitkVtkShaderRepository.h diff --git a/Modules/VtkShaders/mitkVtkShadersActivator.cpp b/Modules/VtkShaders/src/mitkVtkShadersActivator.cpp similarity index 100% rename from Modules/VtkShaders/mitkVtkShadersActivator.cpp rename to Modules/VtkShaders/src/mitkVtkShadersActivator.cpp diff --git a/Modules/VtkShaders/vtkXMLMaterial.cpp b/Modules/VtkShaders/src/vtkXMLMaterial.cpp similarity index 100% rename from Modules/VtkShaders/vtkXMLMaterial.cpp rename to Modules/VtkShaders/src/vtkXMLMaterial.cpp diff --git a/Modules/VtkShaders/vtkXMLMaterial.h b/Modules/VtkShaders/src/vtkXMLMaterial.h similarity index 100% rename from Modules/VtkShaders/vtkXMLMaterial.h rename to Modules/VtkShaders/src/vtkXMLMaterial.h diff --git a/Modules/VtkShaders/vtkXMLMaterialParser.cpp b/Modules/VtkShaders/src/vtkXMLMaterialParser.cpp similarity index 100% rename from Modules/VtkShaders/vtkXMLMaterialParser.cpp rename to Modules/VtkShaders/src/vtkXMLMaterialParser.cpp diff --git a/Modules/VtkShaders/vtkXMLMaterialParser.h b/Modules/VtkShaders/src/vtkXMLMaterialParser.h similarity index 100% rename from Modules/VtkShaders/vtkXMLMaterialParser.h rename to Modules/VtkShaders/src/vtkXMLMaterialParser.h diff --git a/Modules/VtkShaders/vtkXMLShader.cpp b/Modules/VtkShaders/src/vtkXMLShader.cpp similarity index 100% rename from Modules/VtkShaders/vtkXMLShader.cpp rename to Modules/VtkShaders/src/vtkXMLShader.cpp diff --git a/Modules/VtkShaders/vtkXMLShader.h b/Modules/VtkShaders/src/vtkXMLShader.h similarity index 100% rename from Modules/VtkShaders/vtkXMLShader.h rename to Modules/VtkShaders/src/vtkXMLShader.h diff --git a/Modules/XNAT/files.cmake b/Modules/XNAT/files.cmake index 52882a49b5..766d942c9e 100644 --- a/Modules/XNAT/files.cmake +++ b/Modules/XNAT/files.cmake @@ -1,12 +1,9 @@ -SET(CPP_FILES - mitkXnatSessionTracker.cpp -) +file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*") -SET(H_FILES - mitkXnatSession.h - mitkXnatSessionTracker.h +set(CPP_FILES + mitkXnatSessionTracker.cpp ) -SET(MOC_H_FILES - mitkXnatSessionTracker.h +set(MOC_H_FILES + include/mitkXnatSessionTracker.h ) diff --git a/Modules/XNAT/mitkXnatSession.h b/Modules/XNAT/include/mitkXnatSession.h similarity index 100% rename from Modules/XNAT/mitkXnatSession.h rename to Modules/XNAT/include/mitkXnatSession.h diff --git a/Modules/XNAT/mitkXnatSessionTracker.h b/Modules/XNAT/include/mitkXnatSessionTracker.h similarity index 100% rename from Modules/XNAT/mitkXnatSessionTracker.h rename to Modules/XNAT/include/mitkXnatSessionTracker.h diff --git a/Modules/XNAT/mitkXnatSessionTracker.cpp b/Modules/XNAT/src/mitkXnatSessionTracker.cpp similarity index 100% rename from Modules/XNAT/mitkXnatSessionTracker.cpp rename to Modules/XNAT/src/mitkXnatSessionTracker.cpp diff --git a/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp index c5282cc730..51ef554bd4 100644 --- a/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp +++ b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp @@ -1,1351 +1,1351 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "QmitkExtWorkbenchWindowAdvisor.h" #include "QmitkExtActionBarAdvisor.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include // UGLYYY #include "internal/QmitkExtWorkbenchWindowAdvisorHack.h" #include "internal/QmitkCommonExtPlugin.h" #include "mitkUndoController.h" #include "mitkVerboseLimitedLinearUndo.h" #include #include #include -#include +#include QmitkExtWorkbenchWindowAdvisorHack * QmitkExtWorkbenchWindowAdvisorHack::undohack = new QmitkExtWorkbenchWindowAdvisorHack(); QString QmitkExtWorkbenchWindowAdvisor::QT_SETTINGS_FILENAME = "QtSettings.ini"; class PartListenerForTitle: public berry::IPartListener { public: PartListenerForTitle(QmitkExtWorkbenchWindowAdvisor* wa) : windowAdvisor(wa) { } Events::Types GetPartEventTypes() const { return Events::ACTIVATED | Events::BROUGHT_TO_TOP | Events::CLOSED | Events::HIDDEN | Events::VISIBLE; } void PartActivated(berry::IWorkbenchPartReference::Pointer ref) { if (ref.Cast ()) { windowAdvisor->UpdateTitle(false); } } void PartBroughtToTop(berry::IWorkbenchPartReference::Pointer ref) { if (ref.Cast ()) { windowAdvisor->UpdateTitle(false); } } void PartClosed(berry::IWorkbenchPartReference::Pointer /*ref*/) { windowAdvisor->UpdateTitle(false); } void PartHidden(berry::IWorkbenchPartReference::Pointer ref) { if (!windowAdvisor->lastActiveEditor.Expired() && ref->GetPart(false) == windowAdvisor->lastActiveEditor.Lock()) { windowAdvisor->UpdateTitle(true); } } void PartVisible(berry::IWorkbenchPartReference::Pointer ref) { if (!windowAdvisor->lastActiveEditor.Expired() && ref->GetPart(false) == windowAdvisor->lastActiveEditor.Lock()) { windowAdvisor->UpdateTitle(false); } } private: QmitkExtWorkbenchWindowAdvisor* windowAdvisor; }; class PartListenerForViewNavigator: public berry::IPartListener { public: PartListenerForViewNavigator(QAction* act) : viewNavigatorAction(act) { } Events::Types GetPartEventTypes() const { return Events::OPENED | Events::CLOSED | Events::HIDDEN | Events::VISIBLE; } void PartOpened(berry::IWorkbenchPartReference::Pointer ref) { if (ref->GetId()=="org.mitk.views.viewnavigatorview") { viewNavigatorAction->setChecked(true); } } void PartClosed(berry::IWorkbenchPartReference::Pointer ref) { if (ref->GetId()=="org.mitk.views.viewnavigatorview") { viewNavigatorAction->setChecked(false); } } void PartVisible(berry::IWorkbenchPartReference::Pointer ref) { if (ref->GetId()=="org.mitk.views.viewnavigatorview") { viewNavigatorAction->setChecked(true); } } void PartHidden(berry::IWorkbenchPartReference::Pointer ref) { if (ref->GetId()=="org.mitk.views.viewnavigatorview") { viewNavigatorAction->setChecked(false); } } private: QAction* viewNavigatorAction; }; class PartListenerForImageNavigator: public berry::IPartListener { public: PartListenerForImageNavigator(QAction* act) : imageNavigatorAction(act) { } Events::Types GetPartEventTypes() const { return Events::OPENED | Events::CLOSED | Events::HIDDEN | Events::VISIBLE; } void PartOpened(berry::IWorkbenchPartReference::Pointer ref) { if (ref->GetId()=="org.mitk.views.imagenavigator") { imageNavigatorAction->setChecked(true); } } void PartClosed(berry::IWorkbenchPartReference::Pointer ref) { if (ref->GetId()=="org.mitk.views.imagenavigator") { imageNavigatorAction->setChecked(false); } } void PartVisible(berry::IWorkbenchPartReference::Pointer ref) { if (ref->GetId()=="org.mitk.views.imagenavigator") { imageNavigatorAction->setChecked(true); } } void PartHidden(berry::IWorkbenchPartReference::Pointer ref) { if (ref->GetId()=="org.mitk.views.imagenavigator") { imageNavigatorAction->setChecked(false); } } private: QAction* imageNavigatorAction; }; class PerspectiveListenerForTitle: public berry::IPerspectiveListener { public: PerspectiveListenerForTitle(QmitkExtWorkbenchWindowAdvisor* wa) : windowAdvisor(wa), perspectivesClosed(false) { } Events::Types GetPerspectiveEventTypes() const { return Events::ACTIVATED | Events::SAVED_AS | Events::DEACTIVATED // remove the following line when command framework is finished | Events::CLOSED | Events::OPENED; } void PerspectiveActivated(berry::IWorkbenchPage::Pointer /*page*/, berry::IPerspectiveDescriptor::Pointer /*perspective*/) { windowAdvisor->UpdateTitle(false); } void PerspectiveSavedAs(berry::IWorkbenchPage::Pointer /*page*/, berry::IPerspectiveDescriptor::Pointer /*oldPerspective*/, berry::IPerspectiveDescriptor::Pointer /*newPerspective*/) { windowAdvisor->UpdateTitle(false); } void PerspectiveDeactivated(berry::IWorkbenchPage::Pointer /*page*/, berry::IPerspectiveDescriptor::Pointer /*perspective*/) { windowAdvisor->UpdateTitle(false); } void PerspectiveOpened(berry::IWorkbenchPage::Pointer /*page*/, berry::IPerspectiveDescriptor::Pointer /*perspective*/) { if (perspectivesClosed) { QListIterator i(windowAdvisor->viewActions); while (i.hasNext()) { i.next()->setEnabled(true); } //GetViewRegistry()->Find("org.mitk.views.imagenavigator"); if(windowAdvisor->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.dicomeditor")) { windowAdvisor->openDicomEditorAction->setEnabled(true); } if(windowAdvisor->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.xnat.browser")) { windowAdvisor->openXnatEditorAction->setEnabled(true); } windowAdvisor->fileSaveProjectAction->setEnabled(true); windowAdvisor->closeProjectAction->setEnabled(true); windowAdvisor->undoAction->setEnabled(true); windowAdvisor->redoAction->setEnabled(true); windowAdvisor->imageNavigatorAction->setEnabled(true); windowAdvisor->viewNavigatorAction->setEnabled(true); windowAdvisor->resetPerspAction->setEnabled(true); if( windowAdvisor->GetShowClosePerspectiveMenuItem() ) { windowAdvisor->closePerspAction->setEnabled(true); } } perspectivesClosed = false; } void PerspectiveClosed(berry::IWorkbenchPage::Pointer /*page*/, berry::IPerspectiveDescriptor::Pointer /*perspective*/) { berry::IWorkbenchWindow::Pointer wnd = windowAdvisor->GetWindowConfigurer()->GetWindow(); bool allClosed = true; if (wnd->GetActivePage()) { std::vector perspectives(wnd->GetActivePage()->GetOpenPerspectives()); allClosed = perspectives.empty(); } if (allClosed) { perspectivesClosed = true; QListIterator i(windowAdvisor->viewActions); while (i.hasNext()) { i.next()->setEnabled(false); } if(windowAdvisor->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.dicomeditor")) { windowAdvisor->openDicomEditorAction->setEnabled(false); } if(windowAdvisor->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.xnat.browser")) { windowAdvisor->openXnatEditorAction->setEnabled(false); } windowAdvisor->fileSaveProjectAction->setEnabled(false); windowAdvisor->closeProjectAction->setEnabled(false); windowAdvisor->undoAction->setEnabled(false); windowAdvisor->redoAction->setEnabled(false); windowAdvisor->imageNavigatorAction->setEnabled(false); windowAdvisor->viewNavigatorAction->setEnabled(false); windowAdvisor->resetPerspAction->setEnabled(false); if( windowAdvisor->GetShowClosePerspectiveMenuItem() ) { windowAdvisor->closePerspAction->setEnabled(false); } } } private: QmitkExtWorkbenchWindowAdvisor* windowAdvisor; bool perspectivesClosed; }; class PerspectiveListenerForMenu: public berry::IPerspectiveListener { public: PerspectiveListenerForMenu(QmitkExtWorkbenchWindowAdvisor* wa) : windowAdvisor(wa) { } Events::Types GetPerspectiveEventTypes() const { return Events::ACTIVATED | Events::DEACTIVATED; } void PerspectiveActivated(berry::IWorkbenchPage::Pointer /*page*/, berry::IPerspectiveDescriptor::Pointer perspective) { QAction* action = windowAdvisor->mapPerspIdToAction[perspective->GetId()]; if (action) { action->setChecked(true); } } void PerspectiveDeactivated(berry::IWorkbenchPage::Pointer /*page*/, berry::IPerspectiveDescriptor::Pointer perspective) { QAction* action = windowAdvisor->mapPerspIdToAction[perspective->GetId()]; if (action) { action->setChecked(false); } } private: QmitkExtWorkbenchWindowAdvisor* windowAdvisor; }; QmitkExtWorkbenchWindowAdvisor::QmitkExtWorkbenchWindowAdvisor(berry::WorkbenchAdvisor* wbAdvisor, berry::IWorkbenchWindowConfigurer::Pointer configurer) : berry::WorkbenchWindowAdvisor(configurer), lastInput(0), wbAdvisor(wbAdvisor), showViewToolbar(true), showPerspectiveToolbar(false), showVersionInfo(true), showMitkVersionInfo(true), showViewMenuItem(true), showNewWindowMenuItem(false), showClosePerspectiveMenuItem(true), viewNavigatorFound(false), showMemoryIndicator(true), dropTargetListener(new QmitkDefaultDropTargetListener) { productName = QCoreApplication::applicationName().toStdString(); viewExcludeList.push_back("org.mitk.views.viewnavigatorview"); } berry::ActionBarAdvisor::Pointer QmitkExtWorkbenchWindowAdvisor::CreateActionBarAdvisor( berry::IActionBarConfigurer::Pointer configurer) { berry::ActionBarAdvisor::Pointer actionBarAdvisor( new QmitkExtActionBarAdvisor(configurer)); return actionBarAdvisor; } void* QmitkExtWorkbenchWindowAdvisor::CreateEmptyWindowContents(void* parent) { QWidget* parentWidget = static_cast(parent); QLabel* label = new QLabel(parentWidget); label->setText("No perspectives are open. Open a perspective in the Window->Open Perspective menu."); label->setContentsMargins(10,10,10,10); label->setAlignment(Qt::AlignTop); label->setEnabled(false); parentWidget->layout()->addWidget(label); return label; } void QmitkExtWorkbenchWindowAdvisor::ShowClosePerspectiveMenuItem(bool show) { showClosePerspectiveMenuItem = show; } bool QmitkExtWorkbenchWindowAdvisor::GetShowClosePerspectiveMenuItem() { return showClosePerspectiveMenuItem; } void QmitkExtWorkbenchWindowAdvisor::ShowMemoryIndicator(bool show) { showMemoryIndicator = show; } bool QmitkExtWorkbenchWindowAdvisor::GetShowMemoryIndicator() { return showMemoryIndicator; } void QmitkExtWorkbenchWindowAdvisor::ShowNewWindowMenuItem(bool show) { showNewWindowMenuItem = show; } void QmitkExtWorkbenchWindowAdvisor::ShowViewToolbar(bool show) { showViewToolbar = show; } void QmitkExtWorkbenchWindowAdvisor::ShowViewMenuItem(bool show) { showViewMenuItem = show; } void QmitkExtWorkbenchWindowAdvisor::ShowPerspectiveToolbar(bool show) { showPerspectiveToolbar = show; } void QmitkExtWorkbenchWindowAdvisor::ShowVersionInfo(bool show) { showVersionInfo = show; } void QmitkExtWorkbenchWindowAdvisor::ShowMitkVersionInfo(bool show) { showMitkVersionInfo = show; } void QmitkExtWorkbenchWindowAdvisor::SetProductName(const std::string& product) { productName = product; } void QmitkExtWorkbenchWindowAdvisor::SetWindowIcon(const std::string& wndIcon) { windowIcon = wndIcon; } void QmitkExtWorkbenchWindowAdvisor::PostWindowCreate() { // very bad hack... berry::IWorkbenchWindow::Pointer window = this->GetWindowConfigurer()->GetWindow(); QMainWindow* mainWindow = static_cast (window->GetShell()->GetControl()); window->SetPerspectiveExcludeList(perspectiveExcludeList); window->SetViewExcludeList(viewExcludeList); if (!windowIcon.empty()) { mainWindow->setWindowIcon(QIcon(QString::fromStdString(windowIcon))); } mainWindow->setContextMenuPolicy(Qt::PreventContextMenu); /*mainWindow->setStyleSheet("color: white;" "background-color: #808080;" "selection-color: #659EC7;" "selection-background-color: #808080;" " QMenuBar {" "background-color: #808080; }");*/ // Load selected icon theme QStringList searchPaths = QIcon::themeSearchPaths(); searchPaths.push_front( QString(":/org_mitk_icons/icons/") ); QIcon::setThemeSearchPaths( searchPaths ); berry::IPreferencesService::Pointer prefService = berry::Platform::GetServiceRegistry() .GetServiceById(berry::IPreferencesService::ID); berry::IPreferences::Pointer stylePref = prefService->GetSystemPreferences()->Node(berry::QtPreferences::QT_STYLES_NODE); QString iconTheme = QString::fromStdString(stylePref->Get(berry::QtPreferences::QT_ICON_THEME, "<>")); if( iconTheme == QString( "<>" ) ) { iconTheme = QString( "tango" ); } QIcon::setThemeName( iconTheme ); // ==== Application menu ============================ QMenuBar* menuBar = mainWindow->menuBar(); menuBar->setContextMenuPolicy(Qt::PreventContextMenu); QMenu* fileMenu = menuBar->addMenu("&File"); fileMenu->setObjectName("FileMenu"); QAction* fileOpenAction = new QmitkFileOpenAction(QIcon::fromTheme("document-open",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/document-open.svg")), window); fileOpenAction->setShortcut(QKeySequence::Open); fileMenu->addAction(fileOpenAction); QAction* fileSaveAction = new QmitkFileSaveAction(QIcon(":/org.mitk.gui.qt.ext/Save_48.png"), window); fileSaveAction->setShortcut(QKeySequence::Save); fileMenu->addAction(fileSaveAction); fileSaveProjectAction = new QmitkExtFileSaveProjectAction(window); fileSaveProjectAction->setIcon(QIcon::fromTheme("document-save",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/document-save.svg"))); fileMenu->addAction(fileSaveProjectAction); closeProjectAction = new QmitkCloseProjectAction(window); closeProjectAction->setIcon(QIcon::fromTheme("edit-delete",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/edit-delete.svg"))); fileMenu->addAction(closeProjectAction); fileMenu->addSeparator(); QAction* fileExitAction = new QmitkFileExitAction(window); fileExitAction->setIcon(QIcon::fromTheme("system-log-out",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/system-log-out.svg"))); fileExitAction->setShortcut(QKeySequence::Quit); fileExitAction->setObjectName("QmitkFileExitAction"); fileMenu->addAction(fileExitAction); if(this->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.dicomeditor")) { openDicomEditorAction = new QmitkOpenDicomEditorAction(QIcon(":/org.mitk.gui.qt.ext/dcm-icon.png"),window); } if(this->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.xnat.browser")) { openXnatEditorAction = new QmitkOpenXnatEditorAction(QIcon(":/org.mitk.gui.qt.ext/xnat-icon.png"),window); } berry::IViewRegistry* viewRegistry = berry::PlatformUI::GetWorkbench()->GetViewRegistry(); const std::vector& viewDescriptors = viewRegistry->GetViews(); // another bad hack to get an edit/undo menu... QMenu* editMenu = menuBar->addMenu("&Edit"); undoAction = editMenu->addAction(QIcon::fromTheme("edit-undo",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/edit-undo.svg")), "&Undo", QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onUndo()), QKeySequence("CTRL+Z")); undoAction->setToolTip("Undo the last action (not supported by all modules)"); redoAction = editMenu->addAction(QIcon::fromTheme("edit-redo",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/edit-redo.svg")) , "&Redo", QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onRedo()), QKeySequence("CTRL+Y")); redoAction->setToolTip("execute the last action that was undone again (not supported by all modules)"); imageNavigatorAction = new QAction(QIcon(":/org.mitk.gui.qt.ext/Slider.png"), "&Image Navigator", NULL); bool imageNavigatorViewFound = window->GetWorkbench()->GetViewRegistry()->Find("org.mitk.views.imagenavigator"); if (imageNavigatorViewFound) { QObject::connect(imageNavigatorAction, SIGNAL(triggered(bool)), QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onImageNavigator())); imageNavigatorAction->setCheckable(true); // add part listener for image navigator imageNavigatorPartListener = new PartListenerForImageNavigator(imageNavigatorAction); window->GetPartService()->AddPartListener(imageNavigatorPartListener); berry::IViewPart::Pointer imageNavigatorView = window->GetActivePage()->FindView("org.mitk.views.imagenavigator"); imageNavigatorAction->setChecked(false); if (imageNavigatorView) { bool isImageNavigatorVisible = window->GetActivePage()->IsPartVisible(imageNavigatorView); if (isImageNavigatorVisible) imageNavigatorAction->setChecked(true); } imageNavigatorAction->setToolTip("Toggle image navigator for navigating through image"); } viewNavigatorAction = new QAction(QIcon(":/org.mitk.gui.qt.ext/view-manager_48.png"),"&View Navigator", NULL); viewNavigatorFound = window->GetWorkbench()->GetViewRegistry()->Find("org.mitk.views.viewnavigatorview"); if (viewNavigatorFound) { QObject::connect(viewNavigatorAction, SIGNAL(triggered(bool)), QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onViewNavigator())); viewNavigatorAction->setCheckable(true); // add part listener for view navigator viewNavigatorPartListener = new PartListenerForViewNavigator(viewNavigatorAction); window->GetPartService()->AddPartListener(viewNavigatorPartListener); berry::IViewPart::Pointer viewnavigatorview = window->GetActivePage()->FindView("org.mitk.views.viewnavigatorview"); viewNavigatorAction->setChecked(false); if (viewnavigatorview) { bool isViewNavigatorVisible = window->GetActivePage()->IsPartVisible(viewnavigatorview); if (isViewNavigatorVisible) viewNavigatorAction->setChecked(true); } viewNavigatorAction->setToolTip("Toggle View Navigator"); } // toolbar for showing file open, undo, redo and other main actions QToolBar* mainActionsToolBar = new QToolBar; mainActionsToolBar->setObjectName("mainActionsToolBar"); mainActionsToolBar->setContextMenuPolicy(Qt::PreventContextMenu); #ifdef __APPLE__ mainActionsToolBar->setToolButtonStyle ( Qt::ToolButtonTextUnderIcon ); #else mainActionsToolBar->setToolButtonStyle ( Qt::ToolButtonTextBesideIcon ); #endif mainActionsToolBar->addAction(fileOpenAction); mainActionsToolBar->addAction(fileSaveProjectAction); mainActionsToolBar->addAction(closeProjectAction); mainActionsToolBar->addAction(undoAction); mainActionsToolBar->addAction(redoAction); if(this->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.dicomeditor")) { mainActionsToolBar->addAction(openDicomEditorAction); } if(this->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.xnat.browser")) { mainActionsToolBar->addAction(openXnatEditorAction); } if (imageNavigatorViewFound) { mainActionsToolBar->addAction(imageNavigatorAction); } if (viewNavigatorFound) mainActionsToolBar->addAction(viewNavigatorAction); mainWindow->addToolBar(mainActionsToolBar); #ifdef __APPLE__ #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) mainWindow->setUnifiedTitleAndToolBarOnMac(true); // default is false #endif #endif // ==== Window Menu ========================== QMenu* windowMenu = menuBar->addMenu("Window"); if (showNewWindowMenuItem) { windowMenu->addAction("&New Window", QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onNewWindow())); windowMenu->addSeparator(); } QMenu* perspMenu = windowMenu->addMenu("&Open Perspective"); QMenu* viewMenu; if (showViewMenuItem) { viewMenu = windowMenu->addMenu("Show &View"); viewMenu->setObjectName("Show View"); } windowMenu->addSeparator(); resetPerspAction = windowMenu->addAction("&Reset Perspective", QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onResetPerspective())); if(showClosePerspectiveMenuItem) closePerspAction = windowMenu->addAction("&Close Perspective", QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onClosePerspective())); windowMenu->addSeparator(); windowMenu->addAction("&Preferences...", QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onEditPreferences()), QKeySequence("CTRL+P")); // fill perspective menu berry::IPerspectiveRegistry* perspRegistry = window->GetWorkbench()->GetPerspectiveRegistry(); QActionGroup* perspGroup = new QActionGroup(menuBar); std::vector perspectives( perspRegistry->GetPerspectives()); bool skip = false; for (std::vector::iterator perspIt = perspectives.begin(); perspIt != perspectives.end(); ++perspIt) { // if perspectiveExcludeList is set, it contains the id-strings of perspectives, which // should not appear as an menu-entry in the perspective menu if (perspectiveExcludeList.size() > 0) { for (unsigned int i=0; iGetId()) { skip = true; break; } } if (skip) { skip = false; continue; } } QAction* perspAction = new berry::QtOpenPerspectiveAction(window, *perspIt, perspGroup); mapPerspIdToAction.insert(std::make_pair((*perspIt)->GetId(), perspAction)); } perspMenu->addActions(perspGroup->actions()); // sort elements (converting vector to map...) std::vector::const_iterator iter; std::map VDMap; skip = false; for (iter = viewDescriptors.begin(); iter != viewDescriptors.end(); ++iter) { // if viewExcludeList is set, it contains the id-strings of view, which // should not appear as an menu-entry in the menu if (viewExcludeList.size() > 0) { for (unsigned int i=0; iGetId()) { skip = true; break; } } if (skip) { skip = false; continue; } } if ((*iter)->GetId() == "org.blueberry.ui.internal.introview") continue; if ((*iter)->GetId() == "org.mitk.views.imagenavigator") continue; if ((*iter)->GetId() == "org.mitk.views.viewnavigatorview") continue; std::pair p( (*iter)->GetLabel(), (*iter)); VDMap.insert(p); } // ==== Perspective Toolbar ================================== QToolBar* qPerspectiveToolbar = new QToolBar; qPerspectiveToolbar->setObjectName("perspectiveToolBar"); if (showPerspectiveToolbar) { qPerspectiveToolbar->addActions(perspGroup->actions()); mainWindow->addToolBar(qPerspectiveToolbar); } else delete qPerspectiveToolbar; // ==== View Toolbar ================================== QToolBar* qToolbar = new QToolBar; qToolbar->setObjectName("viewToolBar"); std::map::const_iterator MapIter; for (MapIter = VDMap.begin(); MapIter != VDMap.end(); ++MapIter) { berry::QtShowViewAction* viewAction = new berry::QtShowViewAction(window, (*MapIter).second); viewActions.push_back(viewAction); if(showViewMenuItem) viewMenu->addAction(viewAction); if (showViewToolbar) { qToolbar->addAction(viewAction); } } if (showViewToolbar) { mainWindow->addToolBar(qToolbar); } else delete qToolbar; QSettings settings(GetQSettingsFile(), QSettings::IniFormat); mainWindow->restoreState(settings.value("ToolbarPosition").toByteArray()); // ===== Help menu ==================================== QMenu* helpMenu = menuBar->addMenu("&Help"); helpMenu->addAction("&Welcome",this, SLOT(onIntro())); helpMenu->addAction("&Open Help Perspective", this, SLOT(onHelpOpenHelpPerspective())); helpMenu->addAction("&Context Help",this, SLOT(onHelp()), QKeySequence("F1")); helpMenu->addAction("&About",this, SLOT(onAbout())); // ===================================================== QStatusBar* qStatusBar = new QStatusBar(); //creating a QmitkStatusBar for Output on the QStatusBar and connecting it with the MainStatusBar QmitkStatusBar *statusBar = new QmitkStatusBar(qStatusBar); //disabling the SizeGrip in the lower right corner statusBar->SetSizeGripEnabled(false); QmitkProgressBar *progBar = new QmitkProgressBar(); qStatusBar->addPermanentWidget(progBar, 0); progBar->hide(); // progBar->AddStepsToDo(2); // progBar->Progress(1); mainWindow->setStatusBar(qStatusBar); if (showMemoryIndicator) { QmitkMemoryUsageIndicatorView* memoryIndicator = new QmitkMemoryUsageIndicatorView(); qStatusBar->addPermanentWidget(memoryIndicator, 0); } } void QmitkExtWorkbenchWindowAdvisor::PreWindowOpen() { berry::IWorkbenchWindowConfigurer::Pointer configurer = GetWindowConfigurer(); // show the shortcut bar and progress indicator, which are hidden by // default //configurer->SetShowPerspectiveBar(true); //configurer->SetShowFastViewBars(true); //configurer->SetShowProgressIndicator(true); // // add the drag and drop support for the editor area // configurer.addEditorAreaTransfer(EditorInputTransfer.getInstance()); // configurer.addEditorAreaTransfer(ResourceTransfer.getInstance()); // configurer.addEditorAreaTransfer(FileTransfer.getInstance()); // configurer.addEditorAreaTransfer(MarkerTransfer.getInstance()); // configurer.configureEditorAreaDropListener(new EditorAreaDropAdapter( // configurer.getWindow())); this->HookTitleUpdateListeners(configurer); menuPerspectiveListener = new PerspectiveListenerForMenu(this); configurer->GetWindow()->AddPerspectiveListener(menuPerspectiveListener); configurer->AddEditorAreaTransfer(QStringList("text/uri-list")); configurer->ConfigureEditorAreaDropListener(dropTargetListener); } void QmitkExtWorkbenchWindowAdvisor::PostWindowOpen() { // Force Rendering Window Creation on startup. berry::IWorkbenchWindowConfigurer::Pointer configurer = GetWindowConfigurer(); ctkPluginContext* context = QmitkCommonExtPlugin::getContext(); ctkServiceReference serviceRef = context->getServiceReference(); if (serviceRef) { mitk::IDataStorageService *dsService = context->getService(serviceRef); if (dsService) { mitk::IDataStorageReference::Pointer dsRef = dsService->GetDataStorage(); mitk::DataStorageEditorInput::Pointer dsInput(new mitk::DataStorageEditorInput(dsRef)); mitk::WorkbenchUtil::OpenEditor(configurer->GetWindow()->GetActivePage(),dsInput); } } } void QmitkExtWorkbenchWindowAdvisor::onIntro() { QmitkExtWorkbenchWindowAdvisorHack::undohack->onIntro(); } void QmitkExtWorkbenchWindowAdvisor::onHelp() { QmitkExtWorkbenchWindowAdvisorHack::undohack->onHelp(); } void QmitkExtWorkbenchWindowAdvisor::onHelpOpenHelpPerspective() { QmitkExtWorkbenchWindowAdvisorHack::undohack->onHelpOpenHelpPerspective(); } void QmitkExtWorkbenchWindowAdvisor::onAbout() { QmitkExtWorkbenchWindowAdvisorHack::undohack->onAbout(); } //-------------------------------------------------------------------------------- // Ugly hack from here on. Feel free to delete when command framework // and undo buttons are done. //-------------------------------------------------------------------------------- QmitkExtWorkbenchWindowAdvisorHack::QmitkExtWorkbenchWindowAdvisorHack() : QObject() { } QmitkExtWorkbenchWindowAdvisorHack::~QmitkExtWorkbenchWindowAdvisorHack() { } void QmitkExtWorkbenchWindowAdvisorHack::onUndo() { mitk::UndoModel* model = mitk::UndoController::GetCurrentUndoModel(); if (model) { if (mitk::VerboseLimitedLinearUndo* verboseundo = dynamic_cast( model )) { mitk::VerboseLimitedLinearUndo::StackDescription descriptions = verboseundo->GetUndoDescriptions(); if (descriptions.size() >= 1) { MITK_INFO << "Undo " << descriptions.front().second; } } model->Undo(); } else { MITK_ERROR << "No undo model instantiated"; } } void QmitkExtWorkbenchWindowAdvisorHack::onRedo() { mitk::UndoModel* model = mitk::UndoController::GetCurrentUndoModel(); if (model) { if (mitk::VerboseLimitedLinearUndo* verboseundo = dynamic_cast( model )) { mitk::VerboseLimitedLinearUndo::StackDescription descriptions = verboseundo->GetRedoDescriptions(); if (descriptions.size() >= 1) { MITK_INFO << "Redo " << descriptions.front().second; } } model->Redo(); } else { MITK_ERROR << "No undo model instantiated"; } } void QmitkExtWorkbenchWindowAdvisorHack::onImageNavigator() { // get ImageNavigatorView berry::IViewPart::Pointer imageNavigatorView = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->FindView("org.mitk.views.imagenavigator"); if (imageNavigatorView) { bool isImageNavigatorVisible = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->IsPartVisible(imageNavigatorView); if (isImageNavigatorVisible) { berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->HideView(imageNavigatorView); return; } } berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ShowView("org.mitk.views.imagenavigator"); //berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ResetPerspective(); } void QmitkExtWorkbenchWindowAdvisorHack::onViewNavigator() { // get viewnavigatorView berry::IViewPart::Pointer viewnavigatorView = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->FindView("org.mitk.views.viewnavigatorview"); if (viewnavigatorView) { bool isviewnavigatorVisible = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->IsPartVisible(viewnavigatorView); if (isviewnavigatorVisible) { berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->HideView(viewnavigatorView); return; } } berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ShowView("org.mitk.views.viewnavigatorview"); //berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ResetPerspective(); } void QmitkExtWorkbenchWindowAdvisorHack::onEditPreferences() { QmitkPreferencesDialog _PreferencesDialog(QApplication::activeWindow()); _PreferencesDialog.exec(); } void QmitkExtWorkbenchWindowAdvisorHack::onQuit() { berry::PlatformUI::GetWorkbench()->Close(); } void QmitkExtWorkbenchWindowAdvisorHack::onResetPerspective() { berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ResetPerspective(); } void QmitkExtWorkbenchWindowAdvisorHack::onClosePerspective() { berry::IWorkbenchPage::Pointer page = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage(); page->ClosePerspective(page->GetPerspective(), true, true); } void QmitkExtWorkbenchWindowAdvisorHack::onNewWindow() { berry::PlatformUI::GetWorkbench()->OpenWorkbenchWindow(0); } void QmitkExtWorkbenchWindowAdvisorHack::onIntro() { bool hasIntro = berry::PlatformUI::GetWorkbench()->GetIntroManager()->HasIntro(); if (!hasIntro) { QRegExp reg("(.*)(\\n)*"); QRegExp reg2("(\\n)*(.*)"); QFile file(":/org.mitk.gui.qt.ext/index.html"); file.open(QIODevice::ReadOnly | QIODevice::Text); //text file only for reading QString text = QString(file.readAll()); file.close(); QString title = text; title.replace(reg, ""); title.replace(reg2, ""); std::cout << title.toStdString() << std::endl; QMessageBox::information(NULL, title, text, "Close"); } else { berry::PlatformUI::GetWorkbench()->GetIntroManager()->ShowIntro( berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow(), false); } } void QmitkExtWorkbenchWindowAdvisorHack::onHelp() { ctkPluginContext* context = QmitkCommonExtPlugin::getContext(); if (context == 0) { MITK_WARN << "Plugin context not set, unable to open context help"; return; } // Check if the org.blueberry.ui.qt.help plug-in is installed and started QList > plugins = context->getPlugins(); foreach(QSharedPointer p, plugins) { if (p->getSymbolicName() == "org.blueberry.ui.qt.help") { if (p->getState() != ctkPlugin::ACTIVE) { // try to activate the plug-in explicitly try { p->start(ctkPlugin::START_TRANSIENT); } catch (const ctkPluginException& pe) { MITK_ERROR << "Activating org.blueberry.ui.qt.help failed: " << pe.what(); return; } } } } ctkServiceReference eventAdminRef = context->getServiceReference(); ctkEventAdmin* eventAdmin = 0; if (eventAdminRef) { eventAdmin = context->getService(eventAdminRef); } if (eventAdmin == 0) { MITK_WARN << "ctkEventAdmin service not found. Unable to open context help"; } else { ctkEvent ev("org/blueberry/ui/help/CONTEXTHELP_REQUESTED"); eventAdmin->postEvent(ev); } } void QmitkExtWorkbenchWindowAdvisorHack::onHelpOpenHelpPerspective() { berry::PlatformUI::GetWorkbench()->ShowPerspective("org.blueberry.perspectives.help", berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()); } void QmitkExtWorkbenchWindowAdvisorHack::onAbout() { QmitkAboutDialog* aboutDialog = new QmitkAboutDialog(QApplication::activeWindow(),NULL); aboutDialog->open(); } void QmitkExtWorkbenchWindowAdvisor::HookTitleUpdateListeners( berry::IWorkbenchWindowConfigurer::Pointer configurer) { // hook up the listeners to update the window title titlePartListener = new PartListenerForTitle(this); titlePerspectiveListener = new PerspectiveListenerForTitle(this); editorPropertyListener = new berry::PropertyChangeIntAdapter< QmitkExtWorkbenchWindowAdvisor>(this, &QmitkExtWorkbenchWindowAdvisor::PropertyChange); // configurer.getWindow().addPageListener(new IPageListener() { // public void pageActivated(IWorkbenchPage page) { // updateTitle(false); // } // // public void pageClosed(IWorkbenchPage page) { // updateTitle(false); // } // // public void pageOpened(IWorkbenchPage page) { // // do nothing // } // }); configurer->GetWindow()->AddPerspectiveListener(titlePerspectiveListener); configurer->GetWindow()->GetPartService()->AddPartListener(titlePartListener); } std::string QmitkExtWorkbenchWindowAdvisor::ComputeTitle() { berry::IWorkbenchWindowConfigurer::Pointer configurer = GetWindowConfigurer(); berry::IWorkbenchPage::Pointer currentPage = configurer->GetWindow()->GetActivePage(); berry::IEditorPart::Pointer activeEditor; if (currentPage) { activeEditor = lastActiveEditor.Lock(); } std::string title; //TODO Product // IProduct product = Platform.getProduct(); // if (product != null) { // title = product.getName(); // } // instead of the product name, we use a custom variable for now title = productName; if(showMitkVersionInfo) { title += std::string(" ") + MITK_VERSION_STRING; } if (showVersionInfo) { // add version informatioin QString versions = QString(" (ITK %1.%2.%3 VTK %4.%5.%6 Qt %7 MITK %8)") .arg(ITK_VERSION_MAJOR).arg(ITK_VERSION_MINOR).arg(ITK_VERSION_PATCH) .arg(VTK_MAJOR_VERSION).arg(VTK_MINOR_VERSION).arg(VTK_BUILD_VERSION) .arg(QT_VERSION_STR) .arg(MITK_VERSION_STRING); title += versions.toStdString(); } if (currentPage) { if (activeEditor) { lastEditorTitle = activeEditor->GetTitleToolTip(); if (!lastEditorTitle.empty()) title = lastEditorTitle + " - " + title; } berry::IPerspectiveDescriptor::Pointer persp = currentPage->GetPerspective(); std::string label = ""; if (persp) { label = persp->GetLabel(); } berry::IAdaptable* input = currentPage->GetInput(); if (input && input != wbAdvisor->GetDefaultPageInput()) { label = currentPage->GetLabel(); } if (!label.empty()) { title = label + " - " + title; } } title += " (Not for use in diagnosis or treatment of patients)"; return title; } void QmitkExtWorkbenchWindowAdvisor::RecomputeTitle() { berry::IWorkbenchWindowConfigurer::Pointer configurer = GetWindowConfigurer(); std::string oldTitle = configurer->GetTitle(); std::string newTitle = ComputeTitle(); if (newTitle != oldTitle) { configurer->SetTitle(newTitle); } } void QmitkExtWorkbenchWindowAdvisor::UpdateTitle(bool editorHidden) { berry::IWorkbenchWindowConfigurer::Pointer configurer = GetWindowConfigurer(); berry::IWorkbenchWindow::Pointer window = configurer->GetWindow(); berry::IEditorPart::Pointer activeEditor; berry::IWorkbenchPage::Pointer currentPage = window->GetActivePage(); berry::IPerspectiveDescriptor::Pointer persp; berry::IAdaptable* input = 0; if (currentPage) { activeEditor = currentPage->GetActiveEditor(); persp = currentPage->GetPerspective(); input = currentPage->GetInput(); } if (editorHidden) { activeEditor = 0; } // Nothing to do if the editor hasn't changed if (activeEditor == lastActiveEditor.Lock() && currentPage == lastActivePage.Lock() && persp == lastPerspective.Lock() && input == lastInput) { return; } if (!lastActiveEditor.Expired()) { lastActiveEditor.Lock()->RemovePropertyListener(editorPropertyListener); } lastActiveEditor = activeEditor; lastActivePage = currentPage; lastPerspective = persp; lastInput = input; if (activeEditor) { activeEditor->AddPropertyListener(editorPropertyListener); } RecomputeTitle(); } void QmitkExtWorkbenchWindowAdvisor::PropertyChange(berry::Object::Pointer /*source*/, int propId) { if (propId == berry::IWorkbenchPartConstants::PROP_TITLE) { if (!lastActiveEditor.Expired()) { std::string newTitle = lastActiveEditor.Lock()->GetPartName(); if (lastEditorTitle != newTitle) { RecomputeTitle(); } } } } void QmitkExtWorkbenchWindowAdvisor::SetPerspectiveExcludeList(std::vector v) { this->perspectiveExcludeList = v; } std::vector QmitkExtWorkbenchWindowAdvisor::GetPerspectiveExcludeList() { return this->perspectiveExcludeList; } void QmitkExtWorkbenchWindowAdvisor::SetViewExcludeList(std::vector v) { this->viewExcludeList = v; } std::vector QmitkExtWorkbenchWindowAdvisor::GetViewExcludeList() { return this->viewExcludeList; } void QmitkExtWorkbenchWindowAdvisor::PostWindowClose() { berry::IWorkbenchWindow::Pointer window = this->GetWindowConfigurer()->GetWindow(); QMainWindow* mainWindow = static_cast (window->GetShell()->GetControl()); QSettings settings(GetQSettingsFile(), QSettings::IniFormat); settings.setValue("ToolbarPosition", mainWindow->saveState()); } QString QmitkExtWorkbenchWindowAdvisor::GetQSettingsFile() const { QFileInfo settingsInfo = QmitkCommonExtPlugin::getContext()->getDataFile(QT_SETTINGS_FILENAME); return settingsInfo.canonicalFilePath(); }