Commit 7a09f5fe authored by Alexander Wiebel's avatar Alexander Wiebel
Browse files

[STYLE]

parent 27006915
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
#VERSION=1.2.0+git1234 -> here, revision number was set by the build scripts for example. #VERSION=1.2.0+git1234 -> here, revision number was set by the build scripts for example.
# The current version string: # The current version string:
VERSION=0.5.0 VERSION=0.6.0
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// //
// Project: OpenWalnut ( http://www.openwalnut.org ) // Project: OpenWalnut ( http://www.openwalnut.org )
// //
// Copyright 2013-2014 Andreas Schwarzkopf, OpenWalnut Community // Copyright 2013-2014 Andreas Schwarzkopf, 2017 OpenWalnut Community
// For more information see http://www.openwalnut.org/copying // For more information see http://www.openwalnut.org/copying
// //
// This file is part of OpenWalnut. // This file is part of OpenWalnut.
...@@ -66,7 +66,7 @@ const char** WMReadLAS::getXPMIcon() const ...@@ -66,7 +66,7 @@ const char** WMReadLAS::getXPMIcon() const
const std::string WMReadLAS::getName() const const std::string WMReadLAS::getName() const
{ {
return "Read LAS"; return "Read LAS [LiDAR toolbox]";
} }
const std::string WMReadLAS::getDescription() const const std::string WMReadLAS::getDescription() const
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// //
// Project: OpenWalnut ( http://www.openwalnut.org ) // Project: OpenWalnut ( http://www.openwalnut.org )
// //
// Copyright 2013-2014 Andreas Schwarzkopf, OpenWalnut Community // Copyright 2013-2014 Andreas Schwarzkopf, 2017 OpenWalnut Community
// For more information see http://www.openwalnut.org/copying // For more information see http://www.openwalnut.org/copying
// //
// This file is part of OpenWalnut. // This file is part of OpenWalnut.
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <string> #include <string>
#include <fstream> // std::ifstream #include <fstream> // std::ifstream
#include <iostream> // std::cout
#include <vector> #include <vector>
#include <osg/Geometry> #include <osg/Geometry>
...@@ -71,14 +70,14 @@ const std::string WMTempRandomPoints::getName() const ...@@ -71,14 +70,14 @@ const std::string WMTempRandomPoints::getName() const
const std::string WMTempRandomPoints::getDescription() const const std::string WMTempRandomPoints::getDescription() const
{ {
return "Crops point data to a selection."; return "Generates random set of points.";
} }
void WMTempRandomPoints::connectors() void WMTempRandomPoints::connectors()
{ {
m_output = boost::shared_ptr< WModuleOutputData< WDataSetPoints > >( m_output = boost::shared_ptr< WModuleOutputData< WDataSetPoints > >(
new WModuleOutputData< WDataSetPoints >( new WModuleOutputData< WDataSetPoints >(
shared_from_this(), "points", "The loaded points." ) ); shared_from_this(), "points", "Generated points" ) );
addConnector( m_output ); addConnector( m_output );
WModule::connectors(); WModule::connectors();
...@@ -88,13 +87,13 @@ void WMTempRandomPoints::properties() ...@@ -88,13 +87,13 @@ void WMTempRandomPoints::properties()
{ {
m_groupRandomPointGenerator = m_properties->addPropertyGroup( "Random point generator settings", m_groupRandomPointGenerator = m_properties->addPropertyGroup( "Random point generator settings",
"Options that are applied on the random point generator." ); "Options that are applied on the random point generator." );
m_isSphericalSpace = m_groupRandomPointGenerator->addProperty( "Is spherical: ", "Organize points in a spherical space.", m_isSphericalSpace = m_groupRandomPointGenerator->addProperty( "Is spherical", "Organize points in a spherical space.",
false, m_propCondition ); false, m_propCondition );
m_pointCount = m_groupRandomPointGenerator->addProperty( "Random point count: ", "Count of random points.", m_pointCount = m_groupRandomPointGenerator->addProperty( "Random point count", "Count of random points.",
5, m_propCondition ); 5, m_propCondition );
m_pointCount->setMin( 1 ); m_pointCount->setMin( 1 );
m_pointCount->setMax( 1000 ); m_pointCount->setMax( 100000 );
m_initRandomNumber = m_groupRandomPointGenerator->addProperty( "Init. random: ", "Number that initializes the " m_initRandomNumber = m_groupRandomPointGenerator->addProperty( "Init. random", "Number that initializes the "
"random number generator.", 234.0, m_propCondition ); "random number generator.", 234.0, m_propCondition );
m_initRandomNumber->setMin( 0.0 ); m_initRandomNumber->setMin( 0.0 );
m_initRandomNumber->setMax( 1000.0 ); m_initRandomNumber->setMax( 1000.0 );
...@@ -151,7 +150,7 @@ boost::shared_ptr< WDataSetPoints > WMTempRandomPoints::getRandomPoints() ...@@ -151,7 +150,7 @@ boost::shared_ptr< WDataSetPoints > WMTempRandomPoints::getRandomPoints()
WDataSetPoints::ColorArray outColors( WDataSetPoints::ColorArray outColors(
new WDataSetPoints::ColorArray::element_type() ); new WDataSetPoints::ColorArray::element_type() );
std::cout << std::endl << "Applying point set:" << std::endl; infoLog() << std::endl << "Applying point set:" << std::endl;
m_currentRandomNumber = m_initRandomNumber->get(); m_currentRandomNumber = m_initRandomNumber->get();
double colorIntensity = 0.8; double colorIntensity = 0.8;
size_t count = m_pointCount->get(); size_t count = m_pointCount->get();
......
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