Make 'show scale values' a slave of 'show axes'

master
Marius Kintel 2015-02-25 15:03:52 -05:00
parent 994872359e
commit 7b8c98cfbd
2 changed files with 5 additions and 3 deletions

View File

@ -172,7 +172,7 @@ void GLView::paintGL()
// ...the axis lines need to follow the object translation.
if (showaxes) GLView::showAxes(bgcontrast);
// mark the scale along the axis lines
if (showscale) GLView::showScalemarkers(bgcontrast);
if (showaxes && showscale) GLView::showScalemarkers(bgcontrast);
}
glEnable(GL_LIGHTING);

View File

@ -2270,9 +2270,11 @@ void MainWindow::viewModeShowEdges()
void MainWindow::viewModeShowAxes()
{
bool showaxes = viewActionShowAxes->isChecked();
QSettings settings;
settings.setValue("view/showAxes",viewActionShowAxes->isChecked());
this->qglview->setShowAxes(viewActionShowAxes->isChecked());
settings.setValue("view/showAxes", showaxes);
this->viewActionShowScaleProportional->setEnabled(showaxes);
this->qglview->setShowAxes(showaxes);
this->qglview->updateGL();
}