1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
--- src/live_effects/lpe-knot.cpp (before formatting)
+++ src/live_effects/lpe-knot.cpp (after formatting)
@@ -353,12 +353,10 @@
3)
, prop_to_stroke_width(_("_In units of stroke width"), _("Consider 'Width' as a ratio of stroke width"),
"prop_to_stroke_width", &wr, this, true)
- , both(_("_Both gaps"), _("Use gap in both intersection elements"),
- "both", &wr, this, false)
+ , both(_("_Both gaps"), _("Use gap in both intersection elements"), "both", &wr, this, false)
, inverse_width(_("_Groups: Inverse"), _("Use other stroke width, useful in groups with diferent stroke width"),
"inverse_width", &wr, this, false)
- , unclimb(_("_Groups: unclimb"), _("Don`t climb the gap in the same path"),
- "unclimb", &wr, this, false)
+ , unclimb(_("_Groups: unclimb"), _("Don`t climb the gap in the same path"), "unclimb", &wr, this, false)
, add_stroke_width("St_roke width", "Add the stroke width to the interruption size", "add_stroke_width", &wr, this,
"inkscape_1.0_and_up", true)
, add_other_stroke_width("_Crossing path stroke width", "Add crossed stroke width to the interruption size",
@@ -452,7 +450,7 @@
int geom_sign = ( cross(flag_i[1], flag_j[1]) < 0 ? 1 : -1);
if (unclimb) {
- geom_sign = comp%2 == 0 ? -1 : -1;
+ geom_sign = comp % 2 == 0 ? -1 : -1;
}
bool i0_is_under = false;
double width = interruption_width;
@@ -464,11 +462,11 @@
i0_is_under = true;
}
}
- i0_is_under = crossing_points[p].sign != 0 && both?true:i0_is_under;
- if (i0_is_under && j == i0){
- std::swap( i, j);
+ i0_is_under = crossing_points[p].sign != 0 && both ? true : i0_is_under;
+ if (i0_is_under && j == i0) {
+ std::swap(i, j);
std::swap(ti, tj);
- std::swap(flag_i,flag_j);
+ std::swap(flag_i, flag_j);
}
if (i0_is_under){
if ( prop_to_stroke_width.get_value() ) {
@@ -494,19 +492,18 @@
}else{
dom = complementOf(hidden,dom);
}
- if (crossing_points[p].i == i0 &&
- crossing_points[p].j == i0 &&
- crossing_points[p].sign != 0 &&
- both)
- {
- hidden = findShadowedTime(gpaths[i0], flag_i, tj, width/2);
- period = size_nondegenerate(gpaths[i0]);
- if (hidden.max() > period ) hidden -= period;
- if (hidden.min()<0){
- dom = complementOf( Interval(0,hidden.max()) ,dom);
- dom = complementOf( Interval(hidden.min()+period, period) ,dom);
- }else{
- dom = complementOf(hidden,dom);
+ if (crossing_points[p].i == i0 && crossing_points[p].j == i0 && crossing_points[p].sign != 0 &&
+ both) {
+ hidden = findShadowedTime(gpaths[i0], flag_i, tj, width / 2);
+ period = size_nondegenerate(gpaths[i0]);
+ if (hidden.max() > period)
+ hidden -= period;
+ if (hidden.min() < 0) {
+ dom = complementOf(Interval(0, hidden.max()), dom);
+ dom = complementOf(Interval(hidden.min() + period, period), dom);
+ }
+ else {
+ dom = complementOf(hidden, dom);
}
}
}
|
