diff --git a/Modules/QtOverlays/QmitkCustomWidgetOverlay.h b/Modules/QtOverlays/QmitkCustomWidgetOverlay.h index 0ab0901c1a..539a20513e 100644 --- a/Modules/QtOverlays/QmitkCustomWidgetOverlay.h +++ b/Modules/QtOverlays/QmitkCustomWidgetOverlay.h @@ -1,66 +1,66 @@ /*=================================================================== 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 QmitkCustomWidgetOverlay_H_HEADER_INCLUDED_C10DC4EB #define QmitkCustomWidgetOverlay_H_HEADER_INCLUDED_C10DC4EB // MITK #include "QmitkOverlay.h" -#include +#include /** \class QmitkCustomWidgetOverlay * \brief object representing a custom widget that is handled and positioned * as an overlay. * * A QmitkCustomWidgetOverlay is a generic sub-class of QmitkOverlay. It * offers the possibility to set the internal m_Widget from the outside. * * This offers the possibility to position custom widgets 'on top of' other * widgets using the positioning mechanism of all overlays. * * \warn The custom widgets need to be configured and connected manually. * Properties cannot be set. * * \ingroup Overlays */ - class MitkOverlays_EXPORT QmitkCustomWidgetOverlay : public QmitkOverlay + class MitkQtOverlays_EXPORT QmitkCustomWidgetOverlay : public QmitkOverlay { public: /** * @brief Default Constructor **/ QmitkCustomWidgetOverlay( const char* id ); /** * @brief Default Destructor **/ virtual ~QmitkCustomWidgetOverlay(); void SetWidget( QWidget* widget ); QSize GetNeededSize(); }; #endif /* QmitkCustomWidgetOverlay_H_HEADER_INCLUDED_C10DC4EB */ diff --git a/Modules/QtOverlays/QmitkTextOverlay.h b/Modules/QtOverlays/QmitkTextOverlay.h index 437c9159ac..02f95d92bd 100644 --- a/Modules/QtOverlays/QmitkTextOverlay.h +++ b/Modules/QtOverlays/QmitkTextOverlay.h @@ -1,119 +1,119 @@ /*=================================================================== 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 MITKTEXTOVERLAY_H_HEADER_INCLUDED_C10DC4EB #define MITKTEXTOVERLAY_H_HEADER_INCLUDED_C10DC4EB // MITK #include "mitkCommon.h" #include "mitkPropertyList.h" #include "QmitkOverlay.h" // Qt #include -#include +#include /** \class QmitkTextOverlay * \brief object representing a text that is drawn as an overlay * * A QmitkTextOverlay is a text-specific implementation of QmitkOverlay. * It can be used whenever a simple text is to be rendered as an overlay in * a QmitkRenderWindow. * * Instead of a QWidget (as in QmitkOverlay) a QmitkTextOverlay is internally * represented by a QLabel. You can access it via GetWidget(). * * Calling GenerateData( mitk::PropertyList::Pointer ) will setup the textoverlay. * This includes setting of the actual text (that must be stored in the property * with the name that is given the overlay as ID). * * e.g. mitk::StringProperty::Pointer nameProp = mitk::StringProperty::New( "overlay.text.patientName", "Max" ); * -- * QmitkTextOverlay* nameOverlay = new QmitkTextOverlay( "overlay.text.patientName" ); * * In order to customize the look of the textoverlays, a number of additional properties can be set * (default values in square brackets): * * overlay.color : defines the text-color (mitk::ColorProperty) * overlay.fontSize : defines the fontSize of the text (mitk::IntProperty) * overlay.kerning : defines if kerning is to be used (mitk::BoolProperty) * overlay.fontFamily : defines the fon family that is to be used (mitk::StringProperty) * * \ingroup Qmitk */ - class MitkOverlays_EXPORT QmitkTextOverlay : public QmitkOverlay + class MitkQtOverlays_EXPORT QmitkTextOverlay : public QmitkOverlay { public: /** * @brief Default Constructor **/ QmitkTextOverlay( const char* id ); /** * @brief Default Destructor **/ virtual ~QmitkTextOverlay(); /** * \brief Setup the QLabel with overlay specific information * * First, this method sets text-overlay specific properties as described in the class docu above. * Secondly, the actual text of the label is set. * * \WARNING No error will be issued if the property containing the text is not found, the TextOverlay * will show an empty string! */ void GenerateData( mitk::PropertyList::Pointer ); QSize GetNeededSize(); protected: /** * \brief internal helper class to determine text-properties * * This method is only used internally to apply the font specific properties that can be set * using a mitk::PropertyList. If a property cannot be found, a default value is used. * * The values of these properties are then attributed to the QLabel using QFont and QPalette. */ void UpdateFontProperties( mitk::PropertyList::Pointer ); void SetupCallback( mitk::BaseProperty::Pointer prop ); void UpdateDisplayedTextFromProperties(); /** \brief QLabel internally representing the TextOverlay */ QLabel* m_Label; mitk::PropertyList::Pointer m_PropertyList; mitk::BaseProperty::Pointer m_ObservedProperty; unsigned long m_ObserverTag; }; #endif /* MITKTEXTOVERLAY_H_HEADER_INCLUDED_C10DC4EB */