kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #9530 from yorikvanhavre/draft-svg-dashes

Browse Source 
Draft: Better svg linestyle settings - fixes #6733
This commit is contained in:
Yorik van Havre
2023-05-15 11:38:49 +02:00
committed by GitHub
parent 2b50bb599d 3c685c556c
commit a892de5fc6
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Mod/Draft/Resources/ui/preferences-draftvisual.ui
View File

@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>531</width>
<width>570</width>
<height>552</height>
</rect>
</property>
@@ -17,7 +17,16 @@
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<item>
@@ -352,7 +361,7 @@
<string>An SVG linestyle definition</string>
</property>
<property name="text">
<string notr="true">0.09,0.05</string>
<string notr="true">2,2</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -395,7 +404,7 @@
<string>An SVG linestyle definition</string>
</property>
<property name="text">
<string notr="true">0.09,0.05,0.02,0.05</string>
<string notr="true">3,2,0.2,2</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -438,7 +447,7 @@
<string>An SVG linestyle definition</string>
</property>
<property name="text">
<string notr="true">0.02,0.02</string>
<string notr="true">0.2,2</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

6
src/Mod/Draft/draftfunctions/svg.py
View File

@@ -54,11 +54,11 @@ def get_line_style(line_style, scale):
style = None
if line_style == "Dashed":
style = param.GetString("svgDashedLine", "0.09,0.05")
style = param.GetString("svgDashedLine", "2,2")
elif line_style == "Dashdot":
style = param.GetString("svgDashdotLine", "0.09,0.05,0.02,0.05")
style = param.GetString("svgDashdotLine", "3,2,0.2,2")
elif line_style == "Dotted":
style = param.GetString("svgDottedLine", "0.02,0.02")
style = param.GetString("svgDottedLine", "0.2,2")
elif line_style:
if "," in line_style:
style = line_style