Mograsim.git
4 years agoMerge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...
Fabian Stemmler [Wed, 17 Jul 2019 10:43:13 +0000 (12:43 +0200)]
Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into development

4 years agoFixed issues with WirePointHandle
Fabian Stemmler [Wed, 17 Jul 2019 10:42:12 +0000 (12:42 +0200)]
Fixed issues with WirePointHandle

- fixed issue with adding WPHs
- fixed issue with removing WPHs
- updated .json files in components

4 years agoMerge remote-tracking branch 'origin/development' into development
Daniel Kirschten [Wed, 17 Jul 2019 09:48:36 +0000 (11:48 +0200)]
Merge remote-tracking branch 'origin/development' into development

4 years agoUpdated to new SWTHelper version
Daniel Kirschten [Wed, 17 Jul 2019 09:47:38 +0000 (11:47 +0200)]
Updated to new SWTHelper version

4 years agoCreated complete Mograsim logo.
Christian Femers [Tue, 16 Jul 2019 16:27:16 +0000 (18:27 +0200)]
Created complete Mograsim logo.

4 years agoImproved snapping
Daniel Kirschten [Tue, 16 Jul 2019 11:39:49 +0000 (13:39 +0200)]
Improved snapping

4 years agoMade ComponenetSerializer a bit more readable
Daniel Kirschten [Mon, 15 Jul 2019 20:04:38 +0000 (22:04 +0200)]
Made ComponenetSerializer a bit more readable

4 years agoUse SWT's FileDialog instead of self-written one
Daniel Kirschten [Mon, 15 Jul 2019 20:00:12 +0000 (22:00 +0200)]
Use SWT's FileDialog instead of self-written one

4 years agoRestructured Snippet support:
Daniel Kirschten [Mon, 15 Jul 2019 19:32:25 +0000 (21:32 +0200)]
Restructured Snippet support:

-GUIComponent now supports setting HighLevelStateHandlers
-SubmodelComponent supports setting SymbolRenderers / OutlineRenderers

4 years agoAdded convenience constructors for default snippets
Daniel Kirschten [Mon, 15 Jul 2019 19:22:06 +0000 (21:22 +0200)]
Added convenience constructors for default snippets

4 years agoFinished renaming logic.ui to logic.model
Daniel Kirschten [Mon, 15 Jul 2019 19:18:30 +0000 (21:18 +0200)]
Finished renaming logic.ui to logic.model

4 years agoImplemented GUI_rsLatch's high level state handling
Daniel Kirschten [Mon, 15 Jul 2019 17:13:13 +0000 (19:13 +0200)]
Implemented GUI_rsLatch's high level state handling

4 years agoAdded WireForcingAtomicHighLevelStateHandler
Daniel Kirschten [Mon, 15 Jul 2019 17:11:46 +0000 (19:11 +0200)]
Added WireForcingAtomicHighLevelStateHandler

4 years agoMade sanity checks in Delegating(...)HighLevelStateHandler faster
Daniel Kirschten [Mon, 15 Jul 2019 17:11:38 +0000 (19:11 +0200)]
Made sanity checks in Delegating(...)HighLevelStateHandler faster

4 years agoBitVectorSplittingAtomicHighLevelStateHandler now supports Bits
Daniel Kirschten [Mon, 15 Jul 2019 17:10:58 +0000 (19:10 +0200)]
BitVectorSplittingAtomicHighLevelStateHandler now supports Bits

4 years agoRemoved unneccessary "this."
Daniel Kirschten [Mon, 15 Jul 2019 17:10:43 +0000 (19:10 +0200)]
Removed unneccessary "this."

4 years agoMade get/setHighLevelState ordering uniform: get... comes before set...
Daniel Kirschten [Mon, 15 Jul 2019 17:09:59 +0000 (19:09 +0200)]
Made get/setHighLevelState ordering uniform: get... comes before set...

4 years agoGUIWires now have names
Daniel Kirschten [Mon, 15 Jul 2019 16:35:42 +0000 (18:35 +0200)]
GUIWires now have names

4 years agoMerge branch 'development' of
Fabian Stemmler [Mon, 15 Jul 2019 16:19:15 +0000 (18:19 +0200)]
Merge branch 'development' of
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019 into development

# Conflicts:
# net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java

4 years agoEditor settings updated
Fabian Stemmler [Mon, 15 Jul 2019 16:12:33 +0000 (18:12 +0200)]
Editor settings updated

Editor settings now conform to agreed upon format and problem severity
settings

4 years agoFixed & cleaned up GUIWire:
Daniel Kirschten [Mon, 15 Jul 2019 16:10:19 +0000 (18:10 +0200)]
Fixed & cleaned up GUIWire:

It was possible to modify a GUIWire by changing arrays or points
returned by it.

4 years agoMerge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...
Fabian Stemmler [Mon, 15 Jul 2019 15:00:57 +0000 (17:00 +0200)]
Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019 into development

4 years agoAdded file menu to Editor
Fabian Stemmler [Mon, 15 Jul 2019 15:00:31 +0000 (17:00 +0200)]
Added file menu to Editor

4 years agoAdjusted editor to changes made in logic.model
Daniel Kirschten [Mon, 15 Jul 2019 14:35:55 +0000 (16:35 +0200)]
Adjusted editor to changes made in logic.model

4 years agoReexported mi.nandbased components to match new snippet IDs
Daniel Kirschten [Mon, 15 Jul 2019 14:30:12 +0000 (16:30 +0200)]
Reexported mi.nandbased components to match new snippet IDs

4 years agoMerge remote-tracking branch 'origin/development' into development
Daniel Kirschten [Mon, 15 Jul 2019 14:26:37 +0000 (16:26 +0200)]
Merge remote-tracking branch 'origin/development' into development

4 years agoSecured standardComponentIDs against accidental modifications
Daniel Kirschten [Mon, 15 Jul 2019 14:26:07 +0000 (16:26 +0200)]
Secured standardComponentIDs against accidental modifications

It is possible to call remove() on Map.keySet(), which will remove that
key (and value) from the original map.

4 years agoMerge remote-tracking branch 'origin/development' into development
Daniel Kirschten [Mon, 15 Jul 2019 14:22:37 +0000 (16:22 +0200)]
Merge remote-tracking branch 'origin/development' into development

4 years agoNow using high level state handlers in mi.nandbased (except GUI_rslatch)
Daniel Kirschten [Mon, 15 Jul 2019 14:18:09 +0000 (16:18 +0200)]
Now using high level state handlers in mi.nandbased (except GUI_rslatch)

4 years agoImplemented some high level state handlers; changed standard snippet IDs
Daniel Kirschten [Mon, 15 Jul 2019 14:16:23 +0000 (16:16 +0200)]
Implemented some high level state handlers; changed standard snippet IDs

4 years agoAdded menu for adding components with parameters
Fabian Stemmler [Mon, 15 Jul 2019 13:13:42 +0000 (15:13 +0200)]
Added menu for adding components with parameters

Also restructured DialogManager and fixed some issues with DialogManager
and EditorGUI

4 years agoFixed an issue when removing multiple WirePointHandles at once
Fabian Stemmler [Mon, 15 Jul 2019 13:11:38 +0000 (15:11 +0200)]
Fixed an issue when removing multiple WirePointHandles at once

Also changed click priority: WireHandles have a higher priority than
ComponentHandles now.

4 years agoRestructured serializing/deserializing
Daniel Kirschten [Mon, 15 Jul 2019 09:42:19 +0000 (11:42 +0200)]
Restructured serializing/deserializing

4 years agoAdded option to switch off snapping in the Editor
Fabian Stemmler [Sun, 14 Jul 2019 16:08:35 +0000 (18:08 +0200)]
Added option to switch off snapping in the Editor

Also moved all UI related classes into their own package

4 years agoMerge branch 'development' of
Fabian Stemmler [Sat, 13 Jul 2019 10:33:03 +0000 (12:33 +0200)]
Merge branch 'development' of
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into
development

Conflicts:
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java
net.mograsim.logic.ui/src/net/mograsim/logic/ui/serializing/DeserializedSubmodelComponent.java
net.mograsim.logic.ui/src/net/mograsim/logic/ui/serializing/IndirectGUIComponentCreator.java

4 years agoAdded DeserializedSubmodelComponent Editor project
Fabian Stemmler [Fri, 12 Jul 2019 16:38:16 +0000 (18:38 +0200)]
Added DeserializedSubmodelComponent Editor project

4 years agoAdded methods to modify a Wires path and a PathChangedListener
Fabian Stemmler [Fri, 12 Jul 2019 16:32:02 +0000 (18:32 +0200)]
Added methods to modify a Wires path and a PathChangedListener

4 years agoA Set of GUIComponent standard IDs is now accessible publicly
Fabian Stemmler [Fri, 12 Jul 2019 16:30:53 +0000 (18:30 +0200)]
A Set of GUIComponent standard IDs is now accessible publicly

4 years agoAllowed more public modifications of DeserializedSubmodelComponents
Fabian Stemmler [Fri, 12 Jul 2019 16:29:49 +0000 (18:29 +0200)]
Allowed more public modifications of DeserializedSubmodelComponents

4 years agoRemoved ...core.model package from manifest
Christian Femers [Thu, 11 Jul 2019 20:00:11 +0000 (22:00 +0200)]
Removed ...core.model package from manifest

4 years agoClasses will move and be reworked in the net.mograsim.machine plugin
Christian Femers [Thu, 11 Jul 2019 19:59:27 +0000 (21:59 +0200)]
Classes will move and be reworked in the net.mograsim.machine plugin

4 years agoFixed package naming
Christian Femers [Thu, 11 Jul 2019 19:57:21 +0000 (21:57 +0200)]
Fixed package naming

4 years agoAdopted tests to new BitVector and improved labeling
Christian Femers [Thu, 11 Jul 2019 19:56:11 +0000 (21:56 +0200)]
Adopted tests to new BitVector and improved labeling

4 years agoRefactored BitVector methods to resolve ambiguity
Christian Femers [Thu, 11 Jul 2019 19:51:38 +0000 (21:51 +0200)]
Refactored BitVector methods to resolve ambiguity

4 years agoRenamed logic.ui to logic.model
Daniel Kirschten [Wed, 10 Jul 2019 10:46:25 +0000 (12:46 +0200)]
Renamed logic.ui to logic.model

4 years agoUpdated to new SWTHelper version
Daniel Kirschten [Wed, 10 Jul 2019 10:35:21 +0000 (12:35 +0200)]
Updated to new SWTHelper version

4 years agoFixed package exports in net.mograsim.logic.ui's MANIFEST.MF
Daniel Kirschten [Mon, 8 Jul 2019 11:20:09 +0000 (13:20 +0200)]
Fixed package exports in net.mograsim.logic.ui's MANIFEST.MF

4 years agoGUIComponents now have names
Daniel Kirschten [Mon, 8 Jul 2019 11:16:49 +0000 (13:16 +0200)]
GUIComponents now have names

4 years agoSmall fix in ClickableSubmodelComponentsTest
Daniel Kirschten [Mon, 8 Jul 2019 10:52:43 +0000 (12:52 +0200)]
Small fix in ClickableSubmodelComponentsTest

4 years agoCodeSnippetSupplier now supports high level state handlers
Daniel Kirschten [Mon, 8 Jul 2019 08:48:30 +0000 (10:48 +0200)]
CodeSnippetSupplier now supports high level state handlers

4 years agoReplaced "provider" in identifiers with "supplier"
Daniel Kirschten [Mon, 8 Jul 2019 08:44:09 +0000 (10:44 +0200)]
Replaced "provider" in identifiers with "supplier"

4 years agoCodeSnippetSupplier doesn't complain anymore if 'id == null'
Daniel Kirschten [Fri, 5 Jul 2019 14:20:22 +0000 (16:20 +0200)]
CodeSnippetSupplier doesn't complain anymore if 'id == null'

4 years agoSwitched mostly to using deserialized component versions
Daniel Kirschten [Fri, 5 Jul 2019 14:16:01 +0000 (16:16 +0200)]
Switched mostly to using deserialized component versions

Didn't switch where high level states are needed

4 years agoRemoved ConnectionPoint causing confusion
Daniel Kirschten [Fri, 5 Jul 2019 14:03:47 +0000 (16:03 +0200)]
Removed ConnectionPoint causing confusion

4 years agoMerge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...
Fabian Stemmler [Fri, 5 Jul 2019 13:04:12 +0000 (15:04 +0200)]
Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into development

4 years agoAdded a GUIComponent resize listener
Fabian Stemmler [Fri, 5 Jul 2019 13:03:28 +0000 (15:03 +0200)]
Added a GUIComponent resize listener

4 years agoMade Renderers usable without JSON
Daniel Kirschten [Thu, 4 Jul 2019 14:12:43 +0000 (16:12 +0200)]
Made Renderers usable without JSON

4 years agoMade CodeSnippetSupplier generic
Daniel Kirschten [Thu, 4 Jul 2019 08:50:11 +0000 (10:50 +0200)]
Made CodeSnippetSupplier generic

4 years agoUpdated MANIFEST.MF
Daniel Kirschten [Thu, 4 Jul 2019 08:31:00 +0000 (10:31 +0200)]
Updated MANIFEST.MF

4 years agoMoved code serializing a symbol renderer to where it belongs
Daniel Kirschten [Thu, 4 Jul 2019 08:30:35 +0000 (10:30 +0200)]
Moved code serializing a symbol renderer to where it belongs

4 years agoAdded two SymbolRendererProviders
Daniel Kirschten [Thu, 4 Jul 2019 08:24:44 +0000 (10:24 +0200)]
Added two SymbolRendererProviders

4 years agoOrganized imports + cleaned MANIFEST.MF
Daniel Kirschten [Wed, 3 Jul 2019 21:30:04 +0000 (23:30 +0200)]
Organized imports + cleaned MANIFEST.MF

4 years agoFixed net.mograsim.plugin.core
Daniel Kirschten [Wed, 3 Jul 2019 21:29:19 +0000 (23:29 +0200)]
Fixed net.mograsim.plugin.core

4 years agoMade classes in package "nandbased" usable for JSON
Daniel Kirschten [Wed, 3 Jul 2019 21:25:47 +0000 (23:25 +0200)]
Made classes in package "nandbased" usable for JSON

4 years agoSwitched SubmodelComponentTestbench to use JSON-based Am2901
Daniel Kirschten [Wed, 3 Jul 2019 21:25:03 +0000 (23:25 +0200)]
Switched SubmodelComponentTestbench to use JSON-based Am2901

4 years agoFixed & renamed CodeSnippetSupplier.tryInvokeStaticInitializer
Daniel Kirschten [Wed, 3 Jul 2019 21:17:37 +0000 (23:17 +0200)]
Fixed & renamed CodeSnippetSupplier.tryInvokeStaticInitializer

4 years agoFixed standardComponentIDMapping
Daniel Kirschten [Wed, 3 Jul 2019 21:16:19 +0000 (23:16 +0200)]
Fixed standardComponentIDMapping

4 years agoRebuilt component JSON files
Daniel Kirschten [Wed, 3 Jul 2019 21:16:05 +0000 (23:16 +0200)]
Rebuilt component JSON files

4 years agoUpdated version; added string-based methods in JsonHandler
Daniel Kirschten [Wed, 3 Jul 2019 21:02:36 +0000 (23:02 +0200)]
Updated version; added string-based methods in JsonHandler

4 years agoGUIComponents now serialize and deserialize parameters (where needed)
Daniel Kirschten [Wed, 3 Jul 2019 20:43:03 +0000 (22:43 +0200)]
GUIComponents now serialize and deserialize parameters (where needed)

4 years agoUpdated MANIFEST.MF
Daniel Kirschten [Wed, 3 Jul 2019 20:20:37 +0000 (22:20 +0200)]
Updated MANIFEST.MF

4 years agoRestructured serializing / deserializing
Daniel Kirschten [Wed, 3 Jul 2019 20:19:16 +0000 (22:19 +0200)]
Restructured serializing / deserializing

4 years agoRemoved old ColorHelper class
Daniel Kirschten [Wed, 3 Jul 2019 08:39:25 +0000 (10:39 +0200)]
Removed old ColorHelper class

4 years agoRestructured serializing classes
Daniel Kirschten [Tue, 2 Jul 2019 21:01:03 +0000 (23:01 +0200)]
Restructured serializing classes

4 years agoAdded MSB first versions of parse() and toString()
Daniel Kirschten [Sun, 30 Jun 2019 16:39:00 +0000 (18:39 +0200)]
Added MSB first versions of parse() and toString()

4 years agoMade Am2901 tests work again
Daniel Kirschten [Sun, 30 Jun 2019 16:28:53 +0000 (18:28 +0200)]
Made Am2901 tests work again

4 years agoTextComponent no longer overrides getBounds but rather calls setSize()
Daniel Kirschten [Sun, 30 Jun 2019 16:14:24 +0000 (18:14 +0200)]
TextComponent no longer overrides getBounds but rather calls setSize()

4 years agoFixed TextComponent having two different positions:
Daniel Kirschten [Sun, 30 Jun 2019 15:45:29 +0000 (17:45 +0200)]
Fixed TextComponent having two different positions:

getPosX/Y() reported a different position than getBounds().x/y, which
could cause problems

4 years agoReplaced static factory method with constructor
Daniel Kirschten [Sun, 30 Jun 2019 15:44:21 +0000 (17:44 +0200)]
Replaced static factory method with constructor

4 years agoFixed GUIram4 high level state access
Daniel Kirschten [Sun, 30 Jun 2019 14:33:41 +0000 (16:33 +0200)]
Fixed GUIram4 high level state access

4 years agoMore helpful error message if no component is selected in LogicUICanvas
Daniel Kirschten [Sun, 30 Jun 2019 13:17:25 +0000 (15:17 +0200)]
More helpful error message if no component is selected in LogicUICanvas

4 years agoRestructured high level state access
Daniel Kirschten [Sun, 30 Jun 2019 13:13:31 +0000 (15:13 +0200)]
Restructured high level state access

4 years agoMoved sanity check to make more sense
Daniel Kirschten [Sun, 30 Jun 2019 13:12:36 +0000 (15:12 +0200)]
Moved sanity check to make more sense

4 years agoCorrected incorrect correction of bit order
Daniel Kirschten [Sun, 30 Jun 2019 12:54:40 +0000 (14:54 +0200)]
Corrected incorrect correction of bit order

4 years agoRemoved System.out's
Christian Femers [Sat, 29 Jun 2019 01:36:40 +0000 (03:36 +0200)]
Removed System.out's

4 years agoChanged high level addressing to have the correct bit and reg. order
Christian Femers [Sat, 29 Jun 2019 01:35:09 +0000 (03:35 +0200)]
Changed high level addressing to have the correct bit and reg. order

4 years agoFixed and added a lot of tests
Christian Femers [Sat, 29 Jun 2019 01:30:32 +0000 (03:30 +0200)]
Fixed and added a lot of tests

4 years agoImproved package structure
Christian Femers [Sat, 29 Jun 2019 01:29:46 +0000 (03:29 +0200)]
Improved package structure

4 years agoAdded getBounds() to TextComponent
Christian Femers [Sat, 29 Jun 2019 01:29:05 +0000 (03:29 +0200)]
Added getBounds() to TextComponent

4 years agoFixed ManualSwitch concerning U and added Bit methods
Christian Femers [Sat, 29 Jun 2019 01:28:14 +0000 (03:28 +0200)]
Fixed ManualSwitch concerning U and added Bit methods

4 years agoAdded an visual-only text component and modelling helper class
Christian Femers [Fri, 28 Jun 2019 17:26:19 +0000 (19:26 +0200)]
Added an visual-only text component and modelling helper class

4 years agoMade LogicUIStandalone implement Runnable because why not.
Christian Femers [Fri, 28 Jun 2019 17:24:47 +0000 (19:24 +0200)]
Made LogicUIStandalone implement Runnable because why not.

4 years agoCommon ConnectionPoint interface to simplify many things
Christian Femers [Fri, 28 Jun 2019 17:22:57 +0000 (19:22 +0200)]
Common ConnectionPoint interface to simplify many things

Simplifies the GUIWire's constructors and allows to loop to create wire
connections.

4 years agoSlight improvements in documentation.
Daniel Kirschten [Wed, 26 Jun 2019 21:10:56 +0000 (23:10 +0200)]
Slight improvements in documentation.

4 years agoImplemented set/getHighLevelState for most components
Daniel Kirschten [Wed, 26 Jun 2019 21:02:59 +0000 (23:02 +0200)]
Implemented set/getHighLevelState for most components

4 years agoConstructor of BitVector now is fail-fast for bits being null
Daniel Kirschten [Wed, 26 Jun 2019 20:29:20 +0000 (22:29 +0200)]
Constructor of BitVector now is fail-fast for bits being null

4 years agoAdded debug shell for setHighLevelState; improved ViewModel comments
Daniel Kirschten [Wed, 26 Jun 2019 19:53:44 +0000 (21:53 +0200)]
Added debug shell for setHighLevelState; improved ViewModel comments

4 years agoMerge remote-tracking branch 'origin/development' into development
Daniel Kirschten [Wed, 26 Jun 2019 19:19:17 +0000 (21:19 +0200)]
Merge remote-tracking branch 'origin/development' into development

4 years agomapping.json is now loaded by the class loader
Fabian Stemmler [Wed, 26 Jun 2019 19:11:21 +0000 (21:11 +0200)]
mapping.json is now loaded by the class loader

4 years agoImplemented GUI_rsLatch#setHighLevelState
Daniel Kirschten [Wed, 26 Jun 2019 17:19:39 +0000 (19:19 +0200)]
Implemented GUI_rsLatch#setHighLevelState