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

Indicate diameter symbol on diameter dimensions, instead of just a 

bare number.

[git-p4: depot-paths = "//depot/solvespace/": change = 2157]
solver
Jonathan Westhues 2010-05-22 22:21:42 -08:00
parent 5ba5371ae8
commit 9a0591cfc4
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drawconstraint.cpp
View File

@ -57,6 +57,9 @@ char *Constraint::Label(void) {
sprintf(Ret, "%.3f:1", valA); sprintf(Ret, "%.3f:1", valA);
} else if(type == COMMENT) { } else if(type == COMMENT) {
strcpy(Ret, comment.str); strcpy(Ret, comment.str);
} else if(type == DIAMETER) {
// leading spaces for diameter symbol
sprintf(Ret, " %s", SS.MmToString(valA));
} else { } else {
// valA has units of distance // valA has units of distance
strcpy(Ret, SS.MmToString(fabs(valA))); strcpy(Ret, SS.MmToString(fabs(valA)));
@ -506,7 +509,31 @@ void Constraint::DrawOrGetDistance(Vector *labelPos) {
mark = mark.WithMagnitude(mark.Magnitude()-r); mark = mark.WithMagnitude(mark.Magnitude()-r);
DoLineTrimmedAgainstBox(ref, ref, ref.Minus(mark)); DoLineTrimmedAgainstBox(ref, ref, ref.Minus(mark));
DoLabel(ref, labelPos, gr, gu); Vector topLeft;
DoLabel(ref, &topLeft, gr, gu);
if(labelPos) *labelPos = topLeft;
// Draw the diameter symbol
Vector dc = topLeft;
dc = dc.Plus(gu.WithMagnitude(5/SS.GW.scale));
dc = dc.Plus(gr.WithMagnitude(9/SS.GW.scale));
double dr = 5/SS.GW.scale;
double theta, dtheta = (2*PI)/12;
for(theta = 0; theta < 2*PI-0.01; theta += dtheta) {
LineDrawOrGetDistance(
dc.Plus(gu.WithMagnitude(cos(theta)*dr)).Plus(
gr.WithMagnitude(sin(theta)*dr)),
dc.Plus(gu.WithMagnitude(cos(theta+dtheta)*dr)).Plus(
gr.WithMagnitude(sin(theta+dtheta)*dr)));
}
theta = 25*(PI/180);
dr *= 1.7;
dtheta = PI;
LineDrawOrGetDistance(
dc.Plus(gu.WithMagnitude(cos(theta)*dr)).Plus(
gr.WithMagnitude(sin(theta)*dr)),
dc.Plus(gu.WithMagnitude(cos(theta+dtheta)*dr)).Plus(
gr.WithMagnitude(sin(theta+dtheta)*dr)));
break; break;
} }

2
wishlist.txt
View File

@ -1,5 +1,7 @@
O(n*log(n)) assembly of edges into contours O(n*log(n)) assembly of edges into contours
good color picker good color picker
crude DXF, HPGL import
a request to import a plane thing
----- -----
rounding, as a special group rounding, as a special group