Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Eric Duminil
RegionChooser
Commits
e9082330
Commit
e9082330
authored
Mar 08, 2018
by
Eric Duminil
Browse files
RegionChooser: Wait until window is ready.
parent
38f904fd
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/eu/simstadt/regionchooser/RegionChooserBrowser.java
View file @
e9082330
...
@@ -194,10 +194,7 @@ public RegionChooserBrowser() {
...
@@ -194,10 +194,7 @@ public RegionChooserBrowser() {
if
(
newState
==
State
.
SUCCEEDED
)
{
if
(
newState
==
State
.
SUCCEEDED
)
{
JSObject
win
=
(
JSObject
)
webEngine
.
executeScript
(
"window"
);
JSObject
win
=
(
JSObject
)
webEngine
.
executeScript
(
"window"
);
win
.
setMember
(
"fxapp"
,
fxapp
);
win
.
setMember
(
"fxapp"
,
fxapp
);
webEngine
.
executeScript
(
"console.log = function(message)\n"
+
win
.
call
(
"ready"
);
"{\n"
+
" fxapp.log(message);\n"
+
"};"
);
try
{
try
{
fxapp
.
importNovaFactoryBoundingBoxes
();
fxapp
.
importNovaFactoryBoundingBoxes
();
}
catch
(
Exception
ex
)
{
}
catch
(
Exception
ex
)
{
...
...
src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
View file @
e9082330
...
@@ -159,10 +159,9 @@ var draw = new ol.interaction.Draw({
...
@@ -159,10 +159,9 @@ var draw = new ol.interaction.Draw({
map
.
addInteraction
(
draw
);
map
.
addInteraction
(
draw
);
var
sketch
;
var
sketch
;
var
fromJavaFX
;
var
fromJavaFX
=
false
;
//Can be overwritten later if launched from JavaFX
draw
.
on
(
'
drawstart
'
,
function
(
evt
)
{
draw
.
on
(
'
drawstart
'
,
function
(
evt
)
{
fromJavaFX
=
(
typeof
fxapp
!==
'
undefined
'
);
sketch
=
evt
.
feature
;
sketch
=
evt
.
feature
;
reset_btn
.
disabled
=
false
;
reset_btn
.
disabled
=
false
;
updateGMLPolygons
();
updateGMLPolygons
();
...
@@ -333,4 +332,13 @@ function focusOnMap() {
...
@@ -333,4 +332,13 @@ function focusOnMap() {
// $('#map').scrollIntoView();
// $('#map').scrollIntoView();
}
}
// Executed by JavaFX when whole page is loaded.
window
.
ready
=
function
()
{
fromJavaFX
=
true
;
console
.
log
=
function
(
message
){
fxapp
.
log
(
message
);
}
console
.
log
(
"
READY!
"
);
}
focusOnMap
();
focusOnMap
();
\ No newline at end of file
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