Skip to content

Commit

Permalink
Merge pull request #1 from wjwwood/patch-2
Browse files Browse the repository at this point in the history
fix whitespace
  • Loading branch information
Eruditass authored and Eruditass committed May 2, 2014
2 parents da65219 + 7575b75 commit 6408f12
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions src/rviz/default_plugin/point_cloud_common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,28 +190,28 @@ void PointCloudSelectionHandler::createProperties( const Picked& obj, Property*
}
if( name == "rgb" )
{
uint32_t val;
// float is still just packed uint8s, so prevent static_cast from manipulating data
if (f.datatype == sensor_msgs::PointField::FLOAT32)
{
float raw_val = valueFromCloud<float>( message, f.offset, f.datatype, message->point_step, index );
val = *(reinterpret_cast<uint32_t*>(&raw_val));
}
else
{
val = valueFromCloud<uint32_t>( message, f.offset, f.datatype, message->point_step, index );
}
// Mask out any information stored in the upper 8 bits
uint32_t val;

// float is still just packed uint8s, so prevent static_cast from manipulating data
if (f.datatype == sensor_msgs::PointField::FLOAT32)
{
float raw_val = valueFromCloud<float>( message, f.offset, f.datatype, message->point_step, index );
val = *(reinterpret_cast<uint32_t*>(&raw_val));
}
else
{
val = valueFromCloud<uint32_t>( message, f.offset, f.datatype, message->point_step, index );
}

// Mask out any information stored in the upper 8 bits
ColorProperty* prop = new ColorProperty( QString( "%1: %2" ).arg( field ).arg( QString::fromStdString( name )),
QColor( (val >> 16) & 0xff, (val >> 8) & 0xff, val & 0xff ), "", cat );
QColor( (val >> 16) & 0xff, (val >> 8) & 0xff, val & 0xff ), "", cat );
prop->setReadOnly( true );
}
else
{
float val = valueFromCloud<float>( message, f.offset, f.datatype, message->point_step, index );

FloatProperty* prop = new FloatProperty( QString( "%1: %2" ).arg( field ).arg( QString::fromStdString( name )),
val, "", cat );
prop->setReadOnly( true );
Expand Down

0 comments on commit 6408f12

Please sign in to comment.