File tree 5 files changed +19
-0
lines changed
5 files changed +19
-0
lines changed Original file line number Diff line number Diff line change @@ -28,6 +28,9 @@ FocusScope {
28
28
property bool enable8bitViewer: enable8bitViewerAction .checked
29
29
property bool enableSequencePlayer: enableSequencePlayerAction .checked
30
30
31
+ readonly property alias imgContainer: imgContainer
32
+ readonly property alias imgLayout: imgLayout
33
+
31
34
QtObject {
32
35
id: m
33
36
property variant viewpointMetadata: {
Original file line number Diff line number Diff line change @@ -21,6 +21,8 @@ Entity {
21
21
property Layer frontLayerComponent
22
22
property var window
23
23
24
+ property var viewer2DInfo: null
25
+
24
26
// / Camera to consider for positioning
25
27
property Camera camera: null
26
28
@@ -225,6 +227,7 @@ Entity {
225
227
camera: root .camera
226
228
renderMode: root .renderMode
227
229
enabled: visible
230
+ viewer2DInfo: root .viewer2DInfo
228
231
229
232
// QObject.destroyed signal is not accessible
230
233
// Use the object as NodeInstantiator model to be notified of its deletion
Original file line number Diff line number Diff line change @@ -20,6 +20,8 @@ import Utils 1.0
20
20
property var object: null
21
21
property int renderMode
22
22
23
+ property var viewer2DInfo: null
24
+
23
25
// / Scene's current camera
24
26
property Camera camera: null
25
27
@@ -91,6 +93,7 @@ import Utils 1.0
91
93
' pointSize' : Qt .binding (function () { return 0.01 * Viewer3DSettings .pointSize }),
92
94
' locatorScale' : Qt .binding (function () { return Viewer3DSettings .cameraScale }),
93
95
' viewId' : Qt .binding (function () { return _reconstruction .selectedViewId }),
96
+ ' viewer2DInfo' : Qt .binding (function () {return root .viewer2DInfo }),
94
97
' cameraPickingEnabled' : Qt .binding (function () { return root .enabled })
95
98
});
96
99
Original file line number Diff line number Diff line change @@ -29,6 +29,8 @@ FocusScope {
29
29
readonly property var viewpoint: _reconstruction ? _reconstruction .selectedViewpoint : null
30
30
readonly property bool doSyncViewpointCamera: Viewer3DSettings .syncViewpointCamera && (viewpoint && viewpoint .isReconstructed )
31
31
32
+ property alias viewer2DInfo: mediaLibrary .viewer2DInfo
33
+
32
34
// functions
33
35
function resetCameraPosition () {
34
36
mainCamera .position = defaultCamPosition;
Original file line number Diff line number Diff line change @@ -206,6 +206,14 @@ Item {
206
206
Viewer3D {
207
207
id: c_viewer3D
208
208
209
+ viewer2DInfo: {
210
+ " x" : viewer2D .imgContainer .x ,
211
+ " y" : viewer2D .imgContainer .y ,
212
+ " width" : viewer2D .imgLayout .width ,
213
+ " height" : viewer2D .imgLayout .height ,
214
+ " scale" : viewer2D .imgContainer .scale
215
+ }
216
+
209
217
Layout .fillWidth : true
210
218
Layout .fillHeight : true
211
219
Layout .minimumWidth : 20
You can’t perform that action at this time.
0 commit comments