[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 --- Comment #40 from Oliver Kellogg --- Git commit 41a11789e272cf54c508f2053c1d58030ef1976b by Oliver Kellogg. Committed on 01/04/2022 at 19:49. Pushed by okellogg into branch 'master'. umbrello/petaltree2uml.cpp function ClassifierListReader::read : Generate xmi:id on datatype created for ClassAttribute type. M +12 -2umbrello/petaltree2uml.cpp https://invent.kde.org/sdk/umbrello/commit/41a11789e272cf54c508f2053c1d58030ef1976b -- You are receiving this mail because: You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 --- Comment #39 from Oliver Kellogg --- Git commit d6f1ebc2fbc6ae34f999a6ea228097555a0ade68 by Oliver Kellogg. Committed on 30/03/2022 at 05:14. Pushed by okellogg into branch 'master'. umbrello/petaltree2uml.cpp improvements on converting diagram elements: - Move viewTagToWidget from function umbrellify to global level and reset it to empty on beginning parse of diagram. - In function handleAssocView : - Do not fail if attribute "roleview_list" is not found. Reason: InheritView, RealizeView, and UsesView do not have this attribute. - If "roleview_list" is not present then retrieve `supplier` and `client` using attr->findAttribute() for "supplier" and "client", respectively. - Move locals supW and cliW up to wider scope in order to attempt their retrieval from viewTagToWidget[supplier] and viewTagToWidget[client], respectively. Execute the code involving view->umlScene()->widgetOnDiagram() only if client and/or supplier is not a key in viewTagToWidget. - In function umbrellify case (dt != Uml::DiagramType::Undefined) : - Clear viewTagToWidget. - In for-loop over atts, on handling CategoryView/ClassView etc retrieve attribute "icon" from attr. If it is "Interface" then - set local pointer cw to dynamic_cast(w); - if cw is non null then set visual property `DrawAsCircle` on cw. M +79 -53 umbrello/petaltree2uml.cpp https://invent.kde.org/sdk/umbrello/commit/d6f1ebc2fbc6ae34f999a6ea228097555a0ade68 -- You are receiving this mail because: You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 --- Comment #38 from Oliver Kellogg --- Created attachment 147774 --> https://bugs.kde.org/attachment.cgi?id=147774=edit Topcased-mm_V24_V2toV3-last.mdl with syntax errors fixed The file Topcased-mm_V24_V2toV3-last.mdl originates from an old Eclipse M2M Model-to-Model project which is now defunct and whose files are no longer available online. The original file had a few parenthesis imbalances which are fixed in this attachment. The file contains several activity diagrams which were used for testing the activity diagram conversion to Umbrello. -- You are receiving this mail because: You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 --- Comment #37 from Oliver Kellogg --- Git commit a1cb29f22904150e5489813c79f778857e84e794 by Oliver Kellogg. Committed on 27/03/2022 at 15:15. Pushed by okellogg into branch 'master'. umbrello/petaltree2uml.cpp function umbrellify completion of statemachine statediagrams conversion: - Local viewTagToWidget is a QMap mapping a view object's tag (number preceded by "@") to the Umbrello widget created. - In case (dt != Uml::DiagramType::Undefined) : - Local qreal maxY is initialized to 0.0 and is set to the largest Y (plus height) coordinate encountered during conversion of widgets. - Move declaration of locals `width` and `height` to inside for-loop. - Local UMLWidgetList swimlanes is an auxiliary list for adjusting the final height of swimlanes to contain all widgets. - Convert TransView to AssociationWidget with type State or Activity depending on the diagram type. - On converting Swimlane call swimlanes.append(w). - On converting StateView initialize `width` and `height` from w->width() and w->height(), respectively. - Convert DecisionView to ActivityWidget with ActivityType `Branch`. - Convert SynchronizationView to ForkJoinWidget with Qt::Orientation according to Rose attribute sync_is_horizontal. - Fill viewTagToWidget with attr->viewTag() as key and `w` (pointer to UMLWidget) as value. - After the conversion loop iterate over `swimlanes` for adjusting each swimlane's height to maxY. M +128 -14 umbrello/petaltree2uml.cpp https://invent.kde.org/sdk/umbrello/commit/a1cb29f22904150e5489813c79f778857e84e794 -- You are receiving this mail because: You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 --- Comment #36 from Oliver Kellogg --- Git commit 7b68b769c66b511b5d50e1772f9aaf657b16f32e by Oliver Kellogg. Committed on 26/03/2022 at 22:22. Pushed by okellogg into branch 'master'. umbrello/petaltree2uml.cpp various fixes following commit 9bfc122 : - In function fetchLocation, - revert change to argument of location.split(); - do not adjust returned values by factor Rose2Qt when width or height are provided as 0. - In function fetchDouble, - replace argument defaultValue by bool applyRose2Qt defaulting to true; - add debug statements on cases where 0.0 is returned; - adjust returned value by factor Rose2Qt only if applyRose2Qt is true. - In function umbrellify case (dt != Uml::DiagramType::Undefined) for- loop, fix bug in handling of line_color and fill_color: The hexadecimal number provided to QColor constructor must be 6 hex digits wide. If less than 6 digits pad with leading zeros. M +31 -9umbrello/petaltree2uml.cpp https://invent.kde.org/sdk/umbrello/commit/7b68b769c66b511b5d50e1772f9aaf657b16f32e -- You are receiving this mail because: You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 --- Comment #35 from Oliver Kellogg --- Git commit 9bfc122d8d5cc3331ae063b51761ce952471a9eb by Oliver Kellogg. Committed on 26/03/2022 at 06:27. Pushed by okellogg into branch 'master'. umbrello/petaltree2uml.cpp : Start fleshing out conversion of statemachine statediagrams. M +213 -27 umbrello/petaltree2uml.cpp https://invent.kde.org/sdk/umbrello/commit/9bfc122d8d5cc3331ae063b51761ce952471a9eb -- You are receiving this mail because: You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 --- Comment #34 from Oliver Kellogg --- Git commit 8c4efe08b41b4c34f429b4336e7c8053b6635f68 by Oliver Kellogg. Committed on 14/01/2022 at 06:45. Pushed by okellogg into branch 'master'. umbrello/import_rose.cpp followup to commit c7fdfef : - In function loadFromMDL, after loop over stream.readLine() do not set C++ as the code generator if progLang is `Reserved' and no code generator is set. Reason: progLang value Reserved indicates that the Rose "language" attribute was found to be "Analysis" which corresponds to the UML primitive types. M +2-5umbrello/import_rose.cpp https://invent.kde.org/sdk/umbrello/commit/8c4efe08b41b4c34f429b4336e7c8053b6635f68 -- You are receiving this mail because: You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 --- Comment #33 from Oliver Kellogg --- Git commit 72fdab6a907bcf1f204b5116cbf3e22c4611434c by Oliver Kellogg. Committed on 19/12/2020 at 19:11. Pushed by okellogg into branch 'master'. umbrello/petaltree2uml.cpp - Add importing of dependencies from Rose : - New ClassifierListReader child class UsesReader furnishes boilerplate for converting from PetalNode to UMLAssociation with type Dependency. - In function umbrellify, - in handling of objType "Class" create UsesReader on `c' and call usesReader.read on `node'; - in handling of defined diagramType(objType), on handling InheritView and RealizeView also handle UsesView setting `t' to Uml::AssociationType::Dependency; - remove handling of UsesView from handling of AttachView. M +44 -6umbrello/petaltree2uml.cpp https://invent.kde.org/sdk/umbrello/commit/72fdab6a907bcf1f204b5116cbf3e22c4611434c -- You are receiving this mail because: You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 --- Comment #32 from Oliver Kellogg --- Git commit ea603204f76d0e857abfa46266cd703133ddf272 by Oliver Kellogg. Committed on 14/12/2020 at 19:48. Pushed by okellogg into branch 'master'. umbrello/petaltree2uml.cpp - Add importing of enum types from Rose : - New ClassifierListReader child class LiteralsReader furnishes boilerplate for converting from PetalNode to UMLEnumLiteral. - In function umbrellify, if parsed class has some form of enum stereotype (such as "enum", "Enumeration", "CORBAEnum" etc) then - call Object_Factory::createUMLObject for type UMLObject::ot_Enum; - run LiteralsReader::read on the returned UMLEnum. M +44 -1umbrello/petaltree2uml.cpp https://invent.kde.org/sdk/umbrello/commit/ea603204f76d0e857abfa46266cd703133ddf272 -- You are receiving this mail because: You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364
--- Comment #31 from Oliver Kellogg ---
Git commit 1a9d32832d2217e57ed3db03eb4217105d1650d5 by Oliver Kellogg.
Committed on 13/12/2020 at 07:52.
Pushed by okellogg into branch 'master'.
import_rose.cpp : Align active programming language with model content
- Global `progLang' of type Uml::ProgrammingLanguage::Enum captures
programming language specified by Rose model.
- In function readAttributes loop of stream.readLine(), if nt is
PetalNode::nt_string and stringOrNodeOpener is not "(" then test name
for "language". If equal then derive progLang from value.string.
- In function loadFromMDL, after parsing the model file,
- if progLang hash not been established by the model and no code
generator hash been allocated at UMLApp then allocate generator
for C++ as default;
- else if progLang is not the same as the active generator at UMLApp
then call UMLApp::app()->setGenerator(progLang).
M +29 -0umbrello/import_rose.cpp
https://invent.kde.org/sdk/umbrello/commit/1a9d32832d2217e57ed3db03eb4217105d1650d5
--
You are receiving this mail because:
You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 Ralf Habacker changed: What|Removed |Added Version Fixed In|2.14.1 |2.14.1 (KDE Applications ||4.14) -- You are receiving this mail because: You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 Ralf Habacker changed: What|Removed |Added Version Fixed In||4.14.1 -- You are receiving this mail because: You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 Ralf Habacker changed: What|Removed |Added Version Fixed In|4.14.1 |2.14.1 -- You are receiving this mail because: You are watching all bug changes.
[umbrello] [Bug 81364] Import Rose model files
https://bugs.kde.org/show_bug.cgi?id=81364 Oliver Kellogg changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED --- Comment #30 from Oliver Kellogg --- Not perfect (regarding diagrams) but good enough (regarding structural elements.) Issues should be reported using separate bug reports. -- You are receiving this mail because: You are watching all bug changes.
