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

Show info when a Constraint::COMMENT is selected, so that the user 

can apply a style that way too; and apply the export scale factor
to the line width.

[git-p4: depot-paths = "//depot/solvespace/": change = 2034]
solver
Jonathan Westhues 2009-09-24 08:04:46 -08:00
parent 4634961054
commit a887039707
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
export.cpp
View File

@ -426,7 +426,7 @@ void VectorFileWriter::Output(SEdgeList *sel, SBezierList *sbl, SMesh *sm) {
if(!Style::Exportable(e->auxA)) continue; if(!Style::Exportable(e->auxA)) continue;
DWORD rgb = Style::Color (e->auxA, true); DWORD rgb = Style::Color (e->auxA, true);
double w = Style::WidthMm(e->auxA); double w = Style::WidthMm(e->auxA)*s;
LineSegment(rgb, w, e->a.x, e->a.y, e->b.x, e->b.y); LineSegment(rgb, w, e->a.x, e->a.y, e->b.x, e->b.y);
} }
} }
@ -435,7 +435,7 @@ void VectorFileWriter::Output(SEdgeList *sel, SBezierList *sbl, SMesh *sm) {
if(!Style::Exportable(b->auxA)) continue; if(!Style::Exportable(b->auxA)) continue;
DWORD rgb = Style::Color (b->auxA, true); DWORD rgb = Style::Color (b->auxA, true);
double w = Style::WidthMm(b->auxA); double w = Style::WidthMm(b->auxA)*s;
Bezier(rgb, w, b); Bezier(rgb, w, b);
} }
} }

15
textwin.cpp
View File

@ -207,7 +207,7 @@ void TextWindow::Show(void) {
Printf(false, "%s", SS.GW.pending.description); Printf(false, "%s", SS.GW.pending.description);
Printf(true, "%Fl%f%Ll(cancel operation)%E", Printf(true, "%Fl%f%Ll(cancel operation)%E",
&TextWindow::ScreenUnselectAll); &TextWindow::ScreenUnselectAll);
} else if(gs.n > 0) { } else if(gs.n > 0 || gs.stylables > 0) {
if(edit.meaning != EDIT_TTF_TEXT) HideTextEditControl(); if(edit.meaning != EDIT_TTF_TEXT) HideTextEditControl();
ShowHeader(false); ShowHeader(false);
DescribeSelection(); DescribeSelection();
@ -483,6 +483,8 @@ void TextWindow::DescribeSelection(void) {
double d = (p1.Minus(p0)).Dot(n0); double d = (p1.Minus(p0)).Dot(n0);
Printf(true, " distance = %Fi%s", SS.MmToString(d)); Printf(true, " distance = %Fi%s", SS.MmToString(d));
} }
} else if(gs.n == 0) {
Printf(true, "%FtSELECTED:%E comment text");
} else { } else {
Printf(true, "%FtSELECTED:%E %d item%s", gs.n, gs.n == 1 ? "" : "s"); Printf(true, "%FtSELECTED:%E %d item%s", gs.n, gs.n == 1 ? "" : "s");
} }
@ -500,13 +502,20 @@ void TextWindow::DescribeSelection(void) {
} }
// If any of the selected entities have an assigned style, then offer // If any of the selected entities have an assigned style, then offer
// the option to remove that style. // the option to remove that style.
bool styleAssigned = false;
for(i = 0; i < gs.entities; i++) { for(i = 0; i < gs.entities; i++) {
Entity *e = SK.GetEntity(gs.entity[i]); Entity *e = SK.GetEntity(gs.entity[i]);
if(e->style.v != 0) { if(e->style.v != 0) {
break; styleAssigned = true;
} }
} }
if(i < gs.entities) { for(i = 0; i < gs.constraints; i++) {
Constraint *c = SK.GetConstraint(gs.constraint[i]);
if(c->type == Constraint::COMMENT && c->disp.style.v != 0) {
styleAssigned = true;
}
}
if(styleAssigned) {
Printf(true, "%Fl%D%f%Ll(remove assigned style)%E", Printf(true, "%Fl%D%f%Ll(remove assigned style)%E",
0, 0,
&ScreenAssignSelectionToStyle); &ScreenAssignSelectionToStyle);