Oliver Kellogg | 1 Oct 07:30 2004
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

setTextPosition{Relatively}: Simplify.

  M +73 -37    associationwidget.cpp   1.121
  M +4 -6      associationwidget.h   1.50

Oliver Kellogg | 1 Oct 07:33 2004
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

{set,get}IgnoreSnapToGrid: New.

  M +8 -0      umlwidget.cpp   1.103
  M +10 -0     umlwidget.h   1.40

--- kdesdk/umbrello/umbrello/umlwidget.cpp  #1.102:1.103
 <at>  <at>  -930,4 +930,12  <at>  <at>  bool UMLWidget::widgetHasUMLObject(Uml::
 }

+void UMLWidget::setIgnoreSnapToGrid(bool to) {
+        m_bIgnoreSnapToGrid = to;
+}
+
+bool UMLWidget::getIgnoreSnapToGrid() const {
+        return m_bIgnoreSnapToGrid;
+}
+
 void UMLWidget::setSize(int width,int height) {
         // snap to the next larger size that is a multiple of the grid

--- kdesdk/umbrello/umbrello/umlwidget.h  #1.39:1.40
 <at>  <at>  -314,4 +314,14  <at>  <at>  public:

         /**
+         * Set m_bIgnoreSnapToGrid.
+         */
+        void setIgnoreSnapToGrid(bool to);
+
(Continue reading)

Oliver Kellogg | 1 Oct 07:33 2004
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

FloatingText::setLinePosition{Relatively}: Remove.

  M +0 -39     floatingtext.cpp   1.57
  M +0 -19     floatingtext.h   1.23
  M +11 -1     messagewidget.cpp   1.49

--- kdesdk/umbrello/umbrello/floatingtext.cpp  #1.56:1.57
 <at>  <at>  -71,43 +71,4  <at>  <at>  void FloatingText::draw(QPainter & p, in
 void FloatingText::resizeEvent(QResizeEvent * /*re*/) {}

-void FloatingText::setLinePos(int x, int y) {
-        bool xIsValid = (x >= restrictPositionMin && x <= restrictPositionMax);
-        bool yIsValid = (y >= restrictPositionMin && y <= restrictPositionMax);
-        if (xIsValid && yIsValid) { // fine
-                setX(x);
-                setY(y);
-        } else { // something is broken
-                kdDebug() << "FloatingText::setLinePos( " << x << " , " << y << " ) "
-                        << "- was blocked because at least one value is out of bounds: ["
-                        << restrictPositionMin << "..." << restrictPositionMax << "]  "
-                        << "origX: " << getX() << ", origY: " << getY()
-                        << endl;
-                // Let's just leave them at their original values.
-        }
-}
-
-void FloatingText::setLinePositionRelatively(int newX, int newY, int oldX, int oldY) {
-        int myNewX = getX() + (newX-oldX);
(Continue reading)

Gustavo Sverzut Barbieri | 1 Oct 02:07 2004
Picon

[Bug 90207] Bad association line position in use case diagrams

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.

http://bugs.kde.org/show_bug.cgi?id=90207        

------- Additional Comments From gsbarbieri yahoo com br  2004-10-01 02:07 -------
It works all right.

Thanks.

-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
Oliver Kellogg | 1 Oct 21:53 2004
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

handleRename(): Publicize.

  M +6 -6      floatingtext.h   1.24

--- kdesdk/umbrello/umbrello/floatingtext.h  #1.23:1.24
 <at>  <at>  -228,4 +228,10  <at>  <at>  public:

         /**
+         * Handle the ListPopupMenu::mt_Rename case of the slotMenuSelection.
+         * Given an own method because it requires rather lengthy code.
+         */
+        void handleRename();
+
+        /**
          * Creates the <UML:FloatingTextWidget> XMI element.
          */
 <at>  <at>  -270,10 +276,4  <at>  <at>  private:

         /**
-         * Handle the ListPopupMenu::mt_Rename case of the slotMenuSelection.
-         * Given an own method because it requires rather lengthy code.
-         */
-        void handleRename();
-
-        /**
          * The association or message widget we may be linked to.
          */

(Continue reading)

Oliver Kellogg | 1 Oct 22:05 2004
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

Remove ListPopupMenu::mt_Delete_Association, and change the handling
of popup menus for association related FloatingTexts. (These are further
steps on the long way to FloatingText design sanity.)

  M +4 -6      associationwidget.cpp   1.122
  M +0 -8      floatingtext.cpp   1.58
  M +30 -26    listpopupmenu.cpp   1.53
  M +14 -6     listpopupmenu.h   1.32
  M +11 -1     umlwidget.cpp   1.104

Oliver Kellogg | 1 Oct 22:35 2004
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

setupMenu(mt_Collaboration_Message): Fix the menu item for "New Operation".

  M +1 -1      listpopupmenu.cpp   1.54

--- kdesdk/umbrello/umbrello/listpopupmenu.cpp  #1.53:1.54
 <at>  <at>  -1043,5 +1043,5  <at>  <at>  void ListPopupMenu::setupMenu(Menu_Type 
                         insertStdItem(mt_Delete);
                         insertStdItem(mt_Change_Font);
-                        insertStdItem(mt_Operation);
+                        insertStdItem(mt_New_Operation);
                         insertItem(i18n("Select Operation..."), mt_Select_Operation);
                         break;

Oliver Kellogg | 1 Oct 22:41 2004
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

ListPopupMenu::mt_Delete_Message: Remove.

  M +0 -1      associationwidget.cpp   1.123
  M +0 -22     floatingtext.cpp   1.59
  M +7 -8      listpopupmenu.h   1.33

--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.122:1.123
 <at>  <at>  -2102,5 +2102,4  <at>  <at>  void AssociationWidget::slotMenuSelectio

         case ListPopupMenu::mt_Delete:
-        case ListPopupMenu::mt_Delete_Message:
                 m_pView->removeAssocInViewAndDoc(this);
                 break;

--- kdesdk/umbrello/umbrello/floatingtext.cpp  #1.58:1.59
 <at>  <at>  -88,26 +88,4  <at>  <at>  void FloatingText::slotMenuSelection(int
                 break;

-        case ListPopupMenu::mt_Delete_Message:
-                // UNEXPECTED - should not be here
-                // Remove this branch when confident that it does not happen
-                kdDebug() << "FloatingText::slotMenuSelection(mt_Delete_Message)"
-                          << " is called" << endl;
-                if (m_pLink == NULL)
-                        return;
-                if (m_Role == Uml::tr_Seq_Message || m_Role == Uml::tr_Seq_Message_Self) {
-                        //here to delete this from a seq. diagram.
-                        kdDebug() << "  --- for Seq_Message." << endl;
(Continue reading)

Oliver Kellogg | 1 Oct 23:34 2004
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

LinkWidget::constrainY(): New.  Finally, class FloatingText has no more
direct dependency on MessageWidget or AssociationWidget.

  M +1 -8      floatingtext.cpp   1.60
  M +4 -0      linkwidget.cpp   1.5
  M +5 -0      linkwidget.h   1.5
  M +10 -0     messagewidget.cpp   1.50
  M +9 -0      messagewidget.h   1.22

--- kdesdk/umbrello/umbrello/floatingtext.cpp  #1.59:1.60
 <at>  <at>  -16,5 +16,4  <at>  <at> 

 // local includes
-#include "associationwidget.h"
 #include "association.h"
 #include "umlview.h"
 <at>  <at>  -22,5 +21,4  <at>  <at> 
 #include "uml.h"
 #include "classifier.h"
-#include "messagewidget.h"
 #include "listpopupmenu.h"
 #include "operation.h"
 <at>  <at>  -289,10 +287,5  <at>  <at>  void FloatingText::mouseMoveEvent(QMouse
         //implement specific rules for a sequence diagram
         if (m_Role == Uml::tr_Seq_Message) {
-                MessageWidget *pMessage = static_cast<MessageWidget*>(m_pLink);
-                const int minHeight = pMessage->getMinHeight();
-                newY = newY < minHeight ? minHeight : newY;
(Continue reading)

Oliver Kellogg | 1 Oct 23:43 2004
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

constrainY(): Make virtual.

  M +1 -1      linkwidget.h   1.6

--- kdesdk/umbrello/umbrello/linkwidget.h  #1.5:1.6
 <at>  <at>  -158,5 +158,5  <at>  <at>  public:
          * Motivated by FloatingText::mouseMoveEvent()
          */
-        void constrainY(int &y, int height);
+        virtual void constrainY(int &y, int height);

         /**



Gmane