Commit 3b3a2a0d authored by Alexander Wiebel's avatar Alexander Wiebel
Browse files

[ADD] property allowing to turn of continuous drawing when selecting lines

parent ec8560a3
......@@ -103,7 +103,7 @@ void WMPickingDVR::properties()
{
m_selectionTypesList = boost::shared_ptr< WItemSelection >( new WItemSelection() );
m_selectionTypesList->addItem( "Position (Picking)" );
m_selectionTypesList->addItem( "Line (Simple)" );
m_selectionTypesList->addItem( "Line (First Hit)" );
m_selectionTypesList->addItem( "Line (VisiTrace) [NOT YET CORRECTLY IMPLEMENTED]" );
m_selectionType = m_properties->addProperty( "Selection type",
"What type of structure is to be selected in the DVR?",
......@@ -125,6 +125,10 @@ void WMPickingDVR::properties()
true,
m_propCondition );
m_continuousDrawing = m_properties->addProperty( "Continuous drawing",
"Should line be shown during drawing action?",
true,
m_propCondition );
m_lineColor = m_properties->addProperty( "Line color",
"Color of line/s indicating selected position/s.",
......@@ -232,10 +236,10 @@ void WMPickingDVR::moduleMain()
pickingMode = m_pickingCriteriaCur->get( true ).at( 0 )->getName();
debugLog() << pickingMode;
}
else if( selectionType == 1 ) // Line (Simple)
else if( selectionType == 1 ) // Line (First Hit)
{
pickingMode = WMPICKINGDVR_FIRST_HIT;
debugLog() << "Line (Simple)";
debugLog() << "Line (First Hit)";
}
else if( selectionType == 2 ) // VisiTrace
{
......@@ -268,7 +272,11 @@ void WMPickingDVR::moduleMain()
m_curve3D.push_back( posPicking );
}
updateCurveRendering();
if( m_continuousDrawing->get()
|| !m_pickInProgress )
{
updateCurveRendering();
}
if( m_pickInProgress )
{
......@@ -350,11 +358,13 @@ void WMPickingDVR::updateModuleGUI( std::string pickingMode )
{
m_pickingCriteriaCur->setHidden( false );
m_crossSize->setHidden( false );
m_continuousDrawing->setHidden( true );
}
else
{
m_pickingCriteriaCur->setHidden( true );
m_crossSize->setHidden( true );
m_continuousDrawing->setHidden( false );
}
}
......
......@@ -179,6 +179,8 @@ private:
WPropBool m_triggerCalculation; //!< Trigger Property, will be triggered by the pickhandle
WPropBool m_continuousDrawing; //!< Should line be shown during drawing acrion?
WPropSelection m_selectionType; //!< Property determining what type of structure will be selected
boost::shared_ptr< WItemSelection > m_selectionTypesList; //!< List of selection types for \ref m_selectionType
......
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