diff --git a/Modules/ModuleList.cmake b/Modules/ModuleList.cmake index 99f3e6883b..ca8b4e1962 100644 --- a/Modules/ModuleList.cmake +++ b/Modules/ModuleList.cmake @@ -1,77 +1,76 @@ # The entries in the mitk_modules list must be # ordered according to their dependencies. set(MITK_MODULES Log Core CommandLine CoreCmdApps AppUtil LegacyIO DataTypesExt Annotation LegacyGL AlgorithmsExt MapperExt DICOM DICOMQI DICOMTesting SceneSerializationBase PlanarFigure ImageDenoising ImageExtraction SceneSerialization Gizmo GraphAlgorithms Multilabel Chart ImageStatistics ContourModel SurfaceInterpolation Segmentation QtWidgets QtWidgetsExt ImageStatisticsUI SegmentationUI MatchPointRegistration MatchPointRegistrationUI Classification OpenIGTLink IGTBase IGT CameraCalibration OpenCVVideoSupport QtOverlays ToFHardware ToFProcessing ToFUI US USUI DICOMUI Remeshing Python QtPython Persistence OpenIGTLinkUI IGTUI RT RTUI IOExt XNAT - TubeGraph BoundingShape RenderWindowManagerUI SemanticRelations SemanticRelationsUI CEST BasicImageProcessing ModelFit ModelFitUI Pharmacokinetics PharmacokineticsUI DICOMPM REST RESTService DICOMweb ROI ) diff --git a/Modules/TubeGraph/CMakeLists.txt b/Modules/TubeGraph/CMakeLists.txt deleted file mode 100644 index 13e719c1a9..0000000000 --- a/Modules/TubeGraph/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -MITK_CREATE_MODULE( - INCLUDE_DIRS PRIVATE src/Algorithms src/DataStructure src/Interactions src/Rendering src/IO - DEPENDS MitkSceneSerializationBase -) - -#add_subdirectory(test) diff --git a/Modules/TubeGraph/files.cmake b/Modules/TubeGraph/files.cmake deleted file mode 100644 index 8cd0a31a02..0000000000 --- a/Modules/TubeGraph/files.cmake +++ /dev/null @@ -1,21 +0,0 @@ -file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*") - -set(CPP_FILES - DataStructure/mitkCircularProfileTubeElement.cpp - DataStructure/mitkTubeGraph.cpp - DataStructure/mitkTubeGraphEdge.cpp - DataStructure/mitkTubeGraphVertex.cpp - Interactions/mitkTubeGraphDataInteractor.cpp - Interactions/mitkTubeGraphPicker.cpp - IO/mitkTubeGraphDefinitions.cpp - IO/mitkTubeGraphIO.cpp - IO/mitkTubeGraphModuleActivator.cpp - IO/mitkTubeGraphObjectFactory.cpp - Rendering/mitkTubeGraphProperty.cpp - Rendering/mitkTubeGraphVtkMapper3D.cpp -) - -set(RESOURCE_FILES - Interactions/TubeGraphConfig.xml - Interactions/TubeGraphInteraction.xml -) diff --git a/Modules/TubeGraph/include/mitkCircularProfileTubeElement.h b/Modules/TubeGraph/include/mitkCircularProfileTubeElement.h deleted file mode 100644 index 33a8d8f961..0000000000 --- a/Modules/TubeGraph/include/mitkCircularProfileTubeElement.h +++ /dev/null @@ -1,67 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#ifndef mitkCircularProfileTubeElement_h -#define mitkCircularProfileTubeElement_h - -#include - -#include "mitkTubeElement.h" - -namespace mitk -{ - /** - * \brief Class for elements which describes tubular structur with a circular cross section. - */ - class MITKTUBEGRAPH_EXPORT CircularProfileTubeElement : virtual public TubeElement - { - public: - CircularProfileTubeElement(); - CircularProfileTubeElement(float x, float y, float z, float d = 0.0f); - CircularProfileTubeElement(const Point3D, float d = 0.0f); - ~CircularProfileTubeElement() override; - - /** - * Set the 3D position of the element. - */ - void SetCoordinates(Point3D coordinates) override; - - /** - * Returns the 3D position of the element. - */ - const Point3D &GetCoordinates() const override; - - /** - * Set the diameter of the circle. - */ - void SetDiameter(float d); - - /** - * Returns the diameter of the circle. - */ - float GetDiameter() const; - - /** - * Comparison operation between this object and the given object. - * @param right The object to compare with. - * @return true, if the object is the same;false, if not. - */ - bool operator==(const TubeElement &right) const override; - - private: - Point3D m_coordinates; - float m_diameter; - - }; // class - -} // namespace -#endif diff --git a/Modules/TubeGraph/include/mitkTubeElement.h b/Modules/TubeGraph/include/mitkTubeElement.h deleted file mode 100644 index 6290cb40f5..0000000000 --- a/Modules/TubeGraph/include/mitkTubeElement.h +++ /dev/null @@ -1,50 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#ifndef mitkTubeElement_h -#define mitkTubeElement_h - -#include - -#include - -namespace mitk -{ - /** - * \brief Abstract class for elements which describes tubular structur. - */ - class MITKTUBEGRAPH_EXPORT TubeElement - { - public: - virtual ~TubeElement(){}; - - /** - * Set the 3D position of the element. - */ - virtual void SetCoordinates(Point3D coordinates) = 0; - - /** - * Returns the 3D position of the element. - */ - virtual const Point3D &GetCoordinates() const = 0; - - /** - * Comparison operation between this object and the given object. - * @param right The object to compare with. - * @return true, if the object is the same;false, if not. - */ - virtual bool operator==(const TubeElement &right) const = 0; - - }; // class - -} // namespace -#endif diff --git a/Modules/TubeGraph/include/mitkTubeGraph.h b/Modules/TubeGraph/include/mitkTubeGraph.h deleted file mode 100644 index 10aa38ce70..0000000000 --- a/Modules/TubeGraph/include/mitkTubeGraph.h +++ /dev/null @@ -1,152 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#ifndef mitkTubeGraph_h -#define mitkTubeGraph_h - -#include - -#include "mitkTubeGraphEdge.h" -#include "mitkTubeGraphVertex.h" -#include "mitkUndirectedGraph.h" - -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable: 4172) // boost/graph/named_function_params.hpp(240): returning address of local variable or temporary -#endif - -#include -#include -#include - -#include -#include - -#ifdef _MSC_VER -# pragma warning(pop) -#endif - -namespace mitk -{ - /** - * \brief Base Class for Tube Graphs - */ - class MITKTUBEGRAPH_EXPORT TubeGraph : public UndirectedGraph - { - public: - /** - * Defines the type of the id of a single tube. It is allways the source and target descriptor: [uint, uint] - */ - typedef std::pair TubeDescriptorType; - - typedef boost::adjacency_list - DirectedGraphType; - - /** - * Represents a tube id which may not occur. This may be used - * for error states or for indicating that something went wrong. - */ - static const TubeDescriptorType ErrorId; - - //--- Macros ---// - mitkClassMacro(TubeGraph, Superclass); - itkNewMacro(Self); - - /** - * Search only the shortest path between two tubes. - */ - std::vector SearchShortestPath( - const TubeDescriptorType &startTube, const TubeDescriptorType &endTube /*, std::vector barrier*/); - - /** - * Search every path between two tubes. - */ - std::vector SearchAllPathBetweenVertices( - const TubeDescriptorType &startTube, const TubeDescriptorType &endTube /*, std::vector barrier*/); - std::vector SearchPathToPeriphery( - const TubeDescriptorType &startTube /*, std::vector barrier*/); - - /** - * Find thickest tube in the graph. This means the tube which has the element with the largest diameter. - */ - TubeDescriptorType GetThickestTube(); - - /** - * Get this undirected graph as a directed graph. For this convertation you need a start point. - */ - DirectedGraphType GetDirectedGraph(VertexDescriptorType startVertex); - - /** - * Create a subgraph with all given tubes. The origin graph would not be changed. - */ - TubeGraph::Pointer CreateSubGraph(std::vector subGraphTubes); - - /** - * Remove a part of the graph. All tubes, that means all edges and if necessary also the vertex (no other out-edge) - * of the tube will be deleted. - */ - void RemoveSubGraph(std::vector deletedTubes); - - void SetRootTube(const TubeDescriptorType &root); - void SetRoot(const VertexDescriptorType &root); - TubeDescriptorType GetRootTube(); - VertexDescriptorType GetRootVertex(); - - protected: - TubeGraph(); - TubeGraph(const TubeGraph &graph); - ~TubeGraph() override; - - TubeGraph &operator=(const TubeGraph &rhs); - - private: - TubeDescriptorType m_RootTube; - VertexDescriptorType m_Root; - - void GetOutEdgesOfAVertex(VertexDescriptorType vertex, - DirectedGraphType &directedGraph, - std::vector &pathToPeriphery); - }; - - /** - * Defines a own graph visitor for breadth-first-search. - * This visitor should be create a new directed graph by passing the edges of a undirected graph. - */ - class DirectedGraphBfsVisitor : public boost::default_bfs_visitor - { - public: - DirectedGraphBfsVisitor(TubeGraph *oldGraph, TubeGraph::DirectedGraphType &newGraph) - : m_OrignialGraph(oldGraph), m_DirectedGraph(newGraph) - { - } - - void tree_edge(TubeGraph::EdgeDescriptorType e, const TubeGraph::GraphType &g) - { - unsigned int numberSource = boost::source(e, g); - unsigned int numberTarget = boost::target(e, g); - boost::graph_traits::vertex_descriptor source = numberSource; - boost::graph_traits::vertex_descriptor target = numberTarget; - - boost::add_edge(source, target, m_DirectedGraph); - } - - private: - TubeGraph::Pointer m_OrignialGraph; - TubeGraph::DirectedGraphType &m_DirectedGraph; - }; - -} // namespace mitk - -#endif diff --git a/Modules/TubeGraph/include/mitkTubeGraphDataInteractor.h b/Modules/TubeGraph/include/mitkTubeGraphDataInteractor.h deleted file mode 100644 index 37c09298d5..0000000000 --- a/Modules/TubeGraph/include/mitkTubeGraphDataInteractor.h +++ /dev/null @@ -1,122 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#ifndef mitkTubeGraphDataInteractor_h -#define mitkTubeGraphDataInteractor_h - -#include - -#include -#include - -#include "mitkTubeGraph.h" -#include "mitkTubeGraphProperty.h" - -namespace mitk -{ - // Define events for TubeGraph interaction notifications - itkEventMacroDeclaration(SelectionChangedTubeGraphEvent, itk::AnyEvent); - - /** - * \brief - * - * \ingroup Interaction - */ - // Inherit from DataInteratcor, this provides functionality of a state machine and configurable inputs. - class MITKTUBEGRAPH_EXPORT TubeGraphDataInteractor : public DataInteractor - { - public: - mitkClassMacro(TubeGraphDataInteractor, DataInteractor); - itkNewMacro(Self); - - /** - * Describes, which activation modes are available based on the - * currently picked tube: - * - * \li None means "no tube is active" - * \li Single means "only the picked tube is active" - * \li ToRoot means "all tubes from the picked on down to the root of the tube graph are active" - * \li ToPeriphery means "all tubes included in the subgraph of the currently picked vessel are active" - * \li Points means "shortes path between two picked tubes are active" - * \li Multiple means "all picked tubes are active" - */ - enum ActivationMode - { - None = 0, - Single, - ToRoot, - ToPeriphery, - Points, - Multiple - }; - - enum ActionMode - { - AttributationMode = 0, - AnnotationMode, - EditMode, - RootMode, - InformationMode - }; - - void SetActivationMode(const ActivationMode &activationMode); - ActivationMode GetActivationMode(); - - void SetActionMode(const ActionMode &actionMode); - ActionMode GetActionMode(); - - void ResetPickedTubes(); - - mitk::Point3D GetLastPickedPosition(); - - protected: - TubeGraphDataInteractor(); - ~TubeGraphDataInteractor() override; - - /** - * Here actions strings from the loaded state machine pattern are mapped to functions of - * the DataInteractor. These functions are called when an action from the state machine pattern is executed. - */ - void ConnectActionsAndFunctions() override; - - /** - * This function is called when a DataNode has been set/changed. - */ - void DataNodeChanged() override; - - /** - * Initializes the movement, stores starting position. - */ - virtual bool CheckOverTube(const InteractionEvent *); - virtual void SelectTube(StateMachineAction *, InteractionEvent *); - virtual void DeselectTube(StateMachineAction *, InteractionEvent *); - - void SelectTubesByActivationModus(); - void UpdateActivation(); - - private: - std::vector GetTubesToRoot(); - std::vector GetTubesBetweenPoints(); - std::vector GetPathToPeriphery(); - std::vector GetPathBetweenTubes(const TubeGraph::TubeDescriptorType &start, - const TubeGraph::TubeDescriptorType &end); - - TubeGraph::Pointer m_TubeGraph; - TubeGraphProperty::Pointer m_TubeGraphProperty; - TubeGraph::TubeDescriptorType m_LastPickedTube; - TubeGraph::TubeDescriptorType m_SecondLastPickedTube; - ActivationMode m_ActivationMode; - ActionMode m_ActionMode; - mitk::TubeElement *m_LastPickedElement = nullptr; - }; -} -#endif diff --git a/Modules/TubeGraph/include/mitkTubeGraphDefinitions.h b/Modules/TubeGraph/include/mitkTubeGraphDefinitions.h deleted file mode 100644 index d5b4a35fef..0000000000 --- a/Modules/TubeGraph/include/mitkTubeGraphDefinitions.h +++ /dev/null @@ -1,110 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#ifndef mitkTubeGraphDefinitions_h -#define mitkTubeGraphDefinitions_h - -#include - -namespace mitk -{ - /** \brief The XML consts for reading and writing - */ - - class TubeGraphDefinitions - { - public: - //============== XML const chars =================== - - //==== Header information ==== - static const std::string XML_TUBEGRAPH_FILE; - static const std::string XML_FILE_VERSION; - static const std::string VERSION_STRING; - static const std::string ASCII_FILE; - static const std::string FILE_NAME; - - //==== Geometry details ==== - static const std::string XML_GEOMETRY; - - static const std::string XML_MATRIX_XX; - static const std::string XML_MATRIX_XY; - static const std::string XML_MATRIX_XZ; - static const std::string XML_MATRIX_YX; - static const std::string XML_MATRIX_YY; - static const std::string XML_MATRIX_YZ; - static const std::string XML_MATRIX_ZX; - static const std::string XML_MATRIX_ZY; - static const std::string XML_MATRIX_ZZ; - - static const std::string XML_ORIGIN_X; - static const std::string XML_ORIGIN_Y; - static const std::string XML_ORIGIN_Z; - - static const std::string XML_SPACING_X; - static const std::string XML_SPACING_Y; - static const std::string XML_SPACING_Z; - - //==== tube graph structures ==== - static const std::string XML_VERTICES; - static const std::string XML_EDGES; - static const std::string XML_LABELGROUPS; - static const std::string XML_ATTRIBUTIONS; - static const std::string XML_ANNOTATIONS; - static const std::string XML_VERTEX; - static const std::string XML_EDGE; - static const std::string XML_ELEMENT; - static const std::string XML_LABELGROUP; - static const std::string XML_LABEL; - static const std::string XML_ATTRIBUTION; - static const std::string XML_ANNOTATION; - - //==== vertex properties ==== - static const std::string XML_VERTEX_ID; - - //==== edge properties ==== - static const std::string XML_EDGE_ID; - static const std::string XML_EDGE_SOURCE_ID; - static const std::string XML_EDGE_TARGET_ID; - - //==== element properties ==== - - static const std::string XML_ELEMENT_X; - static const std::string XML_ELEMENT_Y; - static const std::string XML_ELEMENT_Z; - static const std::string XML_ELEMENT_DIAMETER; - - //==== label group properties ==== - static const std::string XML_LABELGROUP_NAME; - - //==== label properties ==== - static const std::string XML_LABEL_NAME; - static const std::string XML_LABEL_VISIBILITY; - static const std::string XML_LABEL_COLOR_R; - static const std::string XML_LABEL_COLOR_G; - static const std::string XML_LABEL_COLOR_B; - - //==== tube properties ==== - static const std::string XML_TUBE_ID_1; - static const std::string XML_TUBE_ID_2; - - //==== annotation properties ==== - static const std::string XML_ANNOTATION_NAME; - static const std::string XML_ANNOTATION_DESCRIPTION; - - private: - TubeGraphDefinitions(); - ~TubeGraphDefinitions(); - }; - -} // namespace MITK - -#endif diff --git a/Modules/TubeGraph/include/mitkTubeGraphEdge.h b/Modules/TubeGraph/include/mitkTubeGraphEdge.h deleted file mode 100644 index 4debead6b3..0000000000 --- a/Modules/TubeGraph/include/mitkTubeGraphEdge.h +++ /dev/null @@ -1,102 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#ifndef mitkTubeGraphEdge_h -#define mitkTubeGraphEdge_h - -#include - -#include "mitkCircularProfileTubeElement.h" -#include "mitkTubeElement.h" -#include "mitkTubeGraphVertex.h" - -namespace mitk -{ - /** - * \brief Base Class for Tube Graph Edges - */ - class MITKTUBEGRAPH_EXPORT TubeGraphEdge - { - public: - TubeGraphEdge(); - virtual ~TubeGraphEdge(); - - /** - * Set the vector which contains all TubeElements. - * @param elementVector Vector with all TubeElements - */ - void SetElementVector(std::vector elementVector); - - /** - * Returns the vector which contains all TubeElements. - * @returns vector with all TubeElements. - */ - std::vector GetElementVector(); - - /** - * Returns the number of TubeElements which are contained in this tube. - * @returns Number of TubeElements. - */ - unsigned int GetNumberOfElements() const; - - /** - * Adds a new TubeElement at the end of this edge. - * @param element The new TubeElement. - */ - void AddTubeElement(TubeElement *element); - - /** - * Adds a new TubeElement at the given position. - * @param position The position for the TubeElement. - * @param element The new TubeElement. - */ - void AddTubeElementAt(unsigned int position, TubeElement *element); - - /** - * Returns the TubeElement at the given position. - * @param position The position of the Element. - * @returns The TubeElement at the given position. - */ - TubeElement *GetTubeElement(unsigned int position); - - /** - * Calculates the length of tube graph edge inc. the source and target vertex.. - * - * @param source the source vertex of the edge - * @param target the target vertex of the edge - * @returns the length of the edge in mm - */ - float GetEdgeLength(TubeGraphVertex &source, TubeGraphVertex &target); - - /** - * Calculates the average diameter of tube graph edge inc. the source and target vertex. - * - * @param source the source vertex of the edge - * @param target the target vertex of the edge - * @returns the average diameter of the edge - */ - float GetEdgeAverageDiameter(TubeGraphVertex &source, TubeGraphVertex &target); - - /** - * Comparison operation between this object and the given object. - * @param right The object to compare with. - * @return true, if the object is the same;false, if not. - */ - bool operator==(const TubeGraphEdge &right) const; - - private: - std::vector m_ElementVector; - - }; // class - -} // namespace -#endif diff --git a/Modules/TubeGraph/include/mitkTubeGraphIO.h b/Modules/TubeGraph/include/mitkTubeGraphIO.h deleted file mode 100644 index 9be4e611ab..0000000000 --- a/Modules/TubeGraph/include/mitkTubeGraphIO.h +++ /dev/null @@ -1,69 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#ifndef mitkTubeGraphIO_h -#define mitkTubeGraphIO_h - -#include -#include -#include - -#include "mitkTubeGraph.h" - -namespace mitk -{ - /** - * @brief reader and writer for xml representations of mitk::TubeGraph - * - * @ingroup IO - */ - class TubeGraphIO : public mitk::AbstractFileIO - { - public: - TubeGraphIO(); - - // -------------- AbstractFileReader ------------- - - using AbstractFileReader::Read; - - ConfidenceLevel GetReaderConfidenceLevel() const override; - - // -------------- AbstractFileWriter ------------- - - void Write() override; - ConfidenceLevel GetWriterConfidenceLevel() const override; - - static CustomMimeType TUBEGRAPH_MIMETYPE() // tsf - { - CustomMimeType mimeType(TUBEGRAPH_MIMETYPE_NAME()); - mimeType.AddExtension("tsf"); - mimeType.SetCategory("Graphs"); - mimeType.SetComment("MITK Tube Graph Structure File"); - return mimeType; - } - static std::string TUBEGRAPH_MIMETYPE_NAME() - { - static std::string name = mitk::IOMimeTypes::DEFAULT_BASE_NAME() + ".graphs.tubular-sructure"; - return name; - } - - protected: - std::vector> DoRead() override; - - private: - TubeGraphIO *IOClone() const override; - TubeGraphIO(const TubeGraphIO &other); - const BoundingBox::Pointer ComputeBoundingBox(TubeGraph::Pointer graph) const; - }; -} - -#endif diff --git a/Modules/TubeGraph/include/mitkTubeGraphObjectFactory.h b/Modules/TubeGraph/include/mitkTubeGraphObjectFactory.h deleted file mode 100644 index 3d8548db67..0000000000 --- a/Modules/TubeGraph/include/mitkTubeGraphObjectFactory.h +++ /dev/null @@ -1,51 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#ifndef mitkTubeGraphObjectFactory_h -#define mitkTubeGraphObjectFactory_h - -#include - -#include - -namespace mitk -{ - class MITKTUBEGRAPH_EXPORT TubeGraphObjectFactory : public CoreObjectFactoryBase - { - public: - mitkClassMacro(TubeGraphObjectFactory, CoreObjectFactoryBase); - itkFactorylessNewMacro(Self); - itkCloneMacro(Self); - - Mapper::Pointer CreateMapper(mitk::DataNode *node, MapperSlotId slotId) override; - void SetDefaultProperties(mitk::DataNode *node) override; - std::string GetFileExtensions() override; - mitk::CoreObjectFactoryBase::MultimapType GetFileExtensionsMap() override; - std::string GetSaveFileExtensions() override; - mitk::CoreObjectFactoryBase::MultimapType GetSaveFileExtensionsMap() override; - void RegisterIOFactories(); - - protected: - TubeGraphObjectFactory(); - - private: - void CreateFileExtensionsMap(); - - std::string m_ExternalFileExtensions; - std::string m_InternalFileExtensions; - std::string m_SaveFileExtensions; - MultimapType m_FileExtensionsMap; - MultimapType m_SaveFileExtensionsMap; - }; -} - -#endif diff --git a/Modules/TubeGraph/include/mitkTubeGraphPicker.h b/Modules/TubeGraph/include/mitkTubeGraphPicker.h deleted file mode 100644 index 930b16e6a7..0000000000 --- a/Modules/TubeGraph/include/mitkTubeGraphPicker.h +++ /dev/null @@ -1,45 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#ifndef mitkTubeGraphPicker_h -#define mitkTubeGraphPicker_h - -#include - -#include "mitkCircularProfileTubeElement.h" -#include "mitkTubeGraph.h" -#include "mitkTubeGraphProperty.h" - -namespace mitk -{ - class MITKTUBEGRAPH_EXPORT TubeGraphPicker - { - public: - /* mitkClassMacro( TubeGraphPicker, BaseDataSource ); - itkNewMacro( Self );*/ - - void SetTubeGraph(const TubeGraph *tubeGraph); - - std::pair GetPickedTube(const Point3D pickedPosition); - - TubeGraphPicker(); - virtual ~TubeGraphPicker(); - - protected: - Point3D m_WorldPosition; - TubeGraph::ConstPointer m_TubeGraph; - TubeGraphProperty::Pointer m_TubeGraphProperty; - }; - -} // namespace - -#endif diff --git a/Modules/TubeGraph/include/mitkTubeGraphProperty.h b/Modules/TubeGraph/include/mitkTubeGraphProperty.h deleted file mode 100644 index 95fc651efe..0000000000 --- a/Modules/TubeGraph/include/mitkTubeGraphProperty.h +++ /dev/null @@ -1,149 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#ifndef mitkTubeGraphProperty_h -#define mitkTubeGraphProperty_h - -#include - -#include "mitkTubeGraph.h" -#include -#include - -#include -#include -#include - -namespace mitk -{ - /** - * \brief Property for tube graphs - */ - class MITKTUBEGRAPH_EXPORT TubeGraphProperty : public BaseProperty - { - public: - mitkClassMacro(TubeGraphProperty, BaseProperty); - itkNewMacro(TubeGraphProperty); - - struct LabelGroup - { - struct Label - { - std::string labelName; - bool isVisible; - Color labelColor; - }; - std::string labelGroupName; - std::vector