kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fix Dimension Response to Changed X/Y

Browse Source 
- Dimensions in Gui were not responding to changes in
  the Feature's X/Y properties.
This commit is contained in:
WandererFan
2018-02-28 11:13:08 -05:00
parent 404452d6ee
commit 8a26554eda
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Mod/TechDraw/Gui/QGIViewDimension.cpp
View File

@@ -201,7 +201,7 @@ void QGIViewDimension::setViewPartFeature(TechDraw::DrawViewDimension *obj)
// Set the QGIGroup Properties based on the DrawView
float x = Rez::guiX(obj->X.getValue());
float y = Rez::guiX(obj->Y.getValue());
float y = Rez::guiX(-obj->Y.getValue());
datumLabel->setPosFromCenter(x, y);
@@ -234,19 +234,21 @@ void QGIViewDimension::updateView(bool update)
}
// Identify what changed to prevent complete redraw
if(vp->Fontsize.isTouched() ||
vp->Font.isTouched()) {
QFont font = datumLabel->font();
font.setPointSizeF(Rez::guiX(vp->Fontsize.getValue()));
font.setFamily(QString::fromLatin1(vp->Font.getValue()));
datumLabel->setFont(font);
//datumLabel->setLabelCenter();
updateDim();
} else if(dim->X.isTouched() ||
dim->Y.isTouched()) {
datumLabel->setPosFromCenter(datumLabel->X(),datumLabel->Y());
if (update||
dim->X.isTouched() ||
dim->Y.isTouched()) {
float x = Rez::guiX(dim->X.getValue());
float y = Rez::guiX(dim->Y.getValue());
datumLabel->setPosFromCenter(x,-y);
updateDim();
}
else if(vp->Fontsize.isTouched() ||
vp->Font.isTouched()) {
QFont font = datumLabel->font();
font.setPointSizeF(Rez::guiX(vp->Fontsize.getValue()));
font.setFamily(QString::fromLatin1(vp->Font.getValue()));
datumLabel->setFont(font);
updateDim();
} else if (vp->LineWidth.isTouched()) { //never happens!!
m_lineWidth = vp->LineWidth.getValue();
updateDim();
@@ -296,7 +298,7 @@ void QGIViewDimension::datumLabelDragFinished()
y = Rez::appX(datumLabel->Y());
Gui::Command::openCommand("Drag Dimension");
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.X = %f", dim->getNameInDocument(), x);
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.Y = %f", dim->getNameInDocument(), y);
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.Y = %f", dim->getNameInDocument(), -y);
Gui::Command::commitCommand();
}
@@ -491,7 +493,7 @@ void QGIViewDimension::draw()
// text to left of vertical dims
// text above horizontal dims
double offsetFudge = 2.0;
double textOffset = 0.75 * Rez::guiX(vp->Fontsize.getValue()) + offsetFudge;
double textOffset = 1.0 * Rez::guiX(vp->Fontsize.getValue()) + offsetFudge;
Base::Vector3d dir, norm; //direction/normal vectors of distance line (not dimension Line)
if (strcmp(dimType, "Distance") == 0 ) {
dir = (distEnd-distStart);

4
src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
View File

@@ -201,7 +201,9 @@ void ViewProviderDrawingView::finishRestoring()
void ViewProviderDrawingView::updateData(const App::Property* prop)
{
if (prop == &(getViewObject()->Rotation) ) {
if (prop == &(getViewObject()->Rotation) ||
prop == &(getViewObject()->X) ||
prop == &(getViewObject()->Y) ) {
QGIView* qgiv = getQView();
if (qgiv) {
qgiv->updateView(true);