diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp index 8c50c7b6a..c4eebbdd5 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp @@ -108,8 +108,10 @@ TaskSketcherGeneral::~TaskSketcherGeneral() void TaskSketcherGeneral::fillGridCombo(void) { - if(Base::UnitsApi::getSchema() == Base::Imperial1) { + if(Base::UnitsApi::getSchema() == Base::UnitSystem::Imperial1 ){ + ui->comboBoxGridSize->addItem(QString::fromUtf8("1/1000 [thou] \"")); ui->comboBoxGridSize->addItem(QString::fromUtf8("1/128 \"")); + ui->comboBoxGridSize->addItem(QString::fromUtf8("1/100 \"")); ui->comboBoxGridSize->addItem(QString::fromUtf8("1/64 \"")); ui->comboBoxGridSize->addItem(QString::fromUtf8("1/32 \"")); ui->comboBoxGridSize->addItem(QString::fromUtf8("1/16 \"")); @@ -120,7 +122,16 @@ void TaskSketcherGeneral::fillGridCombo(void) ui->comboBoxGridSize->addItem(QString::fromUtf8("2 \"")); ui->comboBoxGridSize->addItem(QString::fromUtf8("4 \"")); ui->comboBoxGridSize->addItem(QString::fromUtf8("8 \"")); + ui->comboBoxGridSize->addItem(QString::fromUtf8("12 \" [foot]")); ui->comboBoxGridSize->addItem(QString::fromUtf8("16 \"")); + ui->comboBoxGridSize->addItem(QString::fromUtf8("36 \" [yard]")); + ui->comboBoxGridSize->addItem(QString::fromUtf8("72 \" [2 yards]")); + ui->comboBoxGridSize->addItem(QString::fromUtf8("144 \" [4 yards]")); + ui->comboBoxGridSize->addItem(QString::fromUtf8("396 \" [half chain]")); + ui->comboBoxGridSize->addItem(QString::fromUtf8("792 \" [chain]")); + ui->comboBoxGridSize->addItem(QString::fromUtf8("792 \" [2 chains]")); + ui->comboBoxGridSize->addItem(QString::fromUtf8("1584 \" [4 chains]")); + ui->comboBoxGridSize->addItem(QString::fromUtf8("3960 \" [half furlong]")); ui->comboBoxGridSize->setCurrentIndex(ui->comboBoxGridSize->findText(QString::fromUtf8("1/4 \""))); }else{ diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index ad86ebc48..c0f258a13 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -2425,10 +2425,8 @@ Restart: Constr->FirstPos != Sketcher::none && Constr->Second == Constraint::GeoUndef) // display negative sign for absolute coordinates asciiText->string = SbString(Base::Quantity(Constr->Value,Base::Unit::Length).getUserString().toUtf8().constData()); - //asciiText->string = SbString().sprintf("%.2f",Constr->Value); else // hide negative sign asciiText->string = SbString(Base::Quantity(std::abs(Constr->Value),Base::Unit::Length).getUserString().toUtf8().constData()); - //asciiText->string = SbString().sprintf("%.2f",std::abs(Constr->Value)); if (Constr->Type == Distance) asciiText->datumtype = SoDatumLabel::DISTANCE; @@ -2645,7 +2643,6 @@ Restart: SoDatumLabel *asciiText = dynamic_cast(sep->getChild(0)); asciiText->string = SbString(Base::Quantity(Base::toDegrees(std::abs(Constr->Value)),Base::Unit::Angle).getUserString().toUtf8().constData()); - //asciiText->string = SbString().sprintf("%.2f",Base::toDegrees(std::abs(Constr->Value))); asciiText->datumtype = SoDatumLabel::ANGLE; asciiText->param1 = Constr->LabelDistance; asciiText->param2 = startangle; @@ -2692,7 +2689,8 @@ Restart: SbVec3f p2(pnt2.x,pnt2.y,zConstr); SoDatumLabel *asciiText = dynamic_cast(sep->getChild(0)); - asciiText->string = SbString().sprintf("%.2f",Constr->Value); + asciiText->string = SbString(Base::Quantity(Constr->Value,Base::Unit::Length).getUserString().toUtf8().constData()); + asciiText->datumtype = SoDatumLabel::RADIUS; asciiText->param1 = Constr->LabelDistance; asciiText->param2 = Constr->LabelPosition;