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

Make everything line up in the configuration screen.

Browse Source 
[git-p4: depot-paths = "//depot/solvespace/": change = 2043]
This commit is contained in:
Jonathan Westhues 2009-09-30 02:02:15 -08:00
parent ea00c7e979
commit 6e5b503ac6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
confscreen.cpp
View File

@ -149,18 +149,18 @@ void TextWindow::ShowConfiguration(void) {
Printf(false, ""); Printf(false, "");
Printf(false, "%Ft chord tolerance (in screen pixels)%E"); Printf(false, "%Ft chord tolerance (in screen pixels)%E");
Printf(false, "%Ba %2 %Fl%Ll%f%D[change]%E; now %d triangles", Printf(false, "%Ba %@ %Fl%Ll%f%D[change]%E; now %d triangles",
SS.chordTol, SS.chordTol,
&ScreenChangeChordTolerance, 0, &ScreenChangeChordTolerance, 0,
SK.GetGroup(SS.GW.activeGroup)->displayMesh.l.n); SK.GetGroup(SS.GW.activeGroup)->displayMesh.l.n);
Printf(false, "%Ft max piecewise linear segments%E"); Printf(false, "%Ft max piecewise linear segments%E");
Printf(false, "%Ba %d %Fl%Ll%f[change]%E", Printf(false, "%Ba %d %Fl%Ll%f[change]%E",
SS.maxSegments, SS.maxSegments,
&ScreenChangeMaxSegments); &ScreenChangeMaxSegments);
Printf(false, ""); Printf(false, "");
Printf(false, "%Ft perspective factor (0 for parallel)%E"); Printf(false, "%Ft perspective factor (0 for parallel)%E");
Printf(false, "%Ba %3 %Fl%Ll%f%D[change]%E", Printf(false, "%Ba %# %Fl%Ll%f%D[change]%E",
SS.cameraTangent*1000, SS.cameraTangent*1000,
&ScreenChangeCameraTangent, 0); &ScreenChangeCameraTangent, 0);
Printf(false, "%Ft snap grid spacing%E"); Printf(false, "%Ft snap grid spacing%E");
@ -170,7 +170,7 @@ void TextWindow::ShowConfiguration(void) {
Printf(false, ""); Printf(false, "");
Printf(false, "%Ft export scale factor (1.0=mm, 25.4=inch)"); Printf(false, "%Ft export scale factor (1.0=mm, 25.4=inch)");
Printf(false, "%Ba %3 %Fl%Ll%f%D[change]%E", Printf(false, "%Ba %# %Fl%Ll%f%D[change]%E",
(double)SS.exportScale, (double)SS.exportScale,
&ScreenChangeExportScale, 0); &ScreenChangeExportScale, 0);
Printf(false, "%Ft cutter radius offset (0=no offset) "); Printf(false, "%Ft cutter radius offset (0=no offset) ");

5
textwin.cpp
View File

@ -102,6 +102,11 @@ void TextWindow::Printf(bool halfLine, char *fmt, ...) {
sprintf(buf, "%s%.3f", v < 0 ? "" : " ", v); sprintf(buf, "%s%.3f", v < 0 ? "" : " ", v);
break; break;
} }
case '#': {
double v = va_arg(vl, double);
sprintf(buf, "%.3f", v);
break;
}
case 's': { case 's': {
char *s = va_arg(vl, char *); char *s = va_arg(vl, char *);
memcpy(buf, s, min(sizeof(buf), strlen(s)+1)); memcpy(buf, s, min(sizeof(buf), strlen(s)+1));