Commit 020eae36 authored by Alexander Wiebel's avatar Alexander Wiebel
Browse files

[CHANGE #396] Changed names to eliminate "EDU"

parent 5982728b
......@@ -115,11 +115,11 @@ void WMPickingDVR::properties()
m_crossSize->setMax( 1000.0 );
m_pickingCritereaList = boost::shared_ptr< WItemSelection >( new WItemSelection() );
m_pickingCritereaList->addItem( WMEDU_PICKING_FIRST_HIT, WMEDU_PICKING_FIRST_HIT );
m_pickingCritereaList->addItem( WMEDU_PICKING_THRESHOLD, WMEDU_PICKING_THRESHOLD );
m_pickingCritereaList->addItem( WMEDU_PICKING_MOST_CONTRIBUTING, WMEDU_PICKING_MOST_CONTRIBUTING );
m_pickingCritereaList->addItem( WMEDU_PICKING_WYSIWYP, WMEDU_PICKING_WYSIWYP );
m_pickingCritereaList->addItem( WMEDU_PICKING_MAX_INT, WMEDU_PICKING_MAX_INT );
m_pickingCritereaList->addItem( WMPICKINGDVR_FIRST_HIT, WMPICKINGDVR_FIRST_HIT );
m_pickingCritereaList->addItem( WMPICKINGDVR_THRESHOLD, WMPICKINGDVR_THRESHOLD );
m_pickingCritereaList->addItem( WMPICKINGDVR_MOST_CONTRIBUTING, WMPICKINGDVR_MOST_CONTRIBUTING );
m_pickingCritereaList->addItem( WMPICKINGDVR_WYSIWYP, WMPICKINGDVR_WYSIWYP );
m_pickingCritereaList->addItem( WMPICKINGDVR_MAX_INT, WMPICKINGDVR_MAX_INT );
m_pickingCritereaCur = m_properties->addProperty( "Picking method",
"Select a picking method",
......@@ -259,7 +259,7 @@ void WMPickingDVR::moduleMain()
int iColorIdx = dScalarPercentage * transferFunctionValues->size();
//color
WMEDUColor<double> color;
WMPickingColor<double> color;
//Get Color from transferfunction
color.setRed( transferFunctionData->getSingleRawValue( iColorIdx * 4 + 0 ) );
......@@ -274,7 +274,7 @@ void WMPickingDVR::moduleMain()
dCurrentAlpha = color.getAlpha();
dAccAlpha = dCurrentAlpha + ( dAccAlpha - dCurrentAlpha * dAccAlpha );
if( strRenderMode == WMEDU_PICKING_MAX_INT )
if( strRenderMode == WMPICKINGDVR_MAX_INT )
{
//Maximum Intensity: maximal scalar value
if( dValue > dMaxValue )
......@@ -284,7 +284,7 @@ void WMPickingDVR::moduleMain()
bPickedPos = true;
}
}
else if( strRenderMode == WMEDU_PICKING_FIRST_HIT )
else if( strRenderMode == WMPICKINGDVR_FIRST_HIT )
{
//First Hit: first alpha value > 0.0
if( dCurrentAlpha > 0.0 )
......@@ -295,7 +295,7 @@ void WMPickingDVR::moduleMain()
break;
}
}
else if( strRenderMode == WMEDU_PICKING_THRESHOLD )
else if( strRenderMode == WMPICKINGDVR_THRESHOLD )
{
//Threshold: accumulated alpha value > threshold
if( dAccAlpha > this->m_alphaThreshold->get() )
......@@ -306,7 +306,7 @@ void WMPickingDVR::moduleMain()
break;
}
}
else if( strRenderMode == WMEDU_PICKING_MOST_CONTRIBUTING )
else if( strRenderMode == WMPICKINGDVR_MOST_CONTRIBUTING )
{
//Most Contributing: maximal alpha value
if( dCurrentAlpha > dPickedAlpha )
......@@ -316,7 +316,7 @@ void WMPickingDVR::moduleMain()
bPickedPos = true;
}
}
else if( strRenderMode == WMEDU_PICKING_WYSIWYP )
else if( strRenderMode == WMPICKINGDVR_WYSIWYP )
{
//WYSIWYP: Save all the accumulated alpha values
vecAlphaAcc.push_back( dAccAlpha );
......@@ -324,7 +324,7 @@ void WMPickingDVR::moduleMain()
}
//WYSIWYP: Calculate the largest interval
if( strRenderMode == WMEDU_PICKING_WYSIWYP )
if( strRenderMode == WMPICKINGDVR_WYSIWYP )
{
//Fourth Order Finite Differencing by Daniel Gerlicher
unsigned int n = vecAlphaAcc.size();
......@@ -484,7 +484,7 @@ void WMPickingDVR::moduleMain()
//Rendering: update only if picked
if( bPickedPos )
{
#ifdef WMEDU_PICKING_DEBUG
#ifdef WMPICKINGDVR_DEBUG
debugLog() << "[dPickedAlpha = " << dPickedAlpha << "]"
<<"[posPicking][X = " << posPicking.x() << " ]"
<<"[Y = " << posPicking.y() << " ][Z = " << posPicking.z() << "]";
......
......@@ -30,14 +30,14 @@
#include "core/kernel/WModule.h"
//Debug Switch
//#define WMEDU_PICKING_DEBUG
//#define WMPICKINGDVR_DEBUG
//Module Defines
#define WMEDU_PICKING_MAX_INT "Picking - Maximum Intensity"
#define WMEDU_PICKING_FIRST_HIT "Picking - First Hit"
#define WMEDU_PICKING_THRESHOLD "Picking - Threshold"
#define WMEDU_PICKING_MOST_CONTRIBUTING "Picking - Most Contributing"
#define WMEDU_PICKING_WYSIWYP "Picking - WYSIWYP"
#define WMPICKINGDVR_MAX_INT "Picking - Maximum Intensity"
#define WMPICKINGDVR_FIRST_HIT "Picking - First Hit"
#define WMPICKINGDVR_THRESHOLD "Picking - Threshold"
#define WMPICKINGDVR_MOST_CONTRIBUTING "Picking - Most Contributing"
#define WMPICKINGDVR_WYSIWYP "Picking - WYSIWYP"
// forward declarations to reduce compile dependencies
......
......@@ -29,7 +29,7 @@
* Color converter for different scalings, i.e. [0,1] vs. [0,255]
*/
template <typename T>
class WMEDUColor
class WMPickingColor
{
private:
T red; //!< Red color component value
......@@ -41,7 +41,7 @@ public:
/**
* Standard constructor that creates transparent black.
*/
WMEDUColor();
WMPickingColor();
/**
* Constructor creating the color.
......@@ -51,7 +51,7 @@ public:
* \param blue blue color copmonent value
* \param alpha opacity component value
*/
WMEDUColor( T red, T green, T blue, T alpha );
WMPickingColor( T red, T green, T blue, T alpha );
/**
* Get red color component value.
......@@ -114,69 +114,69 @@ public:
template <typename T>
WMEDUColor<T>::WMEDUColor()
: WMEDUColor( 0.0, 0.0, 0.0, 0.0 )
WMPickingColor<T>::WMPickingColor()
: WMPickingColor( 0.0, 0.0, 0.0, 0.0 )
{
}
template <typename T>
WMEDUColor<T>::WMEDUColor( T red, T green, T blue, T alpha )
WMPickingColor<T>::WMPickingColor( T red, T green, T blue, T alpha )
: red( red ), green( green ), blue( blue ), alpha( alpha )
{
}
//Getter
template <typename T>
T WMEDUColor<T>::getRed()
T WMPickingColor<T>::getRed()
{
return this->red;
}
template <typename T>
T WMEDUColor<T>::getGreen()
T WMPickingColor<T>::getGreen()
{
return this->green;
}
template <typename T>
T WMEDUColor<T>::getBlue()
T WMPickingColor<T>::getBlue()
{
return this->blue;
}
template <typename T>
T WMEDUColor<T>::getAlpha()
T WMPickingColor<T>::getAlpha()
{
return this->alpha;
}
//Setter
template <typename T>
void WMEDUColor<T>::setRed( T red )
void WMPickingColor<T>::setRed( T red )
{
this->red = red;
}
template <typename T>
void WMEDUColor<T>::setGreen( T green )
void WMPickingColor<T>::setGreen( T green )
{
this->green = green;
}
template <typename T>
void WMEDUColor<T>::setBlue( T blue )
void WMPickingColor<T>::setBlue( T blue )
{
this->blue = blue;
}
template <typename T>
void WMEDUColor<T>::setAlpha( T alpha )
void WMPickingColor<T>::setAlpha( T alpha )
{
this->alpha = alpha;
}
template <typename T>
void WMEDUColor<T>::normalize()
void WMPickingColor<T>::normalize()
{
this->red = this->red / 255.0;
this->green = this->green / 255.0;
......
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