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

More choices in Sketcher grid and later switching to um

Browse Source
This commit is contained in:
jriegel 2013-12-21 19:15:28 +01:00
parent eaebae18f0
commit 152ecf2df9
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Base/UnitsSchemaInternal.cpp
View File

@ -49,7 +49,7 @@ QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor
}else if(UnitValue < 0.001){
unitString = QString::fromLatin1("nm");
factor = 0.000001;
}else if(UnitValue < 1.0){
}else if(UnitValue < 0.1){
unitString = QString::fromUtf8("\xC2\xB5m");
factor = 0.001;
}else if(UnitValue < 10000.0){

2
src/Base/UnitsSchemaMKS.cpp
View File

@ -48,7 +48,7 @@ QString UnitsSchemaMKS::schemaTranslate(Base::Quantity quant,double &factor,QStr
}else if(UnitValue < 0.001){
unitString = QString::fromLatin1("nm");
factor = 0.000001;
}else if(UnitValue < 1.0){
}else if(UnitValue < 0.1){
unitString = QString::fromUtf8("\xC2\xB5m");
factor = 0.001;
}else if(UnitValue < 100.0){

14
src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
View File

@ -135,6 +135,12 @@ void TaskSketcherGeneral::fillGridCombo(void)
ui->comboBoxGridSize->setCurrentIndex(ui->comboBoxGridSize->findText(QString::fromUtf8("1/4 \"")));
}else{
ui->comboBoxGridSize->addItem(QString::fromUtf8("1 \xC2\xB5m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("2 \xC2\xB5m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("5 \xC2\xB5m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("10 \xC2\xB5m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("20 \xC2\xB5m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("50 \xC2\xB5m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("0.1 mm"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("0.2 mm"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("0.5 mm"));
@ -149,6 +155,14 @@ void TaskSketcherGeneral::fillGridCombo(void)
ui->comboBoxGridSize->addItem(QString::fromUtf8("500 mm"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("1 m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("2 m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("5 m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("10 m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("20 m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("50 m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("100 m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("200 m"));
ui->comboBoxGridSize->addItem(QString::fromUtf8("500 m"));
ui->comboBoxGridSize->setCurrentIndex(ui->comboBoxGridSize->findText(QString::fromUtf8("10 mm")));
}