diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake index 90a9f5c50a..193108ebb4 100644 --- a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake +++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake @@ -1,91 +1,92 @@ SET(SRC_CPP_FILES QmitkODFDetailsWidget.cpp QmitkODFRenderWidget.cpp QmitkPartialVolumeAnalysisWidget.cpp ) SET(INTERNAL_CPP_FILES mitkPluginActivator.cpp QmitkQBallReconstructionView.cpp QmitkPreprocessingView.cpp QmitkDiffusionDicomImportView.cpp QmitkDiffusionQuantificationView.cpp QmitkTensorReconstructionView.cpp QmitkDiffusionImagingPublicPerspective.cpp QmitkControlVisualizationPropertiesView.cpp QmitkODFDetailsView.cpp QmitkGlobalFiberTrackingView.cpp QmitkFiberBundleOperationsView.cpp QmitkFiberBundleDeveloperView.cpp QmitkPartialVolumeAnalysisView.cpp ) SET(UI_FILES src/internal/QmitkQBallReconstructionViewControls.ui src/internal/QmitkPreprocessingViewControls.ui src/internal/QmitkDiffusionDicomImportViewControls.ui src/internal/QmitkDiffusionQuantificationViewControls.ui src/internal/QmitkTensorReconstructionViewControls.ui src/internal/QmitkControlVisualizationPropertiesViewControls.ui src/internal/QmitkODFDetailsViewControls.ui src/internal/QmitkGlobalFiberTrackingViewControls.ui src/internal/QmitkFiberBundleOperationsViewControls.ui src/internal/QmitkFiberBundleDeveloperViewControls.ui src/internal/QmitkPartialVolumeAnalysisViewControls.ui ) SET(MOC_H_FILES src/internal/mitkPluginActivator.h src/internal/QmitkQBallReconstructionView.h src/internal/QmitkPreprocessingView.h src/internal/QmitkDiffusionDicomImportView.h src/internal/QmitkDiffusionImagingPublicPerspective.h src/internal/QmitkDiffusionQuantificationView.h src/internal/QmitkTensorReconstructionView.h src/internal/QmitkControlVisualizationPropertiesView.h src/internal/QmitkODFDetailsView.h src/QmitkODFRenderWidget.h src/QmitkODFDetailsWidget.h src/internal/QmitkGlobalFiberTrackingView.h src/internal/QmitkFiberBundleOperationsView.h src/internal/QmitkFiberBundleDeveloperView.h src/internal/QmitkPartialVolumeAnalysisView.h + src/QmitkPartialVolumeAnalysisWidget.h ) SET(CACHED_RESOURCE_FILES # list of resource files which can be used by the plug-in # system without loading the plug-ins shared library, # for example the icon used in the menu and tabs for the # plug-in views in the workbench plugin.xml resources/preprocessing.png resources/dwiimport.png resources/quantification.png resources/reconodf.png resources/recontensor.png resources/vizControls.png resources/OdfDetails.png resources/GlobalTracking.png resources/FiberBundleOperations.png resources/PartialVolumeAnalysis_24.png ) SET(QRC_FILES # uncomment the following line if you want to use Qt resources resources/QmitkDiffusionImaging.qrc ) SET(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) SET(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) SET(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFDetailsWidget.h b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFDetailsWidget.h index 3cf8291942..09ddcf9237 100644 --- a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFDetailsWidget.h +++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFDetailsWidget.h @@ -1,66 +1,66 @@ /*========================================================================= Program: Medical Imaging & Interaction Toolkit Language: C++ Date: $Date: 2009-05-15 18:09:46 +0200 (Fr, 15 Mai 2009) $ Version: $Revision: 1.12 $ Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. See MITKCopyright.txt or http://www.mitk.org/copyright.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ #ifndef QmitkODFDetailsWidget_H_ #define QmitkODFDetailsWidget_H_ #include "QmitkPlotWidget.h" -#include "MitkDiffusionImagingExports.h" +#include #include "QmitkHistogram.h" #include "mitkImage.h" #include "mitkPlanarFigure.h" #include #include #include #include #include #include #include /** * \brief Widget for displaying image histograms based on the vtkQtChart * framework */ -class QmitkODFDetailsWidget : public QmitkPlotWidget +class DIFFUSIONIMAGING_EXPORT QmitkODFDetailsWidget : public QmitkPlotWidget { Q_OBJECT public: typedef mitk::Image::HistogramType HistogramType; typedef mitk::Image::HistogramType::ConstIterator HistogramConstIteratorType; void SetParameters( std::vector odfVals ); QmitkODFDetailsWidget( QWidget * /*parent = 0 */); virtual ~QmitkODFDetailsWidget(); std::vector m_Vals; private: std::vector vec(vnl_vector vector); }; #endif /* QmitkODFDetailsWidget_H_ */ diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.h b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.h index b57be35ef9..61b6dc28cf 100644 --- a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.h +++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.h @@ -1,60 +1,61 @@ /*========================================================================= Program: Medical Imaging & Interaction Toolkit Language: C++ Date: $Date$ Version: $Revision$ Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. See MITKCopyright.txt or http://www.mitk.org/copyright.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ #ifndef QmitkODFRenderWidget_H_ #define QmitkODFRenderWidget_H_ -#include + +#include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include -class QmitkODFRenderWidget : public QWidget +class DIFFUSIONIMAGING_EXPORT QmitkODFRenderWidget : public QWidget { Q_OBJECT public: QmitkODFRenderWidget( QWidget* parent = 0, Qt::WindowFlags f = 0 ); virtual ~QmitkODFRenderWidget(); void GenerateODF( std::vector odfVals ); protected: QHBoxLayout* QmitkODFRenderWidgetLayout; QmitkRenderWindow* m_RenderWindow; mitk::Surface::Pointer m_Surface; mitk::StandaloneDataStorage::Pointer m_ds; mitk::DataNode::Pointer m_Node; }; #endif /*QmitkODFRenderWidget_H_*/ diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.h b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.h index dc6711e9d0..51bbc1eece 100644 --- a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.h +++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.h @@ -1,73 +1,74 @@ /*========================================================================= Program: Medical Imaging & Interaction Toolkit Language: C++ Date: $Date: 2009-05-15 18:09:46 +0200 (Fr, 15 Mai 2009) $ Version: $Revision: 1.12 $ Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. See MITKCopyright.txt or http://www.mitk.org/copyright.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ #ifndef QmitkPartialVolumeAnalysisWidget_H_ #define QmitkPartialVolumeAnalysisWidget_H_ #include "QmitkPlotWidget.h" -#include +#include #include "QmitkHistogram.h" #include "QmitkExtExports.h" #include "mitkImage.h" #include "mitkPlanarFigure.h" #include "mitkPartialVolumeAnalysisClusteringCalculator.h" #include #include #include #include #include #include #include /** * \brief Widget for displaying image histograms based on the vtkQtChart * framework */ -class MitkDiffusionImaging_EXPORT QmitkPartialVolumeAnalysisWidget : public QmitkPlotWidget +class DIFFUSIONIMAGING_EXPORT QmitkPartialVolumeAnalysisWidget : public QmitkPlotWidget { + Q_OBJECT public: typedef mitk::Image::HistogramType HistogramType; typedef mitk::Image::HistogramType::ConstIterator HistogramConstIteratorType; typedef mitk::PartialVolumeAnalysisClusteringCalculator ClusteringType; typedef ClusteringType::ParamsType ParamsType; typedef ClusteringType::ClusterResultType ResultsType; typedef ClusteringType::HistType HistType; /** \brief Set histogram to be displayed directly. */ void SetParameters( ParamsType *params, ResultsType *results, HistType *hist ); QmitkPartialVolumeAnalysisWidget( QWidget * /*parent = 0 */); virtual ~QmitkPartialVolumeAnalysisWidget(); void DrawGauss(); void ClearItemModel(); std::vector< std::vector* > m_Vals; }; #endif /* QmitkPartialVolumeAnalysisWidget_H_ */