Skip to content

Commit 54f9fc1

Browse files
committed
First version of the new visualization tool
This commit adds a working version of the new visualization tool built with Swing. It understands DSLabs objects better than the Oddity visualizer and is more closely coupled. This tool is roughly at feature-parity with Oddity. In a future commit, Oddity (and the Json machinery) will be removed entirely.
1 parent a478ce7 commit 54f9fc1

15 files changed

Lines changed: 2120 additions & 11 deletions

File tree

build.gradle

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ sourceSets {
2121
java {
2222
srcDirs = ['framework/tst']
2323
}
24+
resources {
25+
srcDirs = ['framework/tst']
26+
includes = ['**/*.properties']
27+
}
2428
compileClasspath += main.compileClasspath + main.output
2529
annotationProcessorPath += main.annotationProcessorPath
2630
}
@@ -98,6 +102,21 @@ dependencies {
98102
graderSources group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jdk8', version: '2.11.0', classifier: 'sources'
99103
graderImplementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.11.0'
100104
graderSources group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.11.0', classifier: 'sources'
105+
106+
// Swing stuff
107+
graderImplementation group: 'com.intellij', name: 'forms_rt', version: '7.0.3'
108+
graderImplementation group: 'com.formdev', name: 'flatlaf', version: '2.0.1'
109+
graderImplementation group: 'com.formdev', name: 'flatlaf', version: '2.0.1', classifier: 'sources'
110+
graderImplementation group: 'com.formdev', name: 'flatlaf-swingx', version: '2.0.1'
111+
graderImplementation group: 'com.formdev', name: 'flatlaf-swingx', version: '2.0.1', classifier: 'sources'
112+
graderImplementation group: 'com.github.jiconfont', name: 'jiconfont-font_awesome', version: '4.7.0.1'
113+
graderImplementation group: 'com.github.jiconfont', name: 'jiconfont-font_awesome', version: '4.7.0.1', classifier: 'sources'
114+
graderImplementation group: 'com.github.jiconfont', name: 'jiconfont-swing', version: '1.0.0'
115+
graderImplementation group: 'com.github.jiconfont', name: 'jiconfont-swing', version: '1.0.0', classifier: 'sources'
116+
graderImplementation group: 'com.miglayout', name: 'miglayout-swing', version: '11.0'
117+
graderImplementation group: 'com.miglayout', name: 'miglayout-swing', version: '11.0', classifier: 'sources'
118+
graderImplementation group: 'org.swinglabs.swingx', name: 'swingx-core', version: '1.6.5-1'
119+
graderImplementation group: 'org.swinglabs.swingx', name: 'swingx-core', version: '1.6.5-1', classifier: 'sources'
101120
}
102121

103122
// Create reproducible jars

framework/tst/dslabs/framework/testing/TimerEnvelope.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import dslabs.framework.Address;
2626
import dslabs.framework.Timer;
27+
import dslabs.framework.testing.newviz.VizIgnore;
2728
import java.io.Serializable;
2829
import java.util.Random;
2930
import lombok.Data;
@@ -42,9 +43,11 @@ public final class TimerEnvelope
4243
private final Address to;
4344
private final Timer timer;
4445

46+
@VizIgnore
4547
private final int minTimerLengthMillis, maxTimerLengthMillis,
4648
timerLengthMillis;
4749

50+
@VizIgnore
4851
private final long startTimeNanos;
4952

5053
public TimerEnvelope(Address to, Timer timer, int minTimerLengthMillis,

0 commit comments

Comments
 (0)