Commits · 315b05331591e5f72055bc08f5784a1510185dae · mbe-tools / TTool

Dec 19, 2019

Merge remote-tracking branch 'origin/244-merging-zoom-branch' into · 315b0533

Moemoea Fierin authored 5 years ago

31-zoom-on-all-diagrams

Conflicts:
	src/.classpath
	src/main/java/tmltranslator/HwBridge.java
	src/main/java/tmltranslator/HwCPU.java
	src/main/java/tmltranslator/HwFPGA.java
	src/main/java/tmltranslator/HwRouter.java
	src/main/java/ui/SecurityGeneration.java
	src/main/java/ui/avatarbd/AvatarBDBlock.java
	src/main/java/ui/avatarcd/AvatarCDBlock.java
	src/main/java/ui/avatardd/ADDBlockArtifact.java
	src/main/java/ui/avatardd/ADDBridgeNode.java
	src/main/java/ui/avatardd/ADDBusNode.java
	src/main/java/ui/avatardd/ADDChannelArtifact.java
	src/main/java/ui/avatardd/ADDClusterNode.java
	src/main/java/ui/tmlcompd/TMLCJoin.java
	src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java
	src/main/java/ui/tmlcompd/TMLCPrimitivePort.java
	src/main/java/ui/tmldd/TMLArchiArtifact.java
	src/main/java/ui/tmldd/TMLArchiBUSNode.java
	src/main/java/ui/tmldd/TMLArchiCPNode.java
	src/main/java/ui/tmldd/TMLArchiCPUNode.java
	src/main/java/ui/tmldd/TMLArchiCommunicationArtifact.java
	src/main/java/ui/tmldd/TMLArchiFPGANode.java
	src/main/java/ui/tmldd/TMLArchiHWANode.java
	src/main/java/ui/tmldd/TMLArchiPortArtifact.java
	src/main/java/ui/tmldd/TMLArchiRouterNode.java
	src/main/java/ui/ucd/TGConnectingPointActorUCD.java
	src/main/java/ui/ucd/TGConnectingPointUCD.java
	src/main/java/ui/ucd/UCDActor.java
	src/main/java/ui/ucd/UCDActorBox.java

315b0533

Dec 10, 2019
- Merge branch 'master' of gitlab.enst.fr:mbe-tools/TTool · fc1fe636
  apvrille authored 5 years ago
  
  fc1fe636
- Update in lib inc · 0855c5a2
  apvrille authored 5 years ago
  
  0855c5a2
- update on build version: build.txt · 5bbfc31e
  Ludovic Apvrille authored 5 years ago
  
  5bbfc31e
Dec 09, 2019
- Merge branch 'revert-b2e33e3d ' into 'master' · eff89f49
  Ludovic Apvrille authored 5 years ago
  
  Revert "Merge branch 'revert-523cae60' into 'master'" See merge request !282
  eff89f49
- Revert "Merge branch 'revert-523cae60 ' into 'master'" · ba605ebc
  Maysam Zoor authored 5 years ago
  
  This reverts merge request !277
  ba605ebc
- Merge branch 'revert-883077ef ' into 'master' · 50a4af4c
  Ludovic Apvrille authored 5 years ago
  
  Remove duplicate signals on VCD trace See merge request !278
  50a4af4c
- Remove duplicate signals on VCD trace · aa1c3a45
  Le Van Truong authored 5 years ago
  
  aa1c3a45
- Merge branch 'revert-523cae60 ' into 'master' · b2e33e3d
  Ludovic Apvrille authored 5 years ago
  
  Revert "Merge branch 'addingLatency' into 'master'" See merge request !277
  b2e33e3d
- Revert "Merge branch 'addingLatency' into 'master'" · 8ca9774c
  Ludovic Apvrille authored 5 years ago
  
  This reverts merge request !271
  8ca9774c
- Merge branch 'addingLatency' into 'master' · 523cae60
  Ludovic Apvrille authored 5 years ago
  
  Adding latency See merge request !271
  523cae60
- adding runnableTime · 2cbc63ea
  maysam zoor authored 5 years ago
  
  2cbc63ea
- Merge branch 'master' into 'addingLatency' · 5e8ca0b3
  Maysam Zoor authored 5 years ago
  
  # Conflicts: # src/main/java/ui/interactivesimulation/SimulationTransaction.java
  5e8ca0b3
- remove spaces before : · 56e81d8d
  maysam zoor authored 5 years ago
  
  56e81d8d
- update on build version: build.txt · 19773c6e
  Ludovic Apvrille authored 5 years ago
  
  19773c6e
Dec 08, 2019
- update on build version: build.txt · 2eb35ee4
  Ludovic Apvrille authored 5 years ago
  
  2eb35ee4
Dec 06, 2019
- Update on TTool dev guidelines · 86828f3f
  Ludovic Apvrille authored 5 years ago
  
  86828f3f
- Merge branch 'revert-883077ef ' into 'master' · 540b2ef8
  Ludovic Apvrille authored 5 years ago
  
  Make interactive simulation trace displaying according to transaction start time See merge request !276
  540b2ef8
- Make interactive simulation trace dislaying according to transaction start time · e6f8857b
  Le Van Truong authored 5 years ago
  
  e6f8857b
Dec 05, 2019
- Merge branch 'revert-883077ef ' into 'master' · 4bc32efa
  Ludovic Apvrille authored 5 years ago
  
  Revert 883077ef See merge request !275
  4bc32efa
Dec 04, 2019
- add delay trans to interactive simulation trace · 5bfcc6f9
  Le Van Truong authored 5 years ago
  
  5bfcc6f9
- add Delay transaction to simulation double click event · 5039ed6d
  Le Van Truong authored 5 years ago
  
  5039ed6d
- Merge branch 'revert-883077ef ' into 'master' · 080b1ac6
  Ludovic Apvrille authored 5 years ago
  
  fix backtracing display for wait delay transaction See merge request !274
  080b1ac6
- fix backtracing display for wait delay transaction · cbdba69e
  Le Van Truong authored 5 years ago
  
  cbdba69e
Dec 03, 2019
- update on build version: build.txt · 7d354acc
  Ludovic Apvrille authored 5 years ago
  
  7d354acc
Dec 02, 2019
- update on build version: build.txt · 7d5bdfb8
  Ludovic Apvrille authored 5 years ago
  
  7d5bdfb8
Dec 01, 2019
- update on build version: build.txt · 3636413a
  Ludovic Apvrille authored 5 years ago
  
  3636413a
Nov 30, 2019
- Merge branch 'master' of gitlab.enst.fr:mbe-tools/TTool · fd50a9a1
  Ludovic Apvrille authored 5 years ago
  
  fd50a9a1
Nov 29, 2019
- Merge branch 'revert-883077ef ' into 'master' · 1d03c9f8
  Ludovic Apvrille authored 5 years ago
  
  modify DelayTest See merge request !273
  1d03c9f8
- modify DelayTest · 581ed6b1
  Le Van Truong authored 5 years ago
  
  581ed6b1
- update on build version: build.txt · ddcaf4b6
  Ludovic Apvrille authored 5 years ago
  
  ddcaf4b6
- update on build version: build.txt · bcb53a5a
  Ludovic Apvrille authored 5 years ago
  
  bcb53a5a
- Merge branch 'revert-883077ef ' into 'master' · 097d31a6
  Ludovic Apvrille authored 5 years ago
  
  update wait delay transaction See merge request !272
  097d31a6
- update on build version: build.txt · 0b3c589c
  Ludovic Apvrille authored 5 years ago
  
  0b3c589c
Nov 28, 2019
- update on build version: build.txt · ee65021f
  Ludovic Apvrille authored 5 years ago
  
  ee65021f
Nov 27, 2019
- update wait delay transaction · 05f6b8af
  Le Van Truong authored 5 years ago
  
  05f6b8af
- update on build version: build.txt · 2d7d2f67
  Ludovic Apvrille authored 5 years ago
  
  2d7d2f67
Nov 26, 2019
- update on build version: build.txt · 1a3cc37f
  Ludovic Apvrille authored 5 years ago
  
  1a3cc37f
Nov 25, 2019
- update on build version: build.txt · 6a840b1b
  Ludovic Apvrille authored 5 years ago
  
  6a840b1b
Nov 24, 2019
- update on build version: build.txt · 27430836
  Ludovic Apvrille authored 5 years ago
  
  27430836