Commit 7ee9134c authored by Kenneth Vanhoey's avatar Kenneth Vanhoey

doc modifications

parent 3feec578
......@@ -104,7 +104,7 @@ ENDIF (WITH_ZINRI)
IF (WITH_QT)
add_definitions(-DWITH_QT)
find_package(Qt4 REQUIRED)
find_package(Qt REQUIRED)
SET(QT_USE_QTCORE TRUE)
SET(QT_USE_QTOPENGL TRUE)
SET(QT_USE_QTSVG TRUE)
......
......@@ -118,7 +118,7 @@ protected:
public:
Approximator(MAP& m, std::vector<VertexAttribute<T>* > va, Predictor<PFP, T> * predictor) ;
~Approximator() ;
virtual ~Approximator() ;
const std::string& getApproximatedAttributeName(unsigned int index = 0) const ;
unsigned int getNbApproximated() const ;
void saveApprox(Dart d) ;
......
......@@ -66,6 +66,7 @@ Approximator<PFP,T,ORBIT>::Approximator(MAP& m, std::vector<VertexAttribute<T>*
template <typename PFP, typename T, unsigned int ORBIT>
Approximator<PFP,T,ORBIT>::~Approximator()
{
std::cout << "Approximator<PFP,T,ORBIT>::~Approximator()" << std::endl ;
for (unsigned int i = 0 ; i < m_attrV.size() ; ++i)
{
this->m_map.template removeAttribute(m_approx[i]) ;
......
......@@ -38,15 +38,14 @@ namespace Utils {
/*!
* \class ColourConverter
* \brief Class for switching between different tri-channel color-spaces
* \brief Class for switching between different tri-channel color-spaces (see \link #ColourEncoding ColourEncoding enumeration\endlink for available types)
*
* Class for colour conversions between the enumerated colour spaces.
* Usage :
* VEC3 colRGB ; // current colour in RGB for example
* ColourConverter<REAL> cc(colRGB,C_RGB) ; // Tell constructor you provided RGB
* Usage:\n
* VEC3 colRGB ; // current colour in RGB for example\n
* ColourConverter<REAL> cc(colRGB,C_RGB) ; // Tell constructor you provided RGB\n
* VEC3 colLuv = cc.getLuv() ; // ask whatever supported colour type you require
*
* All conversion formulae were provided by "Notes about color", january 5th, 2011 by B. Sauvage
* Some conversion formulae were provided by "Notes about color", january 5th, 2011 by B. Sauvage
*/
template <typename REAL>
class ColourConverter
......@@ -61,7 +60,7 @@ public: // types
C_RGB = 0, /*!< R,G,B in [0,1] */
C_XYZ = 1, /*!< X,Y,Z in [0,1] */
C_Luv = 2, /*!< L in [0,100], u in [-83,175], v in [-134,108] */
C_Lab = 3, /*!< L in [0,100], u in [-86,98], v in [-108,95] */
C_Lab = 3, /*!< L in [0,100], a in [-86,98], b in [-108,95] */
C_HSV = 4, /*!< H,S,V in [0,1] */
C_HSL = 5 /*!< H,S,L in [0,1] */
} ;
......
......@@ -198,7 +198,6 @@ ColourConverter<REAL>::getHSL()
return *HSL ;
}
template<typename REAL>
void
ColourConverter<REAL>::convertRGBtoXYZ()
......
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