Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
x3domlet
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Elphel
x3domlet
Commits
585f850e
Commit
585f850e
authored
Jul 23, 2018
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing alignment application
parent
13abc0ab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
leaflet.camera-view-marker.measure.js
js/leaflet/leaflet.camera-view-marker.measure.js
+2
-0
ui_align.js
js/ui_align.js
+4
-4
No files found.
js/leaflet/leaflet.camera-view-marker.measure.js
View file @
585f850e
...
@@ -337,6 +337,8 @@
...
@@ -337,6 +337,8 @@
this
.
_slidingMarker
.
setLatLng
(
p2_ll
);
this
.
_slidingMarker
.
setLatLng
(
p2_ll
);
this
.
_slidingLine
.
setLatLngs
(
l_d
);
this
.
_slidingLine
.
setLatLngs
(
l_d
);
this
.
_slidingMarker
.
setTooltipContent
(
distance
.
toFixed
(
1
)
+
' m'
);
this
.
_slidingMarker
.
setTooltipContent
(
distance
.
toFixed
(
1
)
+
' m'
);
// close
this
.
_slidingMarker
.
closeTooltip
();
}
}
...
...
js/ui_align.js
View file @
585f850e
...
@@ -248,12 +248,12 @@ function apply_alignment_dialog_hll(xyh0,xyh1,c,e,de){
...
@@ -248,12 +248,12 @@ function apply_alignment_dialog_hll(xyh0,xyh1,c,e,de){
*/
*/
function
apply_alignment_hll
(
xyh
){
function
apply_alignment_hll
(
xyh
){
//console.log("Applying Ze Alignment!");
for
(
var
i
=
0
;
i
<
xyh
.
length
;
i
++
){
for
(
var
i
=
0
;
i
<
xyh
.
length
;
i
++
){
xyh
[
i
]
=
parseFloat
(
xyh
[
i
]);
xyh
[
i
]
=
parseFloat
(
xyh
[
i
]);
}
}
var
Camera
=
Map
.
marker
;
Data
.
camera
.
heading
=
xyh
[
2
];
Data
.
camera
.
heading
=
xyh
[
2
];
Data
.
camera
.
latitude
=
xyh
[
0
];
Data
.
camera
.
latitude
=
xyh
[
0
];
Data
.
camera
.
longitude
=
xyh
[
1
];
Data
.
camera
.
longitude
=
xyh
[
1
];
...
@@ -268,10 +268,10 @@ function apply_alignment_hll(xyh){
...
@@ -268,10 +268,10 @@ function apply_alignment_hll(xyh){
Map
.
marker
.
_syncMeasureMarkersToBasePoint
();
Map
.
marker
.
_syncMeasureMarkersToBasePoint
();
//update on 3d
//update on 3d
var
p1_ll
=
Camera
.
_latlng
;
var
p1_ll
=
Map
.
marker
.
_latlng
;
for
(
var
i
=
0
;
i
<
Data
.
markers
.
length
;
i
++
){
for
(
var
i
=
0
;
i
<
Data
.
markers
.
length
;
i
++
){
var
p2_ll
=
Camera
.
_measureMarkers
[
i
].
_latlng
;
var
p2_ll
=
Map
.
marker
.
_measureMarkers
[
i
].
_latlng
;
leaf_update_x3dom_marker
(
p1_ll
,
p2_ll
,
i
);
leaf_update_x3dom_marker
(
p1_ll
,
p2_ll
,
i
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment