suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix non-rotation of QGIDecorations with QGIViewPart

Browse Source
This commit is contained in:
WandererFan 2017-01-04 12:39:23 -05:00
parent 429c32bdde
commit 60ba62c09f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/TechDraw/Gui/QGIView.cpp
View File

@ -270,6 +270,7 @@ void QGIView::updateView(bool update)
//NOTE: QPainterPaths have to be rotated individually. This transform handles Rotation for everything else.
//Scale is handled in GeometryObject for DVP & descendents
//Objects not descended from DVP must setScale for themselves
//note that setTransform(,,rotation,,) is not the same as setRotation!!!
double rot = getViewObject()->Rotation.getValue();
QPointF centre = boundingRect().center();
setTransform(QTransform().translate(centre.x(), centre.y()).rotate(-rot).translate(-centre.x(), -centre.y()));

7
src/Mod/TechDraw/Gui/QGIViewPart.cpp
View File

@ -314,6 +314,7 @@ void QGIViewPart::updateView(bool update)
viewPart->isTouched() ||
viewPart->Source.isTouched() ||
viewPart->Direction.isTouched() ||
viewPart->Rotation.isTouched() ||
viewPart->Scale.isTouched() ||
viewPart->HardHidden.isTouched() ||
viewPart->SmoothVisible.isTouched() ||
@ -345,7 +346,8 @@ void QGIViewPart::updateView(bool update)
void QGIViewPart::draw() {
drawViewPart();
drawMatting();
drawBorder();
// drawBorder();
QGIView::draw();
}
void QGIViewPart::drawViewPart()
@ -601,6 +603,7 @@ void QGIViewPart::drawSectionLine(TechDraw::DrawViewSection* viewSection, bool b
sectionLine->setWidth(Rez::guiX(viewPart->LineWidth.getValue())); //TODO: add fudge to make sectionLine thinner than reg lines?
sectionLine->setFont(m_font,Rez::guiX(6.0));
sectionLine->setZValue(ZVALUE::SECTIONLINE);
sectionLine->setRotation(- viewPart->Rotation.getValue());
sectionLine->draw();
}
}
@ -630,6 +633,7 @@ void QGIViewPart::drawCenterLines(bool b)
centerLine->setBounds(-xVal,-yVal,xVal,yVal);
//centerLine->setWidth(viewPart->LineWidth.getValue());
centerLine->setZValue(ZVALUE::SECTIONLINE);
centerLine->setRotation(- viewPart->Rotation.getValue());
centerLine->draw();
}
if (vert) {
@ -642,6 +646,7 @@ void QGIViewPart::drawCenterLines(bool b)
centerLine->setBounds(-xVal,-yVal,xVal,yVal);
//centerLine->setWidth(viewPart->LineWidth.getValue());
centerLine->setZValue(ZVALUE::SECTIONLINE);
centerLine->setRotation(- viewPart->Rotation.getValue());
centerLine->draw();
}
}