[Uml-devel] branches/work/soc-umbrello/umbrello
Andi Fischer
andi.fischer at hispeed.ch
Wed Dec 28 09:31:38 UTC 2011
SVN commit 1270713 by fischer:
Crashes fixed.
M +2 -2 umlscene.cpp
M +2 -0 widgets/objectwidget.cpp
U widgets/objectwidget.h
M +3 -1 widgets/seqlinewidget.cpp
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1270712:1270713
@@ -579,7 +579,7 @@
//check to see if we want the message
//may be wanted by someone else e.g. list view
- DEBUG(DBG_SRC) << "with " << *o; //:TODO:
+ // DEBUG(DBG_SRC) << "with " << *o; //:TODO:
if (!m_bCreateObject) {
return;
}
@@ -1094,7 +1094,7 @@
*/
QBrush UMLScene::brush() const
{
- return QBrush(m_Options.uiState.fillColor);
+ return QBrush(); //:TODO: m_Options.uiState.fillColor);
}
/**
--- branches/work/soc-umbrello/umbrello/widgets/objectwidget.cpp #1270712:1270713
@@ -262,9 +262,11 @@
lowestMessage = messageHeight;
}
}
+ if (m_sequentialLine) {
m_sequentialLine->setEndOfLine(lowestMessage + ObjectWidget::SequenceLineMargin);
}
}
+}
/**
* Reimplemented from UMLWidget::loadFromXMI to load
--- branches/work/soc-umbrello/umbrello/widgets/seqlinewidget.cpp #1270712:1270713
@@ -4,7 +4,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2002-2009 *
+ * copyright (C) 2002-2011 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -113,8 +113,10 @@
void SeqLineWidget::setEndOfLine(qreal yPos)
{
qreal len = yPos - scenePos().y();
+ if (len > 0.0) {
setLength(len);
}
+}
/**
* Reimplemented from QGraphicsItem::paint to draw the sequential line
More information about the umbrello-devel
mailing list