Skip to content

Commit 6caba3f

Browse files
authored
Merge pull request #106 from fransjacobs/103-gui-performance
103 gui performance
2 parents 31fc957 + 4f84c2b commit 6caba3f

File tree

282 files changed

+28582
-15812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

282 files changed

+28582
-15812
lines changed

JCS_SETUP_NL.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ In JCS wordt een blok altijd gemarkeerd door twee sensoren.
1818
## Het tekenen van de baan
1919

2020
Wanneer JCS is gestart, selecteer je de Bewerken-knop om de bewerkingsmodus te activeren.
21-
![Start Edit](assets/startedit.png)
21+
![Start Edit](assets/startedit.png) Via toesenbord door Ctrl + E.
2222

2323
JCS toont het scherm voor het bewerken van de baan.
2424
![Start Edit](assets/layoutedittoolbar.png)
2525

2626
De werkbalk bevat de meest voorkomende elementen om een baan te tekenen. Een plattegrond van een baan bestaat uit tegels.
2727
Een tegel stelt een component, zoals een recht stuk, sensor, blok, enz. voor.
28-
Gebruik de __+__ knop om een tegel op het canvas toe te voegen. De prullenbakknop verwijdert een tegel.
29-
Klik met de rechtermuisknop op een tegel om eigenschappen te bekijken of de tegel te draaien of om te keren indien van toepassing.
30-
Wanneer een tegel is geselecteerd, kan deze naar de juiste positie worden gesleept.
28+
Gebruik de __+__ knop, of via toetsenbord Alt + A om een tegel op het canvas toe te voegen. De prullenbakknop (Alt +D) verwijdert een tegel.
29+
Klik met de rechtermuisknop op een tegel om eigenschappen te bekijken of de tegel te draaien (Alt + R) of om te keren (Alt + H of Alt + V),
30+
indien van toepassing. Wanneer een tegel is geselecteerd, kan deze naar de juiste positie worden gesleept.
3131
Tegels worden automatisch opgeslagen.
3232
Het voorbeeld ziet er als volgt uit wanneer alle tegels op het canvas zijn geplaatst.
3333

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@
1515
JCS is a hobby project of me where I try to automate my Model Railway. Over the past years I have worked on and off on several aspects and modules of the software which are needed to drive automatically.
1616
A short summary of the topics which are needed and used to be able to drive trains automatically:
1717

18-
- Connectivity to the Command Station hardware. (DCC-EX,HSI-S88, Marklin CS2/3)
18+
- Connectivity to the Command Station hardware. (DCC-EX,HSI-S88, Marklin CS2/3 ESU Ecos)
1919
- Edit and display graphically a layout
2020
- With the layout be able to route all the possible drive ways
2121
- Show the routes and driveways in the layout screen
2222
- Graphically feedback events on track to the layout screen
23+
- Automatically run locomotives on the layout
2324
- Input dialogs to setup Accessories, Locomotives, Command stations, etc
2425
- Locomotive Drive Cap so tha you can manually run you locomotive
2526
- Virtual Command Station, to ease testing and simulate automatic driving
27+
- Build in VNC viewer
2628
- Monitor Sensor events
2729

2830
I created a [short video](https://youtu.be/xP6eUdScMY0) demonstrating automatic running of locomotives. Also a [video of pysical locomotives running on the Test Layout](https://www.youtube.com/watch?v=CyLmGk6gfHA)
@@ -78,7 +80,7 @@ To debug or easly setup your feedback sensors
7880

7981
## Releases
8082

81-
- [First Release V 0.0.1](https://github.com/fransjacobs/model-railway/releases/tag/V0.0.1)
83+
- [Latest Release V 0.0.2](https://github.com/fransjacobs/model-railway/releases/tag/V0.0.2)
8284

8385
## Supported Hardware
8486

@@ -94,10 +96,9 @@ To debug or easly setup your feedback sensors
9496
Currently the following feature are in development:
9597

9698
- Documentation
97-
- Internationalization enable multiple languages
98-
- Add support for ESU ECOS
99-
- Show Signal aspects in automatic driving
10099
- Enhance GUI
100+
- Show Signal aspects in automatic driving
101+
- Internationalization enable multiple languages
101102
- Add more Unit tests
102103
- ...
103104

@@ -125,7 +126,7 @@ Currently the following feature are in development:
125126
</tr>
126127
</table>
127128

128-
## Copyright 2019 - 2024 Frans Jacobs
129+
## Copyright 2019 - 2025 Frans Jacobs
129130

130131
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
131132
to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,

nb-configuration.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,9 @@ Any value defined here will override the pom.xml file value but is only applicab
3535
<org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>
3636
<org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
3737
<netbeans.compile.on.save>all</netbeans.compile.on.save>
38+
<com-junichi11-netbeans-changelf.enable>true</com-junichi11-netbeans-changelf.enable>
39+
<com-junichi11-netbeans-changelf.use-project>true</com-junichi11-netbeans-changelf.use-project>
40+
<com-junichi11-netbeans-changelf.lf-kind>LF</com-junichi11-netbeans-changelf.lf-kind>
41+
<com-junichi11-netbeans-changelf.use-global>false</com-junichi11-netbeans-changelf.use-global>
3842
</properties>
3943
</project-shared-configuration>

nbactions.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,18 @@
8181
<goal>test</goal>
8282
</goals>
8383
</action>
84-
</actions>
84+
<action>
85+
<actionName>CUSTOM-checkstyle:check</actionName>
86+
<displayName>checkstyle:check</displayName>
87+
<goals>
88+
<goal>checkstyle:check</goal>
89+
</goals>
90+
</action>
91+
<action>
92+
<actionName>CUSTOM-test</actionName>
93+
<displayName>test</displayName>
94+
<goals>
95+
<goal>test</goal>
96+
</goals>
97+
</action>
98+
</actions>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
3+
<properties>
4+
<entry key="org.netbeans.modules.profiler.v2.features.ObjectsFeature_SelectedClassesMode_LIMIT_ALLOCATIONS_FLAG">10</entry>
5+
<entry key="ACTIVATED_FEATURES">#org.netbeans.modules.profiler.v2.features.LocksFeature@#org.netbeans.modules.profiler.v2.features.MethodsFeature@#org.netbeans.modules.profiler.v2.features.MonitorFeature@</entry>
6+
<entry key="org.netbeans.modules.profiler.v2.features.ObjectsFeature_SETTINGS_FLAG">true</entry>
7+
<entry key="org.netbeans.modules.profiler.v2.features.ObjectsFeature_MODE_FLAG">ProjectClassesMode</entry>
8+
<entry key="SINGLE_FEATURE">false</entry>
9+
</properties>
Binary file not shown.

pom.xml

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,11 @@
172172
<artifactId>logback-classic</artifactId>
173173
<version>1.2.13</version>
174174
</dependency>
175+
<!--dependency>
176+
<groupId>com.sshtools</groupId>
177+
<artifactId>two-slices</artifactId>
178+
<version>0.9.4</version>
179+
</dependency-->
175180
<dependency>
176181
<groupId>org.netbeans.external</groupId>
177182
<artifactId>AbsoluteLayout</artifactId>
@@ -204,9 +209,10 @@
204209
<artifactId>maven-compiler-plugin</artifactId>
205210
<version>3.13.0</version>
206211
<configuration>
207-
<compilerArgs>--enable-preview</compilerArgs>
212+
<!--compilerArgs>-Xlint:unchecked,-verbose</compilerArgs-->
213+
<compilerArgs>-verbose</compilerArgs>
208214
<release>21</release>
209-
<showDeprecation>false</showDeprecation>
215+
<showDeprecation>true</showDeprecation>
210216
</configuration>
211217
</plugin>
212218
<plugin>
@@ -233,6 +239,7 @@
233239
<version>3.3.1</version>
234240
<configuration>
235241
<encoding>UTF-8</encoding>
242+
<propertiesEncoding>${project.build.sourceEncoding}</propertiesEncoding>
236243
<nonFilteredFileExtensions>
237244
<nonFilteredFileExtension>db:encryptable</nonFilteredFileExtension>
238245
<nonFilteredFileExtension>db</nonFilteredFileExtension>
@@ -289,7 +296,7 @@
289296
<artifactId>maven-surefire-plugin</artifactId>
290297
<version>3.5.2</version>
291298
<configuration>
292-
<testFailureIgnore>false</testFailureIgnore>
299+
<!--testFailureIgnore>false</testFailureIgnore-->
293300
<argLine>-Dfile.encoding=UTF-8</argLine>
294301
<configurationParameters>
295302
junit.jupiter.execution.parallel.enabled=false
@@ -347,6 +354,27 @@
347354
</execution>
348355
</executions>
349356
</plugin>
357+
<plugin>
358+
<groupId>org.apache.maven.plugins</groupId>
359+
<artifactId>maven-checkstyle-plugin</artifactId>
360+
<version>3.6.0</version>
361+
<dependencies>
362+
<dependency>
363+
<groupId>com.puppycrawl.tools</groupId>
364+
<artifactId>checkstyle</artifactId>
365+
<version>10.23.0</version>
366+
</dependency>
367+
</dependencies>
368+
<executions>
369+
<execution>
370+
<id>checkstyle</id>
371+
<phase>checkstyle</phase>
372+
<goals>
373+
<goal>checkstyle</goal>
374+
</goals>
375+
</execution>
376+
</executions>
377+
</plugin>
350378
<plugin>
351379
<groupId>io.github.fvarrui</groupId>
352380
<artifactId>javapackager</artifactId>

0 commit comments

Comments
 (0)