Commit 63515fb0 authored by promayon's avatar promayon
Browse files

FIXED header guard and namespace


git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@542 ec899d31-69d1-42ba-9299-647d76f65fb3
parent e889356c
...@@ -52,7 +52,7 @@ public slots: ...@@ -52,7 +52,7 @@ public slots:
@IF_DEFCOMPONENT@ @IF_DEFCOMPONENT@
private: private:
/// helper method to simplify the target component processing /// helper method to simplify the target component processing
virtual void process(@COMPONENTNAME@ * comp); virtual void process(camitk::@COMPONENTNAME@ *);
@IF_ITKFILTER@ @IF_ITKFILTER@
vtkSmartPointer<vtkImageData> implementProcess(vtkSmartPointer<vtkImageData> img); vtkSmartPointer<vtkImageData> implementProcess(vtkSmartPointer<vtkImageData> img);
......
...@@ -40,16 +40,16 @@ ...@@ -40,16 +40,16 @@
#include <QColor> #include <QColor>
/** /**
* The class VtkMeshComponentProperties defines properties for VtkMeshComponent. * The class VtkMeshComponentProperties defines properties for VtkMeshComponent.
* *
*/ */
class VTK_COMPONENT_API VtkMeshComponentProperties : public QObject { class VTK_COMPONENT_API VtkMeshComponentProperties : public QObject {
Q_OBJECT Q_OBJECT
/// Shading interpolation // Shading interpolation
//Q_PROPERTY( ShadingInterpolation interpolation READ getInterpolation WRITE setInterpolation ) //Q_PROPERTY( ShadingInterpolation interpolation READ getInterpolation WRITE setInterpolation )
/// Color // Color
//Q_PROPERTY(QMap color READ getColor WRITE setColor ) //Q_PROPERTY(QMap color READ getColor WRITE setColor )
/// Ambient ligthing coefficient. /// Ambient ligthing coefficient.
...@@ -67,48 +67,48 @@ class VTK_COMPONENT_API VtkMeshComponentProperties : public QObject { ...@@ -67,48 +67,48 @@ class VTK_COMPONENT_API VtkMeshComponentProperties : public QObject {
/// Specular opacity coefficient. /// Specular opacity coefficient.
Q_PROPERTY( double opacity READ getOpacity WRITE setOpacity ); Q_PROPERTY( double opacity READ getOpacity WRITE setOpacity );
/// Ambient color // Ambient color
//Q_PROPERTY(QMap ambientColor READ getAmbientColor WRITE setAmbientColor ) //Q_PROPERTY(QMap ambientColor READ getAmbientColor WRITE setAmbientColor )
/// Diffuse color // Diffuse color
//Q_PROPERTY(QMap diffuseColor READ getDiffuseColor WRITE setDiffuseColor ) //Q_PROPERTY(QMap diffuseColor READ getDiffuseColor WRITE setDiffuseColor )
/// Specular color // Specular color
//Q_PROPERTY(QMap specularColor READ getSpecularColor WRITE setSpecularColor ) //Q_PROPERTY(QMap specularColor READ getSpecularColor WRITE setSpecularColor )
/// Specular color /// Specular color
Q_PROPERTY(QColor specularColor READ getSpecularColor WRITE setSpecularColor ); Q_PROPERTY(QColor specularColor READ getSpecularColor WRITE setSpecularColor );
/// Line width. // Line width.
//Q_PROPERTY( float lineWidth READ getLineWidth WRITE setLineWidth ) //Q_PROPERTY( float lineWidth READ getLineWidth WRITE setLineWidth )
/// Point size. // Point size.
//Q_PROPERTY( float pointSize READ getPointSize WRITE setPointSize ) //Q_PROPERTY( float pointSize READ getPointSize WRITE setPointSize )
public: public:
/// Available source devices.
enum ShadingInterpolation {
FLAT, ///< FLAT interpolation
GOURAUD, ///< GOURAUD interpolation
PHONG ///< PHONG interpolation
};
/** Default construtor. /** Default construtor.
* @param comp The associated Component. * @param comp The associated Component.
*/ */
VtkMeshComponentProperties(VtkMeshComponent * comp ); VtkMeshComponentProperties(VtkMeshComponent * comp );
/** Destructor. */ /** Destructor. */
~VtkMeshComponentProperties() {} ~VtkMeshComponentProperties() {}
/// Available source devices.
enum ShadingInterpolation {
FLAT, ///< FLAT interpolation
GOURAUD, ///< GOURAUD interpolation
PHONG ///< PHONG interpolation
};
// #################### GETTERS ########################################### // #################### GETTERS ###########################################
// Get the shading interpolation. // Get the shading interpolation.
//ShadingInterpolation getInterpolation() const; //ShadingInterpolation getInterpolation() const;
// Get the color. // Get the color.
//QMap<double, QVariant> getColor() const; //QMap<double, QVariant> getColor() const;
/** Get the ambient lighting coefficient. */ /** Get the ambient lighting coefficient. */
...@@ -126,24 +126,24 @@ public: ...@@ -126,24 +126,24 @@ public:
/** Get the opacity coefficient. */ /** Get the opacity coefficient. */
double getOpacity() const; double getOpacity() const;
// Get the ambient color. // Get the ambient color.
//QMap<QString, QVariant> getAmbientColor() const; //QMap<QString, QVariant> getAmbientColor() const;
// Get the ambient color. // Get the ambient color.
//QMap<QString, QVariant> getDiffuseColor() const; //QMap<QString, QVariant> getDiffuseColor() const;
/// Get the ambient color. /// Get the ambient color.
QColor getSpecularColor() const; QColor getSpecularColor() const;
// Get the line width. // Get the line width.
//double getLineWidth() const; //double getLineWidth() const;
// Get the point size. // Get the point size.
//double getPointSize() const; //double getPointSize() const;
// #################### SETTERS ########################################### // #################### SETTERS ###########################################
// Set the shading interpolation. // Set the shading interpolation.
//void setInterpolation( ShadingInterpolation input ); //void setInterpolation( ShadingInterpolation input );
// Get the color. // Get the color.
...@@ -164,19 +164,19 @@ public: ...@@ -164,19 +164,19 @@ public:
/** Set the opacity coefficient. */ /** Set the opacity coefficient. */
void setOpacity( const double input ); void setOpacity( const double input );
// Set the ambient color. // Set the ambient color.
//void setAmbientColor(const QMap<QString, QVariant> input ); //void setAmbientColor(const QMap<QString, QVariant> input );
// Set the diffuse color. // Set the diffuse color.
//void setDiffuseColor( const QMap<QString, QVariant> input ); //void setDiffuseColor( const QMap<QString, QVariant> input );
/** Set the specular color. */ /** Set the specular color. */
void setSpecularColor( const QColor input ); void setSpecularColor( const QColor input );
// Set the line width. // Set the line width.
//void setLineWidth( const double input ); //void setLineWidth( const double input );
// Set the point size. // Set the point size.
//void setPointSize( const double input ); //void setPointSize( const double input );
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
* $CAMITK_LICENCE_END$ * $CAMITK_LICENCE_END$
****************************************************************************/ ****************************************************************************/
#ifndef IMAGEVOLUMEMANAGERCOMPONENT_H #ifndef IMAGE_COMPONENT_H
#define IMAGEVOLUMEMANAGERCOMPONENT_H #define IMAGE_COMPONENT_H
// -- Core image component stuff // -- Core image component stuff
#include "SingleImageComponent.h" #include "SingleImageComponent.h"
...@@ -242,4 +242,4 @@ inline vtkSmartPointer<vtkImageData> ImageComponent::getImageData() { ...@@ -242,4 +242,4 @@ inline vtkSmartPointer<vtkImageData> ImageComponent::getImageData() {
} }
#endif #endif //IMAGE_COMPONENT_H
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
* $CAMITK_LICENCE_END$ * $CAMITK_LICENCE_END$
****************************************************************************/ ****************************************************************************/
#ifndef IMAGE_MANAGER_PLUGIN_H #ifndef IMAGE_COMPONENT_EXTENSION_H
#define IMAGE_MANAGER_PLUGIN_H #define IMAGE_COMPONENT_EXTENSION_H
// -- Core image component stuff // -- Core image component stuff
...@@ -71,4 +71,4 @@ protected: ...@@ -71,4 +71,4 @@ protected:
} }
#endif // IMAGE_MANAGER_PLUGIN_H #endif // IMAGE_COMPONENT_EXTENSION_H
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
* $CAMITK_LICENCE_END$ * $CAMITK_LICENCE_END$
****************************************************************************/ ****************************************************************************/
#ifndef MESH_MANAGER_PLUGIN_H #ifndef MESH_COMPONENT_EXTENSION_H
#define MESH_MANAGER_PLUGIN_H #define MESH_COMPONENT_EXTENSION_H
// -- Core image component stuff // -- Core image component stuff
...@@ -72,4 +72,4 @@ protected: ...@@ -72,4 +72,4 @@ protected:
} }
#endif // MESH_MANAGER_PLUGIN_H #endif // MESH_COMPONENT_EXTENSION_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment