mirror of
https://codeberg.org/qg-info-unterricht/zpg-graphentester.git
synced 2026-03-24 20:48:26 +01:00
Fetch Upstream v7.4 - 01/2025
This commit is contained in:
Max Mustermann
parent
09967a1c1b
commit
667bc4638b
68 changed files with 2772 additions and 2770 deletions
|
|
@ -32,13 +32,14 @@ import javafx.collections.ObservableList;
|
|||
* Die Klasse Controller stellt den Controller des Hauptfensters / Menu dar.
|
||||
*
|
||||
* @author Thomas Schaller
|
||||
* @version 03.03.2023 (v7.1)
|
||||
* @version 12.02.2025 (v7.4)
|
||||
* v7.0: Die aktuelle Bildschirmposition und der angezeigte Graph werden in config.csv abgelegt.
|
||||
* v7.1: Verzeichnisauswahl für Laden/Speichern verbessert
|
||||
* v7.4: Unterbrechen von Simulieren-Thread neu geregelt.
|
||||
*/
|
||||
|
||||
public class Controller {
|
||||
private String version = "7.0 (Februar 2023)";
|
||||
private String version = "7.4 (Januar 2025)";
|
||||
private String pfad; // Pfad der aktuell angezeigten Datei
|
||||
|
||||
@FXML
|
||||
|
|
|
|||
|
|
@ -40,7 +40,8 @@ import javafx.collections.ObservableList;
|
|||
* durchgeführt werden.
|
||||
*
|
||||
* @author Thomas Schaller
|
||||
* @version 03.03.2023 (v7.0)
|
||||
* @version 12.02.2025 (v7.4)
|
||||
* v7.4: Unterbrechen eines Algorithmus neu geregelt.
|
||||
* v7.1: Fehler bei Aktualisierung des Hilfefensters behoben, Splitpane statt HBox
|
||||
* v7.0: Mechanismus geändert, so dass die init-Methode des Algorithmus beim Wechesel eines Algorithmus
|
||||
* aufgerufen wird, um die für diesen Algorithmus passenden Anzeigeeinstellungen zu setzen.
|
||||
|
|
@ -189,7 +190,7 @@ public class SimulationTabMitController extends TabMitController implements Hilf
|
|||
}
|
||||
|
||||
public void changeAlgorithm() {
|
||||
if(aktAlgo != null && aktAlgo.isAlive()) aktAlgo.stop();
|
||||
if(aktAlgo != null && aktAlgo.isAlive() && !aktAlgo.isInterrupted()) aktAlgo.interrupt();
|
||||
graph.initialisiereAlleKnoten();
|
||||
graph.initialisiereAlleKanten();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,94 +1,94 @@
|
|||
#BlueJ package file
|
||||
dependency1.from=TabMitController
|
||||
dependency1.to=UnterTabMitController
|
||||
dependency1.type=UsesDependency
|
||||
dependency2.from=SimulationTabMitController
|
||||
dependency2.to=MyClassLoader
|
||||
dependency2.type=UsesDependency
|
||||
dependency3.from=Controller
|
||||
dependency3.to=TabMitController
|
||||
dependency3.type=UsesDependency
|
||||
dependency4.from=Controller
|
||||
dependency4.to=HauptTabMitController
|
||||
dependency4.type=UsesDependency
|
||||
dependency5.from=Controller
|
||||
dependency5.to=SimulationTabMitController
|
||||
dependency5.type=UsesDependency
|
||||
dependency6.from=Controller
|
||||
dependency6.to=EditTabMitController
|
||||
dependency6.type=UsesDependency
|
||||
objectbench.height=172
|
||||
objectbench.width=451
|
||||
package.divider.horizontal=0.599476439790576
|
||||
package.divider.vertical=0.642
|
||||
package.editor.height=314
|
||||
package.editor.width=636
|
||||
package.editor.x=1113
|
||||
package.editor.y=290
|
||||
package.frame.height=600
|
||||
package.frame.width=800
|
||||
package.numDependencies=6
|
||||
package.numTargets=8
|
||||
package.showExtends=true
|
||||
package.showUses=true
|
||||
readme.height=60
|
||||
readme.name=@README
|
||||
readme.width=49
|
||||
readme.x=10
|
||||
readme.y=10
|
||||
target1.height=50
|
||||
target1.name=EditTabMitController
|
||||
target1.showInterface=false
|
||||
target1.type=ClassTarget
|
||||
target1.width=180
|
||||
target1.x=10
|
||||
target1.y=80
|
||||
target2.height=50
|
||||
target2.name=HauptTabMitController
|
||||
target2.showInterface=false
|
||||
target2.type=ClassTarget
|
||||
target2.width=200
|
||||
target2.x=10
|
||||
target2.y=140
|
||||
target3.height=70
|
||||
target3.name=Hilfefenster
|
||||
target3.showInterface=false
|
||||
target3.type=ClassTarget
|
||||
target3.width=120
|
||||
target3.x=10
|
||||
target3.y=210
|
||||
target4.height=50
|
||||
target4.name=TabMitController
|
||||
target4.showInterface=false
|
||||
target4.type=ClassTarget
|
||||
target4.width=130
|
||||
target4.x=300
|
||||
target4.y=110
|
||||
target5.height=50
|
||||
target5.name=SimulationTabMitController
|
||||
target5.showInterface=false
|
||||
target5.type=ClassTarget
|
||||
target5.width=200
|
||||
target5.x=210
|
||||
target5.y=210
|
||||
target6.height=50
|
||||
target6.name=Controller
|
||||
target6.showInterface=false
|
||||
target6.type=ClassTarget
|
||||
target6.width=90
|
||||
target6.x=500
|
||||
target6.y=250
|
||||
target7.height=70
|
||||
target7.name=MyClassLoader
|
||||
target7.showInterface=false
|
||||
target7.type=ClassTarget
|
||||
target7.width=120
|
||||
target7.x=140
|
||||
target7.y=330
|
||||
target8.height=50
|
||||
target8.name=UnterTabMitController
|
||||
target8.showInterface=false
|
||||
target8.type=ClassTarget
|
||||
target8.width=170
|
||||
target8.x=220
|
||||
target8.y=270
|
||||
#BlueJ package file
|
||||
dependency1.from=TabMitController
|
||||
dependency1.to=UnterTabMitController
|
||||
dependency1.type=UsesDependency
|
||||
dependency2.from=SimulationTabMitController
|
||||
dependency2.to=MyClassLoader
|
||||
dependency2.type=UsesDependency
|
||||
dependency3.from=Controller
|
||||
dependency3.to=TabMitController
|
||||
dependency3.type=UsesDependency
|
||||
dependency4.from=Controller
|
||||
dependency4.to=HauptTabMitController
|
||||
dependency4.type=UsesDependency
|
||||
dependency5.from=Controller
|
||||
dependency5.to=SimulationTabMitController
|
||||
dependency5.type=UsesDependency
|
||||
dependency6.from=Controller
|
||||
dependency6.to=EditTabMitController
|
||||
dependency6.type=UsesDependency
|
||||
objectbench.height=66
|
||||
objectbench.width=776
|
||||
package.divider.horizontal=0.599476439790576
|
||||
package.divider.vertical=0.8537074148296593
|
||||
package.editor.height=419
|
||||
package.editor.width=640
|
||||
package.editor.x=577
|
||||
package.editor.y=358
|
||||
package.frame.height=600
|
||||
package.frame.width=800
|
||||
package.numDependencies=6
|
||||
package.numTargets=8
|
||||
package.showExtends=true
|
||||
package.showUses=true
|
||||
readme.height=60
|
||||
readme.name=@README
|
||||
readme.width=49
|
||||
readme.x=10
|
||||
readme.y=10
|
||||
target1.height=50
|
||||
target1.name=HauptTabMitController
|
||||
target1.showInterface=false
|
||||
target1.type=ClassTarget
|
||||
target1.width=200
|
||||
target1.x=10
|
||||
target1.y=140
|
||||
target2.height=50
|
||||
target2.name=EditTabMitController
|
||||
target2.showInterface=false
|
||||
target2.type=ClassTarget
|
||||
target2.width=180
|
||||
target2.x=10
|
||||
target2.y=80
|
||||
target3.height=70
|
||||
target3.name=Hilfefenster
|
||||
target3.showInterface=false
|
||||
target3.type=ClassTarget
|
||||
target3.width=120
|
||||
target3.x=10
|
||||
target3.y=210
|
||||
target4.height=50
|
||||
target4.name=TabMitController
|
||||
target4.showInterface=false
|
||||
target4.type=ClassTarget
|
||||
target4.width=140
|
||||
target4.x=300
|
||||
target4.y=110
|
||||
target5.height=50
|
||||
target5.name=SimulationTabMitController
|
||||
target5.showInterface=false
|
||||
target5.type=ClassTarget
|
||||
target5.width=210
|
||||
target5.x=210
|
||||
target5.y=210
|
||||
target6.height=50
|
||||
target6.name=Controller
|
||||
target6.showInterface=false
|
||||
target6.type=ClassTarget
|
||||
target6.width=90
|
||||
target6.x=500
|
||||
target6.y=250
|
||||
target7.height=70
|
||||
target7.name=MyClassLoader
|
||||
target7.showInterface=false
|
||||
target7.type=ClassTarget
|
||||
target7.width=120
|
||||
target7.x=140
|
||||
target7.y=330
|
||||
target8.height=50
|
||||
target8.name=UnterTabMitController
|
||||
target8.showInterface=false
|
||||
target8.type=ClassTarget
|
||||
target8.width=180
|
||||
target8.x=220
|
||||
target8.y=270
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue