Skip to content

Commit 986b657

Browse files
authored
Merge pull request #65 from rock-core/transformerroot
make the root of the transformer display selectable
2 parents e8e4060 + 752eba0 commit 986b657

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/Vizkit3DWidget.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ bool Vizkit3DConfig::isAxesLabels() const
128128
return getWidget()->isAxesLabels();
129129
}
130130

131+
void Vizkit3DConfig::setTransformerRootFrame (const QStringList &frames) {
132+
return getWidget()->setRootFrame(frames.front());
133+
}
134+
131135
namespace
132136
{
133137
struct ManipulatorDefinition
@@ -924,6 +928,7 @@ void Vizkit3DWidget::setTransformation(const QString &source_frame,const QString
924928
registerClickHandler(target_frame.toStdString());
925929

926930
emit propertyChanged("frame");
931+
emit propertyChanged("transformerroot");
927932
// first: VizPluginBase*
928933
// second: osg::ref_ptr<osg::Group>
929934

src/Vizkit3DWidget.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ namespace vizkit3d
152152
Q_PROPERTY( bool axes_labels READ isAxesLabels WRITE setAxesLabels)
153153
Q_PROPERTY( QColor background READ getBackgroundColor WRITE setBackgroundColor)
154154
Q_PROPERTY( QStringList frame READ getVisualizationFrames WRITE setVisualizationFrame)
155+
Q_PROPERTY( QStringList transformerroot READ getVisualizationFrames WRITE setTransformerRootFrame)
155156
Q_PROPERTY( bool environment READ isEnvironmentPluginEnabled WRITE setEnvironmentPluginEnabled)
156157
Q_PROPERTY( bool transformer READ isTransformer WRITE setTransformer)
157158
Q_ENUMS( CAMERA_MANIPULATORS )
@@ -186,6 +187,8 @@ namespace vizkit3d
186187
QColor getBackgroundColor()const;
187188
void setBackgroundColor(QColor color);
188189

190+
void setTransformerRootFrame (const QStringList &frames);
191+
189192
/** Converts a manipulator ID to its name */
190193
static QString manipulatorIDToName(CAMERA_MANIPULATORS id);
191194
/** Converts a manipulator name to its ID */

0 commit comments

Comments
 (0)