- 16 May, 2022 3 commits
-
-
Oliver Kellogg authored
Followup to commit 5803dcd2 - add basic support for loading StarUML and MagicDraw/Cameo while preserving load of native XMI: umbrello/model_utils.{h,cpp} - New function loadCommentFromXMI returns the text of an <ownedComment> UML2 element from a QDomElement. It attempts to read the attribute "body" and if that returns empty then attempts to read the text of the nested element <body>. umbrello/umldoc.cpp - In function loadFromXMI case outerTag "XMI" or "xmi:XMI" for-loop of node: - If outerTag stripped of namespace is "Model" or "Package" or "packagedElement" and the call to loadUMLObjectsFromXMI(element) returns false then do not return false. Reason: This gives better results on loading foreign XMI formats. - Support tagEq(tag, "DataType") alongside "Package", "Class", etc. - Support tagEq(tag, "ownedComment") using Model_Utils::loadCommentFromXMI(element). - In function loadUMLObjectsFromXMI for-loop of node: 1) Move up declaration of xmiType and setting of type from xmiT...
-
Oliver Kellogg authored
umbrello/umlwidgets/associationwidget.cpp - Reduce PIXEL_TOLERANCE to 20. - In function linePathStartsAt, on initializing wX and wY use widget->getX() and widget->getY(), respectively. BUG: 453901 FIXED-IN: 2.34.70 (KDE releases 22.07.70)
-
Oliver Kellogg authored
umbrello/umlwidgets/childwidgetplacementport.cpp - In function detectConnectedSide fix formatting at assignments to m_connectedSide. umbrello/umlwidgets/pinportbase.cpp - In function onWidget log a debug message showing input position, owner, and result of UMLWidget::onWidget(p).
-
- 13 May, 2022 1 commit
-
-
Oliver Kellogg authored
umbrello/debug/debug_utils.cpp cosmetics: Avoid overlong lines in sample backtraces, remove spaces at end of lines.
-
- 10 May, 2022 2 commits
-
-
Oliver Kellogg authored
-
Oliver Kellogg authored
tools/shared.cpp (applyTranslationToXMIFile) : Local constant readerAttributes abbreviates reader.attributes()
-
- 09 May, 2022 3 commits
-
-
Oliver Kellogg authored
-
Oliver Kellogg authored
umbrello/menus/umllistviewpopupmenu.{h,cpp} umbrello/menus/umlscenepopupmenu.{h,cpp} umbrello/menus/widgetbasepopupmenu.{h,cpp} - In function insertSubMenuNew, - remove unused argument `menu'; - declare KMenu *menu as local variable.
-
It's highly wasteful; it takes like 3 minutes to compile Umbrello and 15 minutes to build the API docs.
-
- 01 May, 2022 1 commit
-
-
Script Kiddy authored
-
- 30 Apr, 2022 1 commit
-
-
Oliver Kellogg authored
umbrello/{codeimpwizard/codeimpthread.cpp,umlwidgets/associationline.cpp} doxygen fixes following commit 5fb109fb
-
- 26 Apr, 2022 5 commits
-
-
Oliver Kellogg authored
https://mail.kde.org/pipermail/umbrello-devel/2022-April/023235.html This patch adds support to use of standard location and shortcuts for {un,re}do actions. umbrello/uml.cpp (UMLApp::initActions) - Use `KStandardAction::{un,re}do' to create {un,re}do actions, adding a tooltip to describe them.
-
Oliver Kellogg authored
-
Oliver Kellogg authored
https://mail.kde.org/pipermail/umbrello-devel/2022-April/023234.html Executing {un,re}do commands a sigsegv happens as follows: > [...] > at > /umbrello_git/umbrello/cmds/widget/cmdbasewidgetcommand.cpp:77 > (this=0x7fffe4006f10) > at > /umbrello_git/umbrello/cmds/widget/cmdcreatewidget.cpp:124 When `undo' command is triggered, it calls to `o->deleteLater' getting out of memory the `widget' object, then, doing a `redo' command this object is not longer available, so an invalid `m_widget' reference is used. This patch change this behavior calling `{add,remove}Item' member function from `{re,un}do' callbacks respectively triggered by `QUndoStack::push' member. umbrello/cmds/widget/cmdcreatewidget.cpp - Move call to addWidgetToScene from constructor to function redo(). - In function redo() use `addWidgetToScene' with `m_widget', updating scene object. umbrello/umlscene.cpp - In function removeWidgetCmd() remove `o->deleteLater' updating the scene. Signed-off-by:
Guillermo E. Martinez <guillermo.e.martinez@oracle.com>
-
Oliver Kellogg authored
-
Oliver Kellogg authored
-
- 23 Apr, 2022 1 commit
- 17 Apr, 2022 2 commits
-
-
Oliver Kellogg authored
umbrello/codeimport/pythonimport.cpp function skipBody - Add bool dictInitializer initialized to false. - In while-loop : - If token is "}" then - if dictInitializer is true then append '}' to body and set dictInitializer false; - move braceNesting related code to else-part of this if-statement. - If token is "{" then - if previous token is "=" then append '{' to body and set dictInitializer true; - move braceNesting related code to else-part of this if-statement. BUG: 452702 FIXED-IN: 2.34.70 (KDE releases 22.07.70)
-
Oliver Kellogg authored
- In function loadUMLObjectsFromXMI loop of node over element children move the code if (tagEq(type, QLatin1String("packagedElement")) || tagEq(type, QLatin1String("ownedElement"))) { type = tempElement.attribute(QLatin1String("xmi:type")); } up by a few lines to precede the test for tagEq(type, "Model"). Reason: StarUML generates a model element <packagedElement [...] xmi:type="uml:Model"> nested inside the outer envelope <uml:Model [...] xmi:type="uml:Model" name="RootModel"> CCBUG: 56184
-
- 16 Apr, 2022 3 commits
-
-
Oliver Kellogg authored
umbrello/assocrules.cpp - In function allowAssociation(assocType, widget) return false if widgetType is wt_Datatype and Model_Utils::isCommonDataType() returns true for widget->name(). Reason: It shall not be possible to add an association originating from a programming language predefined type. - In m_AssocRules[] add entry for - Generalization with source wt_Datatype and target wt_Datatype; - Dependency with source wt_Datatype and target wt_Datatype.
-
Oliver Kellogg authored
umbrello/umlmodel/operation.{h,cpp} : Rename m_List to m_args for avoiding confusion with UMLCanvasObject::m_List.
-
Oliver Kellogg authored
-
- 15 Apr, 2022 4 commits
-
-
Oliver Kellogg authored
umbrello/umllistview.cpp - In function addNewItem do not force parentItem of lvt_Datatype to m_datatypeFolder. BUG: 87537 FIXED-IN: 2.34.70 (KDE releases 22.07.70)
-
Oliver Kellogg authored
-
Oliver Kellogg authored
umbrello/model_utils.cpp : In function isCommonDataType case (gen == 0) return false unless `type' matches a UML primitive type.
-
Oliver Kellogg authored
umbrello/menus/umllistviewpopupmenu.cpp : In constructor add missing insert(mt_Rename) at various UMLListViewItem types.
-
- 06 Apr, 2022 1 commit
-
-
Oliver Kellogg authored
umbrello/umlmodel/attribute.cpp - In function load1 case m_SecondaryId.isEmpty() while-loop over node case !href.isEmpty(), - bool isPrimitive is set to xmiType.contains("PrimitiveType") if xmiType is non empty, else is set to href.contains("PrimitiveType"); - proceed with primitive type handling if isPrimitive is true and the href suffix conforms to primitive type syntax. CCBUG: 56184
-
- 03 Apr, 2022 1 commit
-
-
Script Kiddy authored
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
-
- 02 Apr, 2022 3 commits
-
-
Oliver Kellogg authored
umbrello/petaltree2uml.cpp function umbrellify processing of diagrams : If attribute fill_color is not encountered on the view object then then call w->setUseFillColor(false).
-
Oliver Kellogg authored
umbrello/umldoc.cpp function createDatatype case !dt : On calling Object_Factory::createUMLObject apply Model_Utils::normalize to name.
-
Oliver Kellogg authored
umbrello/menus/umlscenepopupmenu.cpp function insertSubMenuNew cosmetics: At case Uml::DiagramType::Object fix indentation.
-
- 01 Apr, 2022 3 commits
-
-
Oliver Kellogg authored
umbrello/petaltree2uml.cpp function ClassifierListReader::read : Generate xmi:id on datatype created for ClassAttribute type. CCBUG: 81364
-
Oliver Kellogg authored
umbrello/umlmodel/package.cpp function removeAllObjects : Presence of null pointer in list shall not prematurely terminate the loop. After end of loop call m_objects.clear().
-
Oliver Kellogg authored
umbrello/umlmodel/package.cpp function addObject case interactOnConflict: Preexisting association of same name does not create a naming conflict.
-
- 30 Mar, 2022 1 commit
-
-
Oliver Kellogg authored
- 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<ClassifierWidget*>(w); - if cw is non null then set visual property `DrawAsCircle` on cw. CCBUG: 81364
-
- 29 Mar, 2022 1 commit
-
-
Script Kiddy authored
-
- 27 Mar, 2022 3 commits
-
-
Oliver Kellogg authored
- Local viewTagToWidget is a QMap<QString, UMLWidget*> 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. CCBUG: 81364
-
Oliver Kellogg authored
-
Oliver Kellogg authored
umbrello/umlwidgets/forkjoinwidget.cpp : In constructor align arguments to setSize() with the Qt::Orientation given.
-
- 26 Mar, 2022 1 commit
-
-
Oliver Kellogg authored
- 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. CCBUG: 81364
-