Commit 0daf96c1 authored by Tobias Liese's avatar Tobias Liese

updated to quaarkus 1.3.0.Final

parent 90bf3de6
Pipeline #96522 failed with stages
in 15 minutes and 29 seconds
#Gradle properties #Gradle properties
#Tue Feb 11 17:11:23 UTC 2020 #Tue Feb 11 17:11:23 UTC 2020
quarkusPluginVersion=1.3.0.CR2 quarkusPluginVersion=1.3.0.Final
quarkusPlatformArtifactId=quarkus-bom quarkusPlatformArtifactId=quarkus-bom
quarkusPlatformVersion=1.3.0.CR2 quarkusPlatformVersion=1.3.0.Final
quarkusPlatformGroupId=io.quarkus quarkusPlatformGroupId=io.quarkus
Mrz 12, 2020 12:50:39 NACHM. com.redhat.quarkus.ls.QuarkusLanguageServer initialize
INFORMATION: Initializing Quarkus server 0.0.4-20191120-1547 with C:\Users\tobia\AppData\Local\JetBrains\Toolbox\apps\IDEA-U\ch-0\201.6073.9\jbr
Mrz 12, 2020 12:54:58 NACHM. com.redhat.quarkus.ls.QuarkusLanguageServer initialize
INFORMATION: Initializing Quarkus server 0.0.4-20191120-1547 with C:\Users\tobia\AppData\Local\JetBrains\Toolbox\apps\IDEA-U\ch-0\201.6073.9\jbr
Mrz 12, 2020 4:08:59 NACHM. com.redhat.quarkus.ls.QuarkusLanguageServer initialize
INFORMATION: Initializing Quarkus server 0.0.4-20191120-1547 with C:\Users\tobia\AppData\Local\JetBrains\Toolbox\apps\IDEA-U\ch-0\201.6073.9\jbr
Mrz 13, 2020 7:58:56 VORM. com.redhat.quarkus.ls.QuarkusLanguageServer initialize
INFORMATION: Initializing Quarkus server 0.0.4-20191120-1547 with C:\Users\tobia\AppData\Local\JetBrains\Toolbox\apps\IDEA-U\ch-0\201.6073.9\jbr
Mrz 13, 2020 9:15:07 VORM. com.redhat.quarkus.ls.QuarkusLanguageServer initialize
INFORMATION: Initializing Quarkus server 0.0.4-20191120-1547 with C:\Users\tobia\AppData\Local\JetBrains\Toolbox\apps\IDEA-U\ch-0\201.6251.22\jbr
Mrz 13, 2020 3:45:10 NACHM. com.redhat.quarkus.ls.QuarkusLanguageServer initialize
INFORMATION: Initializing Quarkus server 0.0.4-20191120-1547 with C:\Users\tobia\AppData\Local\JetBrains\Toolbox\apps\IDEA-U\ch-0\201.6251.22\jbr
Mrz 14, 2020 7:26:31 VORM. com.redhat.quarkus.ls.QuarkusLanguageServer initialize
INFORMATION: Initializing Quarkus server 0.0.4-20191120-1547 with C:\Users\tobia\AppData\Local\JetBrains\Toolbox\apps\IDEA-U\ch-0\201.6251.22\jbr
...@@ -165,8 +165,10 @@ class Transition { ...@@ -165,8 +165,10 @@ class Transition {
let p1 = [this.origin.x, this.origin.y]; let p1 = [this.origin.x, this.origin.y];
let p2 = [this.destination.x, this.destination.y]; let p2 = [this.destination.x, this.destination.y];
let sum = Math.abs((p2[1] - p1[1]) * pos[0] - (p2[0] - p1[0]) * pos[1] + p2[0] * p1[1] - p2[1] * p1[0]); let sum = Math.abs((p2[1] - p1[1]) * pos[0] - (p2[0] - p1[0]) * pos[1] + p2[0] * p1[1] - p2[1] * p1[0]);
let distance = sum / Math.sqrt(Math.pow(p2[1] - p1[1], 2) + Math.pow(p2[0] - p1[0], 1)); let distance = sum / Math.sqrt(Math.pow(p2[1] - p1[1], 2) + Math.pow(p2[0] - p1[0], 2));
return pos[0] > Math.min(p1[0], p2[0]) && pos[1] > Math.min(p1[1], p2[1]) && distance <= 160; return (pos[0] > Math.min(p1[0], p2[0]) && pos[1] > Math.min(p1[1], p2[1]) &&
pos[0] < Math.max(p1[0], p2[0]) && pos[1] < Math.max(p1[1], p2[1]) &&
distance <= 10);
case TransitionType.QUADRATIC: case TransitionType.QUADRATIC:
break; break;
case TransitionType.BEZIER: case TransitionType.BEZIER:
......
...@@ -223,14 +223,20 @@ class Transition implements FieldObject { ...@@ -223,14 +223,20 @@ class Transition implements FieldObject {
let p1: number[] = [this.origin.x, this.origin.y] let p1: number[] = [this.origin.x, this.origin.y]
let p2: number[] = [this.destination.x, this.destination.y] let p2: number[] = [this.destination.x, this.destination.y]
let sum = Math.abs((p2[1] - p1[1]) * pos[0] - (p2[0] - p1[0]) * pos[1] + p2[0] * p1[1] - p2[1] * p1[0]) let sum = Math.abs((p2[1] - p1[1]) * pos[0] - (p2[0] - p1[0]) * pos[1] + p2[0] * p1[1] - p2[1] * p1[0])
let distance = sum / Math.sqrt(Math.pow(p2[1] - p1[1], 2) + Math.pow(p2[0] - p1[0], 1)) let distance = sum / Math.sqrt(Math.pow(p2[1] - p1[1], 2) + Math.pow(p2[0] - p1[0], 2))
return pos[0] > Math.min(p1[0], p2[0]) && pos[1] > Math.min(p1[1], p2[1]) && distance <= 160 // brute forced value possibly a better solution return (
// make sure line is within states borders:
pos[0] > Math.min(p1[0], p2[0]) && pos[1] > Math.min(p1[1], p2[1]) &&
pos[0] < Math.max(p1[0], p2[0]) && pos[1] < Math.max(p1[1], p2[1]) &&
distance <= 10
)
case TransitionType.QUADRATIC: case TransitionType.QUADRATIC:
// looks like the easiest way is to handle this as a bezier curve 2. grade
break; break;
case TransitionType.BEZIER: // This is really complex to calc case TransitionType.BEZIER: // This is really complex to calc maybe using WebAssembly is sensible
break; //
break
} }
return false return false
} }
...@@ -274,7 +280,7 @@ onmousemove = (event: MouseEvent) => { ...@@ -274,7 +280,7 @@ onmousemove = (event: MouseEvent) => {
if (dragMode && lastSelected instanceof State) { if (dragMode && lastSelected instanceof State) {
lastSelected.update(x, y, null) lastSelected.update(x, y, null)
} else if (transitionMode) { } else if (transitionMode) {
field.rePaint() // remove the previous line field.rePaint() // remove the previous drawn line
if (selected != null && selected != lastSelected) if (selected != null && selected != lastSelected)
document.body.style.cursor = "pointer" document.body.style.cursor = "pointer"
else else
...@@ -344,9 +350,9 @@ let webSocket = new WebSocket( ...@@ -344,9 +350,9 @@ let webSocket = new WebSocket(
webSocket.onopen = function () { webSocket.onopen = function () {
webSocket.send("{object: 'automaton', command: 'join', id: 'test'") webSocket.send("{object: 'automaton', command: 'join', id: 'test'")
} }
webSocket.onerror = function (event) { webSocket.onerror = function (event: Event) {
console.error(event) console.error(event)
} }
webSocket.onmessage = function (message) { webSocket.onmessage = function (message: MessageEvent) {
console.log(message) console.log(message)
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment