aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Zoom fit best current did not work properly because of corrupted point.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-06-23 16:02:59 +03:00
parent a1f4207621
commit cacba00e83
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/valentina/mainwindow.cpp
View File

@ -4653,7 +4653,7 @@ void MainWindow::ZoomFirstShow()
{ {
ActionDraw(true); ActionDraw(true);
} }
ui->view->ZoomFitBest(); ZoomFitBestCurrent();
VMainGraphicsView::NewSceneRect(sceneDraw, ui->view); VMainGraphicsView::NewSceneRect(sceneDraw, ui->view);
VMainGraphicsView::NewSceneRect(sceneDetails, ui->view); VMainGraphicsView::NewSceneRect(sceneDetails, ui->view);

6
src/libs/vwidgets/vscenepoint.cpp
View File

@ -49,6 +49,9 @@ VScenePoint::VScenePoint(QGraphicsItem *parent)
m_namePoint = new VGraphicsSimpleTextItem(this); m_namePoint = new VGraphicsSimpleTextItem(this);
m_lineName = new VScaledLine(this); m_lineName = new VScaledLine(this);
m_lineName->SetBasicWidth(widthHairLine); m_lineName->SetBasicWidth(widthHairLine);
m_lineName->setLine(QLineF(0, 0, 1, 0));
m_lineName->setVisible(false);
this->setBrush(QBrush(Qt::NoBrush)); this->setBrush(QBrush(Qt::NoBrush));
this->setAcceptHoverEvents(true); this->setAcceptHoverEvents(true);
this->setFlag(QGraphicsItem::ItemIsFocusable, true);// For keyboard input focus this->setFlag(QGraphicsItem::ItemIsFocusable, true);// For keyboard input focus
@ -72,7 +75,6 @@ void VScenePoint::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio
if (not m_onlyPoint) if (not m_onlyPoint)
{ {
m_namePoint->setVisible(true); m_namePoint->setVisible(true);
m_lineName->setVisible(true);
QPen lPen = m_lineName->pen(); QPen lPen = m_lineName->pen();
lPen.setColor(CorrectColor(m_lineName, Qt::black)); lPen.setColor(CorrectColor(m_lineName, Qt::black));
@ -141,7 +143,6 @@ void VScenePoint::RefreshLine()
VGObject::LineIntersectCircle(QPointF(), ScaledRadius(SceneScale(scene())), VGObject::LineIntersectCircle(QPointF(), ScaledRadius(SceneScale(scene())),
QLineF(QPointF(), nameRec.center() - scenePos()), p1, p2); QLineF(QPointF(), nameRec.center() - scenePos()), p1, p2);
const QPointF pRec = VGObject::LineIntersectRect(nameRec, QLineF(scenePos(), nameRec.center())); const QPointF pRec = VGObject::LineIntersectRect(nameRec, QLineF(scenePos(), nameRec.center()));
m_lineName->setLine(QLineF(p1, pRec - scenePos()));
if (QLineF(p1, pRec - scenePos()).length() <= ToPixel(4, Unit::Mm)) if (QLineF(p1, pRec - scenePos()).length() <= ToPixel(4, Unit::Mm))
{ {
@ -149,6 +150,7 @@ void VScenePoint::RefreshLine()
} }
else else
{ {
m_lineName->setLine(QLineF(p1, pRec - scenePos()));
m_lineName->setVisible(true); m_lineName->setVisible(true);
} }
} }