zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MmToString calls that should have editable=true set

pull/1003/head
Tom Sutcliffe 2021-08-13 13:10:21 +01:00 committed by phkahler
parent 41e3668f89
commit 959cf5ba75
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/confscreen.cpp
View File

@ -64,7 +64,7 @@ void TextWindow::ScreenChangeCameraTangent(int link, uint32_t v) {
} }
void TextWindow::ScreenChangeGridSpacing(int link, uint32_t v) { void TextWindow::ScreenChangeGridSpacing(int link, uint32_t v) {
SS.TW.ShowEditControl(3, SS.MmToString(SS.gridSpacing)); SS.TW.ShowEditControl(3, SS.MmToString(SS.gridSpacing, true));
SS.TW.edit.meaning = Edit::GRID_SPACING; SS.TW.edit.meaning = Edit::GRID_SPACING;
} }
@ -89,7 +89,7 @@ void TextWindow::ScreenChangeExportScale(int link, uint32_t v) {
} }
void TextWindow::ScreenChangeExportOffset(int link, uint32_t v) { void TextWindow::ScreenChangeExportOffset(int link, uint32_t v) {
SS.TW.ShowEditControl(3, SS.MmToString(SS.exportOffset)); SS.TW.ShowEditControl(3, SS.MmToString(SS.exportOffset, true));
SS.TW.edit.meaning = Edit::EXPORT_OFFSET; SS.TW.edit.meaning = Edit::EXPORT_OFFSET;
} }
@ -171,7 +171,7 @@ void TextWindow::ScreenChangeCanvasSize(int link, uint32_t v) {
} }
int col = 13; int col = 13;
if(v < 10) col = 11; if(v < 10) col = 11;
SS.TW.ShowEditControl(col, SS.MmToString(d)); SS.TW.ShowEditControl(col, SS.MmToString(d, true));
SS.TW.edit.meaning = Edit::CANVAS_SIZE; SS.TW.edit.meaning = Edit::CANVAS_SIZE;
SS.TW.edit.i = v; SS.TW.edit.i = v;
} }
@ -181,7 +181,7 @@ void TextWindow::ScreenChangeGCodeParameter(int link, uint32_t v) {
switch(link) { switch(link) {
case 'd': case 'd':
SS.TW.edit.meaning = Edit::G_CODE_DEPTH; SS.TW.edit.meaning = Edit::G_CODE_DEPTH;
buf += SS.MmToString(SS.gCode.depth); buf += SS.MmToString(SS.gCode.depth, true);
break; break;
case 's': case 's':
@ -191,12 +191,12 @@ void TextWindow::ScreenChangeGCodeParameter(int link, uint32_t v) {
case 'F': case 'F':
SS.TW.edit.meaning = Edit::G_CODE_FEED; SS.TW.edit.meaning = Edit::G_CODE_FEED;
buf += SS.MmToString(SS.gCode.feed); buf += SS.MmToString(SS.gCode.feed, true);
break; break;
case 'P': case 'P':
SS.TW.edit.meaning = Edit::G_CODE_PLUNGE_FEED; SS.TW.edit.meaning = Edit::G_CODE_PLUNGE_FEED;
buf += SS.MmToString(SS.gCode.plungeFeed); buf += SS.MmToString(SS.gCode.plungeFeed, true);
break; break;
} }
SS.TW.ShowEditControl(14, buf); SS.TW.ShowEditControl(14, buf);

2
src/style.cpp
View File

@ -563,7 +563,7 @@ void TextWindow::ScreenChangeStyleMetric(int link, uint32_t v) {
if(units == Style::UnitsAs::PIXELS) { if(units == Style::UnitsAs::PIXELS) {
edit_value = ssprintf("%.2f", val); edit_value = ssprintf("%.2f", val);
} else { } else {
edit_value = SS.MmToString(val); edit_value = SS.MmToString(val, true);
} }
SS.TW.ShowEditControl(col, edit_value); SS.TW.ShowEditControl(col, edit_value);
SS.TW.edit.style = hs; SS.TW.edit.style = hs;

4
src/textscreens.cpp
View File

@ -640,7 +640,7 @@ void TextWindow::ScreenStepDimFinish(int link, uint32_t v) {
SS.TW.edit.meaning = Edit::STEP_DIM_FINISH; SS.TW.edit.meaning = Edit::STEP_DIM_FINISH;
std::string edit_value; std::string edit_value;
if(SS.TW.stepDim.isDistance) { if(SS.TW.stepDim.isDistance) {
edit_value = SS.MmToString(SS.TW.stepDim.finish); edit_value = SS.MmToString(SS.TW.stepDim.finish, true);
} else { } else {
edit_value = ssprintf("%.3f", SS.TW.stepDim.finish); edit_value = ssprintf("%.3f", SS.TW.stepDim.finish);
} }
@ -727,7 +727,7 @@ void TextWindow::ScreenChangeTangentArc(int link, uint32_t v) {
switch(link) { switch(link) {
case 'r': { case 'r': {
SS.TW.edit.meaning = Edit::TANGENT_ARC_RADIUS; SS.TW.edit.meaning = Edit::TANGENT_ARC_RADIUS;
SS.TW.ShowEditControl(3, SS.MmToString(SS.tangentArcRadius)); SS.TW.ShowEditControl(3, SS.MmToString(SS.tangentArcRadius, true));
break; break;
} }

6
src/view.cpp
View File

@ -51,9 +51,9 @@ void TextWindow::ScreenChangeViewToFullScale(int link, uint32_t v) {
void TextWindow::ScreenChangeViewOrigin(int link, uint32_t v) { void TextWindow::ScreenChangeViewOrigin(int link, uint32_t v) {
std::string edit_value = std::string edit_value =
ssprintf("%s, %s, %s", ssprintf("%s, %s, %s",
SS.MmToString(-SS.GW.offset.x).c_str(), SS.MmToString(-SS.GW.offset.x, true).c_str(),
SS.MmToString(-SS.GW.offset.y).c_str(), SS.MmToString(-SS.GW.offset.y, true).c_str(),
SS.MmToString(-SS.GW.offset.z).c_str()); SS.MmToString(-SS.GW.offset.z, true).c_str());
SS.TW.edit.meaning = Edit::VIEW_ORIGIN; SS.TW.edit.meaning = Edit::VIEW_ORIGIN;
SS.TW.ShowEditControl(3, edit_value); SS.TW.ShowEditControl(3, edit_value);