diff --git a/build/application.linux-arm64/lib/ontology.jar b/build/application.linux-arm64/lib/ontology.jar index f218851..75ca767 100644 Binary files a/build/application.linux-arm64/lib/ontology.jar and b/build/application.linux-arm64/lib/ontology.jar differ diff --git a/build/application.linux-arm64/source/gui.pde b/build/application.linux-arm64/source/gui.pde index 4b9de3a..ed683a3 100644 --- a/build/application.linux-arm64/source/gui.pde +++ b/build/application.linux-arm64/source/gui.pde @@ -1,8 +1,14 @@ int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -13,6 +19,7 @@ void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -62,14 +69,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -78,23 +87,17 @@ class Button { label = label_; w = int(textWidth(label))+18; h = 32; + active = true; } void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} diff --git a/build/application.linux-arm64/source/ontology.java b/build/application.linux-arm64/source/ontology.java index cf773f7..5d55eed 100644 --- a/build/application.linux-arm64/source/ontology.java +++ b/build/application.linux-arm64/source/ontology.java @@ -73,13 +73,11 @@ public void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); @@ -117,9 +115,15 @@ public void deleteAll() { } int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +public void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} public void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -130,6 +134,7 @@ public void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -179,14 +184,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; public boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } public void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -195,26 +202,20 @@ class Button { label = label_; w = PApplet.parseInt(textWidth(label))+18; h = 32; + active = true; } public void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -public void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} int linkCount; boolean dragLink; //state of dragging a link diff --git a/build/application.linux-arm64/source/ontology.pde b/build/application.linux-arm64/source/ontology.pde index 41227fc..f9f76d1 100644 --- a/build/application.linux-arm64/source/ontology.pde +++ b/build/application.linux-arm64/source/ontology.pde @@ -57,13 +57,11 @@ void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); diff --git a/build/application.linux-armv6hf/lib/ontology.jar b/build/application.linux-armv6hf/lib/ontology.jar index f218851..75ca767 100644 Binary files a/build/application.linux-armv6hf/lib/ontology.jar and b/build/application.linux-armv6hf/lib/ontology.jar differ diff --git a/build/application.linux-armv6hf/source/gui.pde b/build/application.linux-armv6hf/source/gui.pde index 4b9de3a..ed683a3 100644 --- a/build/application.linux-armv6hf/source/gui.pde +++ b/build/application.linux-armv6hf/source/gui.pde @@ -1,8 +1,14 @@ int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -13,6 +19,7 @@ void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -62,14 +69,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -78,23 +87,17 @@ class Button { label = label_; w = int(textWidth(label))+18; h = 32; + active = true; } void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} diff --git a/build/application.linux-armv6hf/source/ontology.java b/build/application.linux-armv6hf/source/ontology.java index cf773f7..5d55eed 100644 --- a/build/application.linux-armv6hf/source/ontology.java +++ b/build/application.linux-armv6hf/source/ontology.java @@ -73,13 +73,11 @@ public void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); @@ -117,9 +115,15 @@ public void deleteAll() { } int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +public void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} public void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -130,6 +134,7 @@ public void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -179,14 +184,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; public boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } public void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -195,26 +202,20 @@ class Button { label = label_; w = PApplet.parseInt(textWidth(label))+18; h = 32; + active = true; } public void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -public void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} int linkCount; boolean dragLink; //state of dragging a link diff --git a/build/application.linux-armv6hf/source/ontology.pde b/build/application.linux-armv6hf/source/ontology.pde index 41227fc..f9f76d1 100644 --- a/build/application.linux-armv6hf/source/ontology.pde +++ b/build/application.linux-armv6hf/source/ontology.pde @@ -57,13 +57,11 @@ void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); diff --git a/build/application.linux32/lib/ontology.jar b/build/application.linux32/lib/ontology.jar index f218851..75ca767 100644 Binary files a/build/application.linux32/lib/ontology.jar and b/build/application.linux32/lib/ontology.jar differ diff --git a/build/application.linux32/source/gui.pde b/build/application.linux32/source/gui.pde index 4b9de3a..ed683a3 100644 --- a/build/application.linux32/source/gui.pde +++ b/build/application.linux32/source/gui.pde @@ -1,8 +1,14 @@ int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -13,6 +19,7 @@ void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -62,14 +69,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -78,23 +87,17 @@ class Button { label = label_; w = int(textWidth(label))+18; h = 32; + active = true; } void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} diff --git a/build/application.linux32/source/ontology.java b/build/application.linux32/source/ontology.java index cf773f7..5d55eed 100644 --- a/build/application.linux32/source/ontology.java +++ b/build/application.linux32/source/ontology.java @@ -73,13 +73,11 @@ public void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); @@ -117,9 +115,15 @@ public void deleteAll() { } int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +public void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} public void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -130,6 +134,7 @@ public void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -179,14 +184,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; public boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } public void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -195,26 +202,20 @@ class Button { label = label_; w = PApplet.parseInt(textWidth(label))+18; h = 32; + active = true; } public void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -public void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} int linkCount; boolean dragLink; //state of dragging a link diff --git a/build/application.linux32/source/ontology.pde b/build/application.linux32/source/ontology.pde index 41227fc..f9f76d1 100644 --- a/build/application.linux32/source/ontology.pde +++ b/build/application.linux32/source/ontology.pde @@ -57,13 +57,11 @@ void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); diff --git a/build/application.linux64/lib/ontology.jar b/build/application.linux64/lib/ontology.jar index f218851..75ca767 100644 Binary files a/build/application.linux64/lib/ontology.jar and b/build/application.linux64/lib/ontology.jar differ diff --git a/build/application.linux64/source/gui.pde b/build/application.linux64/source/gui.pde index 4b9de3a..ed683a3 100644 --- a/build/application.linux64/source/gui.pde +++ b/build/application.linux64/source/gui.pde @@ -1,8 +1,14 @@ int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -13,6 +19,7 @@ void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -62,14 +69,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -78,23 +87,17 @@ class Button { label = label_; w = int(textWidth(label))+18; h = 32; + active = true; } void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} diff --git a/build/application.linux64/source/ontology.java b/build/application.linux64/source/ontology.java index cf773f7..5d55eed 100644 --- a/build/application.linux64/source/ontology.java +++ b/build/application.linux64/source/ontology.java @@ -73,13 +73,11 @@ public void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); @@ -117,9 +115,15 @@ public void deleteAll() { } int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +public void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} public void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -130,6 +134,7 @@ public void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -179,14 +184,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; public boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } public void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -195,26 +202,20 @@ class Button { label = label_; w = PApplet.parseInt(textWidth(label))+18; h = 32; + active = true; } public void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -public void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} int linkCount; boolean dragLink; //state of dragging a link diff --git a/build/application.linux64/source/ontology.pde b/build/application.linux64/source/ontology.pde index 41227fc..f9f76d1 100644 --- a/build/application.linux64/source/ontology.pde +++ b/build/application.linux64/source/ontology.pde @@ -57,13 +57,11 @@ void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); diff --git a/build/application.windows32/lib/ontology.jar b/build/application.windows32/lib/ontology.jar index f218851..3a44ce1 100644 Binary files a/build/application.windows32/lib/ontology.jar and b/build/application.windows32/lib/ontology.jar differ diff --git a/build/application.windows32/ontology.exe b/build/application.windows32/ontology.exe index 46d29a1..9ac3782 100755 Binary files a/build/application.windows32/ontology.exe and b/build/application.windows32/ontology.exe differ diff --git a/build/application.windows32/source/gui.pde b/build/application.windows32/source/gui.pde index 4b9de3a..ed683a3 100644 --- a/build/application.windows32/source/gui.pde +++ b/build/application.windows32/source/gui.pde @@ -1,8 +1,14 @@ int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -13,6 +19,7 @@ void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -62,14 +69,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -78,23 +87,17 @@ class Button { label = label_; w = int(textWidth(label))+18; h = 32; + active = true; } void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} diff --git a/build/application.windows32/source/ontology.java b/build/application.windows32/source/ontology.java index cf773f7..5d55eed 100644 --- a/build/application.windows32/source/ontology.java +++ b/build/application.windows32/source/ontology.java @@ -73,13 +73,11 @@ public void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); @@ -117,9 +115,15 @@ public void deleteAll() { } int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +public void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} public void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -130,6 +134,7 @@ public void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -179,14 +184,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; public boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } public void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -195,26 +202,20 @@ class Button { label = label_; w = PApplet.parseInt(textWidth(label))+18; h = 32; + active = true; } public void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -public void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} int linkCount; boolean dragLink; //state of dragging a link diff --git a/build/application.windows32/source/ontology.pde b/build/application.windows32/source/ontology.pde index 41227fc..f9f76d1 100644 --- a/build/application.windows32/source/ontology.pde +++ b/build/application.windows32/source/ontology.pde @@ -57,13 +57,11 @@ void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); diff --git a/build/application.windows64/lib/ontology.jar b/build/application.windows64/lib/ontology.jar index f218851..75ca767 100644 Binary files a/build/application.windows64/lib/ontology.jar and b/build/application.windows64/lib/ontology.jar differ diff --git a/build/application.windows64/ontology.exe b/build/application.windows64/ontology.exe index c403a9a..90fec59 100755 Binary files a/build/application.windows64/ontology.exe and b/build/application.windows64/ontology.exe differ diff --git a/build/application.windows64/source/gui.pde b/build/application.windows64/source/gui.pde index 4b9de3a..ed683a3 100644 --- a/build/application.windows64/source/gui.pde +++ b/build/application.windows64/source/gui.pde @@ -1,8 +1,14 @@ int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -13,6 +19,7 @@ void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -62,14 +69,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -78,23 +87,17 @@ class Button { label = label_; w = int(textWidth(label))+18; h = 32; + active = true; } void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} diff --git a/build/application.windows64/source/ontology.java b/build/application.windows64/source/ontology.java index cf773f7..5d55eed 100644 --- a/build/application.windows64/source/ontology.java +++ b/build/application.windows64/source/ontology.java @@ -73,13 +73,11 @@ public void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); @@ -117,9 +115,15 @@ public void deleteAll() { } int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +public void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} public void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -130,6 +134,7 @@ public void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -179,14 +184,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; public boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } public void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -195,26 +202,20 @@ class Button { label = label_; w = PApplet.parseInt(textWidth(label))+18; h = 32; + active = true; } public void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -public void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} int linkCount; boolean dragLink; //state of dragging a link diff --git a/build/application.windows64/source/ontology.pde b/build/application.windows64/source/ontology.pde index 41227fc..f9f76d1 100644 --- a/build/application.windows64/source/ontology.pde +++ b/build/application.windows64/source/ontology.pde @@ -57,13 +57,11 @@ void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER);