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

Add SHORT_DASH stipple pattern.

Browse Source
This commit is contained in:
whitequark 2016-05-26 19:20:39 +00:00
parent 73d82a6347
commit faa84c61cf
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/exportvector.cpp
View File

@ -200,6 +200,11 @@ public:
case StipplePattern::CONTINUOUS: case StipplePattern::CONTINUOUS:
break; break;
case StipplePattern::SHORT_DASH:
type.path.push_back(sw);
type.path.push_back(-sw * 2.0);
break;
case StipplePattern::DASH: case StipplePattern::DASH:
type.path.push_back(sw); type.path.push_back(sw);
type.path.push_back(-sw); type.path.push_back(-sw);
@ -715,6 +720,7 @@ bool DxfFileWriter::NeedToOutput(Constraint *c) {
const char *DxfFileWriter::lineTypeName(StipplePattern stippleType) { const char *DxfFileWriter::lineTypeName(StipplePattern stippleType) {
switch(stippleType) { switch(stippleType) {
case StipplePattern::CONTINUOUS: return "CONTINUOUS"; case StipplePattern::CONTINUOUS: return "CONTINUOUS";
case StipplePattern::SHORT_DASH: return "DASHED";
case StipplePattern::DASH: return "DASHED"; case StipplePattern::DASH: return "DASHED";
case StipplePattern::LONG_DASH: return "DASHEDX2"; case StipplePattern::LONG_DASH: return "DASHEDX2";
case StipplePattern::DASH_DOT: return "DASHDOT"; case StipplePattern::DASH_DOT: return "DASHDOT";
@ -744,6 +750,9 @@ static std::string MakeStipplePattern(StipplePattern pattern, double scale, char
case StipplePattern::CONTINUOUS: case StipplePattern::CONTINUOUS:
return ""; return "";
case StipplePattern::SHORT_DASH:
result = ssprintf("%.3f_%.3f", scale, scale * 2.0);
break;
case StipplePattern::DASH: case StipplePattern::DASH:
result = ssprintf("%.3f_%.3f", scale, scale); result = ssprintf("%.3f_%.3f", scale, scale);
break; break;

1
src/glhelper.cpp
View File

@ -120,6 +120,7 @@ void ssglStippledLine(Vector a, Vector b, double width,
const char *stipplePattern; const char *stipplePattern;
switch(stippleType) { switch(stippleType) {
case StipplePattern::CONTINUOUS: ssglLine(a, b, width, maybeFat); return; case StipplePattern::CONTINUOUS: ssglLine(a, b, width, maybeFat); return;
case StipplePattern::SHORT_DASH: stipplePattern = "- "; break;
case StipplePattern::DASH: stipplePattern = "- "; break; case StipplePattern::DASH: stipplePattern = "- "; break;
case StipplePattern::LONG_DASH: stipplePattern = "_ "; break; case StipplePattern::LONG_DASH: stipplePattern = "_ "; break;
case StipplePattern::DASH_DOT: stipplePattern = "-."; break; case StipplePattern::DASH_DOT: stipplePattern = "-."; break;

15
src/sketch.h
View File

@ -36,13 +36,14 @@ enum class PolyError : uint32_t {
enum class StipplePattern : uint32_t { enum class StipplePattern : uint32_t {
CONTINUOUS = 0, CONTINUOUS = 0,
DASH = 1, SHORT_DASH = 1,
LONG_DASH = 2, DASH = 2,
DASH_DOT = 3, LONG_DASH = 3,
DASH_DOT_DOT = 4, DASH_DOT = 4,
DOT = 5, DASH_DOT_DOT = 5,
FREEHAND = 6, DOT = 6,
ZIGZAG = 7, FREEHAND = 7,
ZIGZAG = 8,
LAST = ZIGZAG LAST = ZIGZAG
}; };

1
src/style.cpp
View File

@ -777,6 +777,7 @@ void TextWindow::ShowStyleInfo() {
const size_t patternCount = (size_t)StipplePattern::LAST + 1; const size_t patternCount = (size_t)StipplePattern::LAST + 1;
const char *patternsSource[patternCount] = { const char *patternsSource[patternCount] = {
"___________", "___________",
"- - - - ",
"- - - - - -", "- - - - - -",
"__ __ __ __", "__ __ __ __",
"-.-.-.-.-.-", "-.-.-.-.-.-",