[Uml-devel] branches/work/soc-umbrello/umbrello

[Andi Fischer]

SVN commit 1296820 by fischer:

Differences to trunk reduced.

 M  +2 -0      optionstate.cpp  
 M  +6 -13     umlscene.cpp  
 M  +1 -5      umlview.h  
 U             widgets/objectnodewidget.cpp  
 M  +2 -2      widgets/objectnodewidget.h  
 M  +1 -1      widgets/objectwidget.cpp  
 M  +1 -1      widgets/objectwidget.h  
 M  +2 -4      widgets/umlwidget.cpp  


--- branches/work/soc-umbrello/umbrello/optionstate.cpp #1296819:1296820
@@ -100,6 +100,8 @@
         optstate.classState.showVisibility = (bool)temp.toInt();
         temp = element.attribute("showstereotype", "0");
         optstate.classState.showStereoType = (bool)temp.toInt();
+        temp = element.attribute("showpubliconly" "0");
+        optstate.classState.showPublicOnly = (bool)temp.toInt();
 
         return true;
     }
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1296819:1296820
@@ -2924,7 +2924,6 @@
 void UMLScene::copyAsImage(QPixmap*& pix)
 {
     //get the smallest rect holding the diagram
-    // [PORT]
     QRect rect = diagramRect().toRect();
     QPixmap diagram(rect.width(), rect.height());
 
@@ -2964,18 +2963,12 @@
     foreach(AssociationWidget *a , m_AssociationList) {
         if (! a->isSelected())
             continue;
-        const FloatingTextWidget* multiA =
-            const_cast<const FloatingTextWidget*>(a->multiplicityWidget(Uml::A));
-        const FloatingTextWidget* multiB =
-            const_cast<const FloatingTextWidget*>(a->multiplicityWidget(Uml::B));
-        const FloatingTextWidget* roleA =
-            const_cast<const FloatingTextWidget*>(a->roleWidget(Uml::A));
-        const FloatingTextWidget* roleB =
-            const_cast<const FloatingTextWidget*>(a->roleWidget(Uml::B));
-        const FloatingTextWidget* changeA =
-            const_cast<const FloatingTextWidget*>(a->changeabilityWidget(Uml::A));
-        const FloatingTextWidget* changeB =
-            const_cast<const FloatingTextWidget*>(a->changeabilityWidget(Uml::B));
+        const FloatingTextWidget* multiA = a->multiplicityWidget(Uml::A);
+        const FloatingTextWidget* multiB = a->multiplicityWidget(Uml::B);
+        const FloatingTextWidget* roleA = a->roleWidget(Uml::A);
+        const FloatingTextWidget* roleB = a->roleWidget(Uml::B);
+        const FloatingTextWidget* changeA = a->changeabilityWidget(Uml::A);
+        const FloatingTextWidget* changeB = a->changeabilityWidget(Uml::B);
         findMaxBoundingRectangle(multiA, px, py, qx, qy);
         findMaxBoundingRectangle(multiB, px, py, qx, qy);
         findMaxBoundingRectangle(roleA, px, py, qx, qy);
--- branches/work/soc-umbrello/umbrello/umlview.h #1296819:1296820
@@ -58,12 +58,8 @@
 
     QPointF m_currentCenterPoint;  ///< holds the current centerpoint for the view, used for panning and zooming
     QPoint  m_lastPanPoint;        ///< from panning the view
+    int     m_nZoom;               ///< zoom level in percent, default 100
 
-    /**
-     * The zoom level in percent, default 100
-     */
-    int m_nZoom;
-
 };
 
 #endif // UMLVIEW_H
--- branches/work/soc-umbrello/umbrello/widgets/objectnodewidget.h #1296819:1296820
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2006                                               *
+ *   copyright (C) 2002-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -60,8 +60,8 @@
     void askStateForWidget();
     void askForObjectNodeType(UMLWidget* &targetWidget);
 
+    virtual void saveToXMI(QDomDocument& qDoc, QDomElement& qElement);
     virtual bool loadFromXMI( QDomElement & qElement );
-    virtual void saveToXMI( QDomDocument & qDoc, QDomElement & qElement );
 
 public Q_SLOTS:
     virtual void slotMenuSelection(QAction* action);
--- branches/work/soc-umbrello/umbrello/widgets/objectwidget.cpp #1296819:1296820
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2011                                               *
+ *   copyright (C) 2002-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
--- branches/work/soc-umbrello/umbrello/widgets/objectwidget.h #1296819:1296820
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2011                                               *
+ *   copyright (C) 2002-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
--- branches/work/soc-umbrello/umbrello/widgets/umlwidget.cpp #1296819:1296820
@@ -24,7 +24,6 @@
 #include "associationwidget.h"
 #include "classpropdlg.h"
 #include "debug_utils.h"
-#include "docwindow.h"
 #include "listpopupmenu.h"
 #include "textitemgroup.h"
 #include "textitem.h"
@@ -225,11 +224,10 @@
 {
     // will already be selected so make sure docWindow updates the doc
     // back it the widget
-    DocWindow *docwindow = UMLApp::app()->docWindow();
-    docwindow->updateDocumentation(false);
+    umlScene()->updateDocumentation(false);
     QPointer<ClassPropDlg> dlg = new ClassPropDlg((QWidget*)UMLApp::app(), this);
     if (dlg->exec()) {
-        docwindow->showDocumentation(umlObject() , true);
+        umlScene()->showDocumentation(umlObject() , true);
         umlDoc()->setModified(true);
     }
     dlg->close();