Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

TTool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

ba6a4361

Commit ba6a4361 authored 4 years ago by Ludovic Apvrille

Downloads
- Plain Diff

Merge branch 'revert-883077ef' into 'master'

Fix hanging bug and improve time line display.

See merge request !351

parents 82d40683 bd792681

No related branches found

No related tags found

1 merge request!351Fix hanging bug and improve time line display.

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

simulators/c++2/src_simulator/arch/CPU.cpp 8 additions, 9 deletions

simulators/c++2/src_simulator/arch/CPU.cpp
simulators/c++2/src_simulator/arch/FPGA.cpp 39 additions, 37 deletions

simulators/c++2/src_simulator/arch/FPGA.cpp
simulators/c++2/src_simulator/arch/SchedulableDevice.cpp 8 additions, 11 deletions

simulators/c++2/src_simulator/arch/SchedulableDevice.cpp
simulators/c++2/src_simulator/sim/Simulator.cpp 8 additions, 3 deletions

simulators/c++2/src_simulator/sim/Simulator.cpp
src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java 4 additions, 0 deletions

...ui/interactivesimulation/JFrameInteractiveSimulation.java
src/main/java/ui/interactivesimulation/JFrameTMLSimulationPanelTimeline.java 5 additions, 1 deletion

...teractivesimulation/JFrameTMLSimulationPanelTimeline.java
ttool/src/test/java/tmltranslator/DiplodocusTerminatedTest.java 235 additions, 0 deletions

...src/test/java/tmltranslator/DiplodocusTerminatedTest.java
ttool/src/test/java/tmltranslator/TimelineDiagramTest.java 9 additions, 1 deletion

ttool/src/test/java/tmltranslator/TimelineDiagramTest.java
ttool/src/test/resources/tmltranslator/expected/expected_get_generated_timeline.txt 4 additions, 4 deletions

...mltranslator/expected/expected_get_generated_timeline.txt
ttool/src/test/resources/tmltranslator/simulator/terminatedTest.xml 6923 additions, 0 deletions

...test/resources/tmltranslator/simulator/terminatedTest.xml

with 7243 additions and 66 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment