Commit b02872e1 authored by Jabier Arraiza's avatar Jabier Arraiza Committed by Jabier Arraiza

Remove unused parameters to avoid confussion, because most times this effect...

Remove unused parameters to avoid confussion, because most times this effect are auto generated at convert to paths,
also increase the nearest precission to avoid some nodes are autojoined by inkscape and others not
parent 08b1467d
Pipeline #144575933 failed with stages
in 88 minutes and 27 seconds
......@@ -34,7 +34,6 @@ LPEFillBetweenMany::LPEFillBetweenMany(LivePathEffectObject *lpeobject)
: Effect(lpeobject)
, linked_paths(_("Linked path:"), _("Paths from which to take the original path data"), "linkedpaths", &wr, this)
, method(_("LPE's on linked:"), _("LPE's on linked"), "method", FLMConverter, &wr, this, FLM_BSPLINESPIRO)
, fuse(_("Fuse coincident points"), _("Fuse coincident points"), "fuse", &wr, this, false)
, join(_("Join subpaths"), _("Join subpaths"), "join", &wr, this, true)
, close(_("Close"), _("Close path"), "close", &wr, this, true)
, autoreverse(_("Autoreverse"), _("Autoreverse"), "autoreverse", &wr, this, true)
......@@ -42,7 +41,6 @@ LPEFillBetweenMany::LPEFillBetweenMany(LivePathEffectObject *lpeobject)
{
registerParameter(&linked_paths);
registerParameter(&method);
registerParameter(&fuse);
registerParameter(&join);
registerParameter(&close);
registerParameter(&autoreverse);
......@@ -97,7 +95,7 @@ void LPEFillBetweenMany::doEffect (SPCurve * curve)
linked_path = iter->_pathvector.front();
}
if (!res_pathv.empty() && join) {
if (!are_near(res_pathv.front().finalPoint(), linked_path.initialPoint(), 0.01) || !fuse) {
if (!are_near(res_pathv.front().finalPoint(), linked_path.initialPoint(), 0.1)) {
res_pathv.front().appendNew<Geom::LineSegment>(linked_path.initialPoint());
} else {
linked_path.setInitial(res_pathv.front().finalPoint());
......@@ -175,7 +173,7 @@ void LPEFillBetweenMany::doEffect (SPCurve * curve)
}
current = end;
if (!res_pathv.empty() && join) {
if (!are_near(res_pathv.front().finalPoint(), linked_path.initialPoint(), 0.01) || !fuse) {
if (!are_near(res_pathv.front().finalPoint(), linked_path.initialPoint(), 0.1)) {
res_pathv.front().appendNew<Geom::LineSegment>(linked_path.initialPoint());
} else {
linked_path.setInitial(res_pathv.front().finalPoint());
......
......@@ -33,7 +33,6 @@ public:
private:
OriginalPathArrayParam linked_paths;
EnumParam<Filllpemethod> method;
BoolParam fuse;
BoolParam join;
BoolParam close;
BoolParam autoreverse;
......
......@@ -20,14 +20,12 @@ LPEFillBetweenStrokes::LPEFillBetweenStrokes(LivePathEffectObject *lpeobject) :
linked_path(_("Linked path:"), _("Path from which to take the original path data"), "linkedpath", &wr, this),
second_path(_("Second path:"), _("Second path from which to take the original path data"), "secondpath", &wr, this),
reverse_second(_("Reverse Second"), _("Reverses the second path order"), "reversesecond", &wr, this),
fuse(_("Fuse coincident points"), _("Fuse coincident points"), "fuse", &wr, this, false),
join(_("Join subpaths"), _("Join subpaths"), "join", &wr, this, true),
close(_("Close"), _("Close path"), "close", &wr, this, true)
{
registerParameter(&linked_path);
registerParameter(&second_path);
registerParameter(&reverse_second);
registerParameter(&fuse);
registerParameter(&join);
registerParameter(&close);
}
......@@ -74,7 +72,7 @@ void LPEFillBetweenStrokes::doEffect (SPCurve * curve)
result_second_pathv.front() = result_second_pathv.front().reversed();
}
if (join) {
if (!are_near(result_linked_pathv.front().finalPoint(), result_second_pathv.front().initialPoint(),0.01) || !fuse) {
if (!are_near(result_linked_pathv.front().finalPoint(), result_second_pathv.front().initialPoint(), 0.1)) {
result_linked_pathv.front().appendNew<Geom::LineSegment>(result_second_pathv.front().initialPoint());
} else {
result_second_pathv.front().setInitial(result_linked_pathv.front().finalPoint());
......
......@@ -26,7 +26,6 @@ private:
OriginalPathParam linked_path;
OriginalPathParam second_path;
BoolParam reverse_second;
BoolParam fuse;
BoolParam join;
BoolParam close;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment