|
Line
Link Here
|
| 0 |
-- |
0 |
++ b/umbrello/umlwidgets/associationwidget.cpp |
| 1 |
-- |
|
|
| 2 |
-- a/umbrello/umlwidgets/associationwidget.cpp |
|
Lines 2133-2141
Link Here
|
| 2133 |
p1.setX(xmil + (xfin - xmil)*1/2); p1.setY(ymil + (yfin - ymil)*1/3); |
2133 |
p1.setX(xmil + (xfin - xmil)*1/2); p1.setY(ymil + (yfin - ymil)*1/3); |
| 2134 |
p2.setX(xmil - (xmil - xdeb)*1/2); p2.setY(ymil - (ymil - ydeb)*1/3); |
2134 |
p2.setX(xmil - (xmil - xdeb)*1/2); p2.setY(ymil - (ymil - ydeb)*1/3); |
| 2135 |
|
2135 |
|
| 2136 |
if (abs(p1.x() - p2.x()) <= 10) |
2136 |
if (fabs(p1.x() - p2.x()) <= 10) |
| 2137 |
ESPACEX = 15; |
2137 |
ESPACEX = 15; |
| 2138 |
if (abs(p1.y() - p2.y()) <= 10) |
2138 |
if (fabs(p1.y() - p2.y()) <= 10) |
| 2139 |
ESPACEY = 15; |
2139 |
ESPACEY = 15; |
| 2140 |
|
2140 |
|
| 2141 |
m_associationLine->setEndPoints(QPointF(xdeb, ydeb), QPointF(xfin, yfin)); |
2141 |
m_associationLine->setEndPoints(QPointF(xdeb, ydeb), QPointF(xfin, yfin)); |
|
Lines 2703-2710
Link Here
|
| 2703 |
r = textWidth; |
2703 |
r = textWidth; |
| 2704 |
// swap textCenter{X,Y} to convert from Qt coord.system. |
2704 |
// swap textCenter{X,Y} to convert from Qt coord.system. |
| 2705 |
const QPointF origTextCenter(textCenterY, textCenterX); |
2705 |
const QPointF origTextCenter(textCenterY, textCenterX); |
| 2706 |
const int relX = abs(origTextCenter.x() - midP.x()); |
2706 |
const int relX = fabs(origTextCenter.x() - midP.x()); |
| 2707 |
const int relY = abs(origTextCenter.y() - midP.y()); |
2707 |
const int relY = fabs(origTextCenter.y() - midP.y()); |
| 2708 |
const double negativeWhenInsideCircle = relX * relX + relY * relY - r * r; |
2708 |
const double negativeWhenInsideCircle = relX * relX + relY * relY - r * r; |
| 2709 |
if (negativeWhenInsideCircle <= 0.0) { |
2709 |
if (negativeWhenInsideCircle <= 0.0) { |
| 2710 |
return; |
2710 |
return; |
