FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Kristofer Tingdahl, "the vertical bar is upside down, and hence not as the documentation says it should be. This is corrected with this patch"

Browse Source 
From Robert Osfield, changed the example so that the vertical and horizon scalar bars are rotated to the XZ plane so you can see them with the default viewer's camera orientation.
Tweaked the positioning of title text of vertic scalar bar to avoid overlap of text.
This commit is contained in:
Robert Osfield 2014-01-28 11:01:28 +00:00
parent 4f19237467
commit f7e6f0092c
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/osgscalarbar/osgscalarbar.cpp
View File

@ -98,7 +98,7 @@ osg::Node* createScalarBar(bool vertical)
if ( !vertical ) if ( !vertical )
{ {
sb->setPosition( osg::Vec3(0.5f,-0.5f,0)); sb->setPosition( osg::Vec3(0.5f,0.5f,0));
} }
return sb; return sb;
@ -145,10 +145,16 @@ int main(int , char **)
osgViewer::Viewer viewer; osgViewer::Viewer viewer;
osg::Group* group = new osg::Group; osg::Group* group = new osg::Group;
group->addChild(createScalarBar(true));
group->addChild(createScalarBar(false));
group->addChild(createScalarBar_HUD()); group->addChild(createScalarBar_HUD());
// rotate the scalar from XY plane to XZ so we see them viewing it with the default camera manipulators that look along the Y axis, with Z up.
osg::MatrixTransform* transform = new osg::MatrixTransform;
group->addChild(transform);
transform->setMatrix(osg::Matrix::rotate(osg::inDegrees(90.0),1.0,0.0,0.0));
transform->addChild(createScalarBar(true));
transform->addChild(createScalarBar(false));
// add model to viewer. // add model to viewer.
viewer.setSceneData( group ); viewer.setSceneData( group );

19
src/osgSim/ScalarBar.cpp
View File

@ -134,7 +134,7 @@ void ScalarBar::createDrawables()
} }
else else
{ {
matrix = osg::Matrix::rotate(osg::DegreesToRadians(90.0f),0.0f,0.0f,-1.0f) * osg::Matrix::translate(_position); matrix = osg::Matrix::rotate(osg::DegreesToRadians(90.0f),0.0f,0.0f,1.0f) * osg::Matrix::translate(_position);
} }
// 1. First the bar // 1. First the bar
@ -206,7 +206,10 @@ void ScalarBar::createDrawables()
std::vector<osgText::Text*> texts(_numLabels); // We'll need to collect pointers to these for later std::vector<osgText::Text*> texts(_numLabels); // We'll need to collect pointers to these for later
float labelIncr = (_numLabels>0) ? (_stc->getMax()-_stc->getMin())/(_numLabels-1) : 0.0f; float labelIncr = (_numLabels>0) ? (_stc->getMax()-_stc->getMin())/(_numLabels-1) : 0.0f;
float labelxIncr = (_numLabels>0) ? (_width)/(_numLabels-1) : 0.0f; float labelxIncr = (_numLabels>0) ? (_width)/(_numLabels-1) : 0.0f;
const float labely = arOffset + characterSize*CHARACTER_OFFSET_FACTOR; const float labelStickStartY = _orientation==HORIZONTAL ? arOffset : 0;
const float labelY = labelStickStartY +
(_orientation==HORIZONTAL ? characterSize : -characterSize) * CHARACTER_OFFSET_FACTOR;
for(i=0; i<_numLabels; ++i) for(i=0; i<_numLabels; ++i)
{ {
@ -217,7 +220,7 @@ void ScalarBar::createDrawables()
text->setCharacterSize(characterSize); text->setCharacterSize(characterSize);
text->setText(_sp->printScalar(_stc->getMin()+(i*labelIncr))); text->setText(_sp->printScalar(_stc->getMin()+(i*labelIncr)));
text->setPosition(osg::Vec3((i*labelxIncr), labely, 0.0f)*matrix); text->setPosition(osg::Vec3((i*labelxIncr), labelY, 0.0f)*matrix);
text->setAlignment( (_orientation==HORIZONTAL) ? osgText::Text::CENTER_BASE_LINE : osgText::Text::LEFT_CENTER); text->setAlignment( (_orientation==HORIZONTAL) ? osgText::Text::CENTER_BASE_LINE : osgText::Text::LEFT_CENTER);
addDrawable(text); addDrawable(text);
@ -240,16 +243,14 @@ void ScalarBar::createDrawables()
osg::Vec3 titlePos; osg::Vec3 titlePos;
if ( _orientation==HORIZONTAL ) if ( _orientation==HORIZONTAL )
{ {
const float titleY = (_numLabels>0) ? labely + characterSize : labely; const float titleY = (_numLabels>0) ? labelY + characterSize : labelY;
titlePos = osg::Vec3((_width/2.0f), titleY, 0.0f); titlePos = osg::Vec3((_width/2.0f), titleY, 0.0f);
} }
else else
{ {
titlePos = osg::Vec3( 0, arOffset/2, 0 ); titlePos = osg::Vec3(_width+characterSize*0.5, arOffset*0.5, 0 );
} }
float titleY = (_numLabels>0) ? labely + characterSize : labely;
// Position the title at the middle of the bar above any labels. // Position the title at the middle of the bar above any labels.
text->setPosition(titlePos*matrix); text->setPosition(titlePos*matrix);
text->setAlignment( text->setAlignment(
@ -279,8 +280,8 @@ void ScalarBar::createDrawables()
//Sticks //Sticks
for(i=0; i<_numLabels; ++i) for(i=0; i<_numLabels; ++i)
{ {
const osg::Vec3 p1(osg::Vec3((i*labelxIncr), arOffset, 0.0f)*matrix); const osg::Vec3 p1(osg::Vec3((i*labelxIncr), labelStickStartY, 0.0f)*matrix);
const osg::Vec3 p2(osg::Vec3((i*labelxIncr), labely, 0.0f)*matrix); const osg::Vec3 p2(osg::Vec3((i*labelxIncr), labelY, 0.0f)*matrix);
annotVertices->push_back( p1 ); annotVertices->push_back( p1 );
annotVertices->push_back( p2 ); annotVertices->push_back( p2 );
} }