Hierarchical State-Machine visualization #614
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…s, running on UI thread inside the visualizer.
…r and mostly from the UI thread
Box will stand for BoxContainers and Phantoms.
…egistry to Mapper, injecting this mapper to the requiring classes via constructor injection
# Conflicts: # dev/plugins/hu.elte.txtuml.export.papyrus/src/hu/elte/txtuml/export/papyrus/DiagramManager.java # dev/plugins/hu.elte.txtuml.export.papyrus/src/hu/elte/txtuml/export/papyrus/elementsarrangers/gmflayout/ActivityDiagramElementsGmfArranger.java # dev/plugins/hu.elte.txtuml.export.papyrus/src/hu/elte/txtuml/export/papyrus/elementsarrangers/gmflayout/ClassDiagramElementsGmfArranger.java # dev/plugins/hu.elte.txtuml.export.papyrus/src/hu/elte/txtuml/export/papyrus/elementsarrangers/gmflayout/StateMachineDiagramElementsGmfArranger.java # dev/plugins/hu.elte.txtuml.export.papyrus/src/hu/elte/txtuml/export/papyrus/elementsarrangers/txtumllayout/AbstractDiagramElementsTxtUmlArranger.java # dev/plugins/hu.elte.txtuml.export.papyrus/src/hu/elte/txtuml/export/papyrus/elementsarrangers/txtumllayout/ClassDiagramElementsTxtUmlArranger.java # dev/plugins/hu.elte.txtuml.export.papyrus/src/hu/elte/txtuml/export/papyrus/elementsarrangers/txtumllayout/LayoutTransformer.java # dev/plugins/hu.elte.txtuml.export.papyrus/src/hu/elte/txtuml/export/papyrus/elementsmanagers/StateMachineDiagramElementsManager.java # dev/plugins/hu.elte.txtuml.export.papyrus/src/hu/elte/txtuml/export/papyrus/layout/txtuml/TxtUMLElementsMapper.java # dev/plugins/hu.elte.txtuml.export.papyrus/src/hu/elte/txtuml/export/papyrus/papyrusmodelmanagers/TxtUMLPapyrusModelManager.java # dev/plugins/hu.elte.txtuml.export.papyrus/src/hu/elte/txtuml/export/papyrus/wizardz/TxtUMLVisuzalizeWizard.java # dev/tests/hu.elte.txtuml.export.papyrus.tests/src/hu/elte/txtuml/export/papyrus/api/DiagramElementsModifierTest.java # dev/tests/hu.elte.txtuml.export.papyrus.tests/src/hu/elte/txtuml/export/papyrus/elementsarrangers/txtumllayout/tests/LayoutTransformerTest.java # dev/tests/hu.elte.txtuml.export.papyrus.tests/src/hu/elte/txtuml/export/papyrus/tests/UnitTests.java
The GraphSearch class now has a new constructor which allows the specification of whether the actual link to be arranged is a reflexive link. If it is then instead of calculating a length cost for the link a new cost called 'reflexive link minimum length' is calculated which is the difference between the length of the link so far and the maximal distance between two possible endpoints.
…tion and exportaton projects have been independently refactored, left in both to consolidate later.\n Moved `utils.eclipse.wizards` to `export.diagrams.common.wizards`
…ommon` Continuing preference consolidation
…oring If the paparuy icons are excahnged for Eclipse or custom ones, we can move `export.papyrus.preferences` to `export.diagrams.common`
Successfully integrated `new/papyrus-export` functionality into `master`-fork `new/papyrus-export` contains refactoring of visualization classes, including wizards. For this reason, recreated the wizard-hierarchy seen in `visualization-refactoring`, that is `TxtUMLVisualizeWizard`<-`UML2VisualizeWizard`<-JS/Papyrus wizards and `TxtUMLVisualizeWizard`<-PlantUMLVisualizeWizard These wizards all work as expected, but with different and varying parallelization and unique noticeable bugs. I believe this branch will make `visualization-refactoring` obsolete.
…plementation to `diagrams.common.statemachine``javascript....SMDiagram` is a mess but works for the moment
… its implementation to `diagrams.common.statemachine``javascript....SMDiagram` is a mess but works for the moment" This reverts commit 0474ffc.
JointJS visualization of hierarchical state machines now produces identical diagrams to Papyrus. Tested on non-hierarchical diagrams aswell.
When visualizing multiple models, some of them would fail becaulse the .uml file was missing. The cause of the bug is uncertain. Removing a `syncExec()` call resolved the issue.
…gram.common.test`
|
As this is an old and huge branch, I am unsure who to request reviews from. @djnemeth could you help with that please? |
|
Jenkins, retest this, please. |
|
I postpone this for now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Main issue: #605
Includes the branch new/papyrus-export, implementing all of its changes and functionality.
These include:
BoxBoxis eqvivalent to the oldPhantomBoxcan also have a sub-diagram with the@Insideannotation. This is the way to make hierarchical state-machines.export.diagrams.commonnow properly separates common elements in visualization componentsMain issue: #214
Resolves #585, #577, #524, #443, #516
Additional work on this branch:
A separate refactoring of the wizards and Papyrus components was already present on
masterfrom #574. Consolidated the two refactorings, with the changes fromnew/papyrus-exporttaking priority. Kept now unused classes inexport.papyrusfor future use.As this PR makes the branch
visualization-refactoringmore or less obsolete, I've included the fix for #582 in this branch aswell. Resolves #582 .JointJS visualization now produces identical hierarchical diagrams to Papyrus, handles the new
Boxdiagram element properly, has proper progress bar and is cancelable at any time.