mirror of
https://codeberg.org/qg-info-unterricht/zpg-graphentester.git
synced 2026-03-25 04:58:24 +01:00
Sync with upstream
This commit is contained in:
parent
39a2f13410
commit
66e8fa72bf
135 changed files with 38902 additions and 37757 deletions
|
|
@ -25,13 +25,13 @@ import java.util.Optional;
|
|||
* zur Editierung eines Graphs dar.
|
||||
*
|
||||
* @author Thomas Schaller
|
||||
* @version v6.7 (9.12.2020)
|
||||
* @version 03.03.2023 (v7.1)
|
||||
* v7.1: Aktualisierung der Anzeige bei Wechsel gewichtet/ungewichtet angepasst
|
||||
* v6.9: Context-Menü schließt, wenn an andere Stelle geklickt wird
|
||||
*/
|
||||
|
||||
|
||||
public class EditTabMitController extends TabMitController {
|
||||
|
||||
|
||||
public EditTabMitController(Graph graph, GraphOptions options) {
|
||||
this.graph = graph;
|
||||
this.options = options;
|
||||
|
|
@ -127,6 +127,13 @@ public class EditTabMitController extends TabMitController {
|
|||
void setGewichtet(boolean gewichtet) {
|
||||
graph.setGewichtet(gewichtet);
|
||||
options.showEdgeWeights = gewichtet;
|
||||
if(graph.isGewichtet()) {
|
||||
options.kanteKurztext = new String[]{"Gewicht"};
|
||||
options.kanteLangtext = new String[]{"Gewicht","Markiert","Gelöscht"};
|
||||
} else {
|
||||
options.kanteKurztext = new String[]{};
|
||||
options.kanteLangtext = new String[]{"Markiert","Gelöscht"};
|
||||
}
|
||||
update();
|
||||
}
|
||||
|
||||
|
|
@ -179,7 +186,6 @@ public class EditTabMitController extends TabMitController {
|
|||
|
||||
@FXML
|
||||
void graphClicked(MouseEvent event) { // MousePressed-Event
|
||||
|
||||
viewer.mouseClicked(event);
|
||||
viewer.mouseDown(event);
|
||||
if((viewer.getSelectedKnoten() != null || viewer.getSelectedKante() != null) && event.isSecondaryButtonDown()) { // Contextmenu
|
||||
|
|
@ -200,11 +206,13 @@ public class EditTabMitController extends TabMitController {
|
|||
if (viewer.getSelectedKnoten() != null)
|
||||
contextMenu.getItems().add( item3 );
|
||||
|
||||
contextMenu.show(viewer, event.getScreenX(), event.getScreenY());
|
||||
getViewer().setContextMenu(contextMenu);
|
||||
//contextMenu.show(viewer, event.getScreenX(), event.getScreenY());
|
||||
}
|
||||
}
|
||||
|
||||
public void mLoesche() {
|
||||
viewer.setContextMenu(null);
|
||||
if(viewer.getSelectedKnoten() != null) {
|
||||
graph.entferneKnoten(viewer.getSelectedKnoten());
|
||||
update();
|
||||
|
|
@ -216,6 +224,8 @@ public class EditTabMitController extends TabMitController {
|
|||
}
|
||||
|
||||
public void mWertAendern() {
|
||||
viewer.setContextMenu(null);
|
||||
|
||||
Knoten k = viewer.getSelectedKnoten();
|
||||
Kante ka = viewer.getSelectedKante();
|
||||
if(k != null || ka !=null) {
|
||||
|
|
@ -242,6 +252,8 @@ public class EditTabMitController extends TabMitController {
|
|||
}
|
||||
|
||||
public void mInfotextAendern() {
|
||||
viewer.setContextMenu(null);
|
||||
|
||||
Knoten k = viewer.getSelectedKnoten();
|
||||
if(k != null ) {
|
||||
TextInputDialog dialog = new TextInputDialog(k.getInfotext());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue