[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdesdk/umbrello/umbrello
From: Andi Fischer <andi.fischer () hispeed ! ch>
Date: 2012-11-08 21:42:52
Message-ID: 20121108214252.C24C9AC857 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1324624 by fischer:
UMLScenePolygon removed.
M +0 -10 umlscene.h
M +6 -6 widgets/associationline.cpp
M +2 -2 widgets/associationline.h
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1324623:1324624
@@ -68,16 +68,6 @@
typedef QLineF UMLSceneLine;
typedef qreal UMLSceneValue;
-class UMLScenePolygon : public QPolygonF
-{
-public:
- UMLScenePolygon() {}
- void setPoint(int index, const UMLScenePoint &p)
- {
- replace(index, p);
- }
-};
-
// event types
typedef QKeyEvent UMLSceneKeyEvent;
typedef QGraphicsSceneHoverEvent UMLSceneHoverEvent;
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationline.cpp #1324623:1324624
@@ -955,18 +955,18 @@
m_MidPoint.setX( (int)rint(xb + cosx) );
m_MidPoint.setY( (int)rint(yb + siny) );
- m_PointArray.setPoint(0, m_EgdePoint);
- m_PointArray.setPoint(1, m_ArrowPointA);
+ m_PointArray.replace(0, m_EgdePoint);
+ m_PointArray.replace(1, m_ArrowPointA);
if( getAssocType() == Uml::AssociationType::Realization ||
getAssocType() == Uml::AssociationType::Generalization ) {
- m_PointArray.setPoint( 2, m_ArrowPointB );
- m_PointArray.setPoint( 3, m_EgdePoint );
+ m_PointArray.replace( 2, m_ArrowPointB );
+ m_PointArray.replace( 3, m_EgdePoint );
} else {
UMLScenePoint diamondFarPoint;
diamondFarPoint.setX( (int)rint(xb + cosx * 2) );
diamondFarPoint.setY( (int)rint(yb + siny * 2) );
- m_PointArray.setPoint(2, diamondFarPoint);
- m_PointArray.setPoint(3, m_ArrowPointB);
+ m_PointArray.replace(2, diamondFarPoint);
+ m_PointArray.replace(3, m_ArrowPointB);
}
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationline.h #1324623:1324624
@@ -173,7 +173,7 @@
LineList m_HeadList; ///< Head lines.
LineList m_ParallelList; ///< The parallel line.
bool m_bSelected; ///< Selected status.
- UMLScenePolygon m_PointArray; ///< Contains calculated points used to draw \
the line head. + QPolygonF m_PointArray; ///< Contains calculated \
points used to draw the line head.
/**
* Contains calculated points used to draw the line head.
@@ -183,7 +183,7 @@
QGraphicsPolygonItem* m_pClearPoly; ///< A polygon object to blank out any \
lines we don't want to see.
Circle* m_pCircle; ///< The transparent circle required by \
containment associations.
SubsetSymbol* m_pSubsetSymbol; ///< The subset notation required by Child to \
Category associations.
- UMLScenePolygon m_ParallelLines; ///< Contains the calculated points for the \
parallel line on a collaboration message to use. + QPolygonF m_ParallelLines; \
///< Contains the calculated points for the parallel line on a collaboration message \
to use. Region m_DockRegion; ///< Region where the line docks.
bool m_bHeadCreated;
bool m_bSubsetSymbolCreated;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic