i23024/ProjektGraph
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Visualisation progress reset

Browse Source
This commit is contained in:
i23007 2024-07-02 17:51:22 +02:00
parent 213638ad16
commit 6036220c6a
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.idea/workspace.xml generated
View File

@ -6,10 +6,7 @@
<component name="ChangeListManager">
<list default="true" id="70f8ea87-9ffc-471a-8059-ebbfc323adcc" name="Changes" comment="OurApplication test">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/OurApplication/OurAlgorithm.java" beforeDir="false" afterPath="$PROJECT_DIR$/OurApplication/OurAlgorithm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/OurApplication/OurDrawArea.java" beforeDir="false" afterPath="$PROJECT_DIR$/OurApplication/OurDrawArea.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/graph/DirectedGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/DirectedGraph.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/graph/Graph.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/Graph.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/graph/MarkedVertex.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/MarkedVertex.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/graph/Vertex.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/Vertex.java" afterDir="false" />
</list>
@ -46,19 +43,19 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"Application.OurApplication.executor": "Run",
"DefaultHtmlFileTemplate": "HTML File",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"git-widget-placeholder": "main",
"kotlin-language-version-configured": "true",
"last_opened_file_path": "C:/Users/jonas/DHBW Dateien/Semester 2/Programmieren 2/Projekt/ProjektGraph/OurApplication",
"settings.editor.selected.configurable": "vcs.Git"
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;Application.OurApplication.executor&quot;: &quot;Run&quot;,
&quot;DefaultHtmlFileTemplate&quot;: &quot;HTML File&quot;,
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
&quot;git-widget-placeholder&quot;: &quot;main&quot;,
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/jonas/DHBW Dateien/Semester 2/Programmieren 2/Projekt/ProjektGraph/OurApplication&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;vcs.Git&quot;
}
}]]></component>
}</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\jonas\DHBW Dateien\Semester 2\Programmieren 2\Projekt\ProjektGraph\OurApplication" />

10
OurApplication/OurDrawArea.java
View File

@ -56,7 +56,7 @@ public class OurDrawArea extends DrawArea{
private void drawGraph(DirectedGraph<VertexMarking, EdgeMarking> ourGraph, Graphics g) {
String convertedMarking;
/*Vector<Vertex> vertexes = new Vector<Vertex>();
Vector<Vertex> vertexes = new Vector<Vertex>();
for(MarkedVertex<VertexMarking> i : ourGraph.getAllVertexes()){
if(i.getMarking() != null){
@ -64,7 +64,7 @@ public class OurDrawArea extends DrawArea{
}else{
convertedMarking = "";
}
vertexes.add(new Vertex(i.getXCoordinate(), i.getYCoordinate(), convertedMarking, Color.GRAY));
vertexes.add(new Vertex(i.getXCoordinate(), i.getYCoordinate(), convertedMarking, i.getColor()));
}
Vector<Edge> edges = new Vector<Edge>();
@ -75,9 +75,9 @@ public class OurDrawArea extends DrawArea{
Graph graph = new Graph(vertexes, edges, true, EdgeStyle.Direct);
graph.draw(g);*/
graph.draw(g);
Vector<Vertex> vertexes = new Vector<Vertex>();
/*Vector<Vertex> vertexes = new Vector<Vertex>();
for(MarkedVertex<VertexMarking> i : ourGraph.getAllVertexes()){
@ -92,7 +92,7 @@ public class OurDrawArea extends DrawArea{
Graph graph = new Graph(vertexes, edges, true, EdgeStyle.Direct);
graph.draw(g);
graph.draw(g);*/
}
}

4
graph/MarkedVertex.java
View File

@ -24,7 +24,7 @@ public class MarkedVertex<T extends VertexMarking> extends Vertex{
// GET-ER
/*public T getMarking() {
public T getMarking() {
return this.marking;
}
@ -33,7 +33,7 @@ public class MarkedVertex<T extends VertexMarking> extends Vertex{
public void setMarking(T t) {
this.marking = t;
}*/
}
// Ausgabe

9
graph/Vertex.java
View File

@ -2,7 +2,7 @@ package graph;
import java.awt.Color;
public abstract class Vertex extends visualizationElements.Vertex {
public abstract class Vertex{
// ATTRIBUTE
@ -17,12 +17,15 @@ public abstract class Vertex extends visualizationElements.Vertex {
// KONSTRUKTOREN
public Vertex() {
super(0, 0);
}
public Vertex(int xCoordinate, int yCoordinate, String name, Color color) {
super(xCoordinate, yCoordinate, name, color);
this.xCoordinate = xCoordinate;
this.yCoordinate = yCoordinate;
this.name = name;
this.color = color;
}