rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

LP-29 some Qml property renaming

Browse Source
This commit is contained in:
Philippe Renon 2016-03-21 22:06:44 +01:00
parent c16fc656aa
commit fd9615b1ab
8 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.hpp
View File

@ -37,10 +37,8 @@
namespace osgQtQuick {
class OSGQTQUICK_EXPORT OSGGeoTransformNode : public OSGNode {
Q_OBJECT
// TODO rename to sceneNode
Q_PROPERTY(osgQtQuick::OSGNode *modelData READ childNode WRITE setChildNode NOTIFY childNodeChanged)
// TODO rename to earthNode
Q_PROPERTY(osgQtQuick::OSGNode * sceneData READ sceneNode WRITE setSceneNode NOTIFY sceneNodeChanged)
Q_PROPERTY(osgQtQuick::OSGNode *childNode READ childNode WRITE setChildNode NOTIFY childNodeChanged)
Q_PROPERTY(osgQtQuick::OSGNode * sceneNode READ sceneNode WRITE setSceneNode NOTIFY sceneNodeChanged)
Q_PROPERTY(bool clampToTerrain READ clampToTerrain WRITE setClampToTerrain NOTIFY clampToTerrainChanged)
Q_PROPERTY(bool intoTerrain READ intoTerrain NOTIFY intoTerrainChanged)
Q_PROPERTY(QVector3D position READ position WRITE setPosition NOTIFY positionChanged)

3
ground/gcs/src/libs/osgearth/osgQtQuick/OSGSkyNode.hpp
View File

@ -46,8 +46,7 @@ namespace osgQtQuick {
class OSGViewport;
class OSGQTQUICK_EXPORT OSGSkyNode : public OSGNode {
// TODO rename to sceneNode
Q_OBJECT Q_PROPERTY(osgQtQuick::OSGNode *sceneData READ sceneNode WRITE setSceneNode NOTIFY sceneNodeChanged)
Q_OBJECT Q_PROPERTY(osgQtQuick::OSGNode *sceneNode READ sceneNode WRITE setSceneNode NOTIFY sceneNodeChanged)
Q_PROPERTY(osgQtQuick::OSGViewport * viewport READ viewport WRITE setViewport NOTIFY viewportChanged)
Q_PROPERTY(bool sunLightEnabled READ sunLightEnabled WRITE setSunLightEnabled NOTIFY sunLightEnabledChanged)
Q_PROPERTY(QDateTime dateTime READ dateTime WRITE setDateTime NOTIFY dateTimeChanged)

3
ground/gcs/src/libs/osgearth/osgQtQuick/OSGTransformNode.hpp
View File

@ -37,8 +37,7 @@
namespace osgQtQuick {
class OSGQTQUICK_EXPORT OSGTransformNode : public OSGNode {
Q_OBJECT
// TODO rename to childNode
Q_PROPERTY(osgQtQuick::OSGNode *modelData READ childNode WRITE setChildNode NOTIFY childNodeChanged)
Q_PROPERTY(osgQtQuick::OSGNode *childNode READ childNode WRITE setChildNode NOTIFY childNodeChanged)
Q_PROPERTY(QVector3D scale READ scale WRITE setScale NOTIFY scaleChanged)
Q_PROPERTY(QVector3D attitude READ attitude WRITE setAttitude NOTIFY attitudeChanged)
Q_PROPERTY(QVector3D position READ position WRITE setPosition NOTIFY positionChanged)

2
ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.hpp
View File

@ -51,7 +51,7 @@ public:
};
class OSGQTQUICK_EXPORT OSGViewport : public QQuickFramebufferObject {
Q_OBJECT Q_PROPERTY(osgQtQuick::OSGNode *sceneData READ sceneNode WRITE setSceneNode NOTIFY sceneNodeChanged)
Q_OBJECT Q_PROPERTY(osgQtQuick::OSGNode *sceneNode READ sceneNode WRITE setSceneNode NOTIFY sceneNodeChanged)
Q_PROPERTY(osgQtQuick::OSGCamera * camera READ cameraNode WRITE setCameraNode NOTIFY cameraNodeChanged)
Q_PROPERTY(osgQtQuick::OSGCameraManipulator * manipulator READ manipulator WRITE setManipulator NOTIFY manipulatorChanged)
Q_PROPERTY(osgQtQuick::UpdateMode::Enum updateMode READ updateMode WRITE setUpdateMode NOTIFY updateModeChanged)

4
ground/gcs/src/share/qml/EarthView.qml
View File

@ -32,7 +32,7 @@ Item {
anchors.fill: parent
focus: true
sceneData: skyNode
sceneNode: skyNode
camera: camera
manipulator: earthManipulator
@ -47,7 +47,7 @@ Item {
OSGSkyNode {
id: skyNode
sceneData: terrainNode
sceneNode: terrainNode
viewport: osgViewport
dateTime: Utils.getDateTime()
minimumAmbientLight: pfdContext.minimumAmbientLight

10
ground/gcs/src/share/qml/model/ModelTerrainView.qml
View File

@ -32,7 +32,7 @@ OSGViewport {
anchors.fill: parent
focus: true
sceneData: skyNode
sceneNode: skyNode
camera: camera
manipulator: nodeTrackerManipulator
@ -52,7 +52,7 @@ OSGViewport {
OSGSkyNode {
id: skyNode
sceneData: sceneGroup
sceneNode: sceneGroup
viewport: osgViewport
dateTime: Utils.getDateTime()
minimumAmbientLight: pfdContext.minimumAmbientLight
@ -66,8 +66,8 @@ OSGViewport {
OSGGeoTransformNode {
id: modelNode
modelData: modelTransformNode
sceneData: terrainFileNode
childNode: modelTransformNode
sceneNode: terrainFileNode
clampToTerrain: true
@ -76,7 +76,7 @@ OSGViewport {
OSGTransformNode {
id: modelTransformNode
modelData: modelFileNode
childNode: modelFileNode
// model dimensions are in mm, scale to meters
scale: Qt.vector3d(0.001, 0.001, 0.001)
attitude: UAV.attitude()

4
ground/gcs/src/share/qml/model/ModelView.qml
View File

@ -29,7 +29,7 @@ Item {
anchors.fill: parent
focus: true
sceneData: sceneNode
sceneNode: sceneNode
camera: camera
manipulator: trackballManipulator
@ -58,7 +58,7 @@ Item {
OSGTransformNode {
id: transformNode
modelData: fileNode
childNode: fileNode
attitude: UAV.attitude()
}

4
ground/gcs/src/share/qml/pfd/PfdTerrainView.qml
View File

@ -31,7 +31,7 @@ OSGViewport {
//anchors.fill: parent
focus: true
sceneData: skyNode
sceneNode: skyNode
camera: camera
manipulator: geoTransformManipulator
@ -62,7 +62,7 @@ OSGViewport {
OSGSkyNode {
id: skyNode
sceneData: terrainFileNode
sceneNode: terrainFileNode
viewport: osgViewport
dateTime: Utils.getDateTime()
minimumAmbientLight: pfdContext.minimumAmbientLight