summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/lpe-bendpath.cpp90
-rw-r--r--src/live_effects/lpe-bendpath.h19
-rw-r--r--src/live_effects/lpe-patternalongpath.cpp107
-rw-r--r--src/live_effects/lpe-patternalongpath.h19
-rw-r--r--src/style-internal.cpp3
-rw-r--r--src/style-internal.h4
6 files changed, 230 insertions, 12 deletions
diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index 33171b184..874e23c4c 100644
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -20,7 +20,13 @@
#include <2geom/d2.h>
#include <2geom/piecewise.h>
+#include "knot-holder-entity.h"
+#include "knotholder.h"
+
+#include <glibmm/i18n.h>
+
#include <algorithm>
+
using std::vector;
@@ -48,10 +54,21 @@ first) but I think we can first forget about them.
namespace Inkscape {
namespace LivePathEffect {
+Geom::PathVector bp_helper_path;
+namespace BeP {
+class KnotHolderEntityWidthBendPath : public LPEKnotHolderEntity {
+ public:
+ KnotHolderEntityWidthBendPath(LPEBendPath * effect) : LPEKnotHolderEntity(effect) {}
+ virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+ virtual Geom::Point knot_get() const;
+ };
+} // BeP
+
LPEBendPath::LPEBendPath(LivePathEffectObject *lpeobject) :
Effect(lpeobject),
bend_path(_("Bend path:"), _("Path along which to bend the original path"), "bendpath", &wr, this, "M0,0 L1,0"),
- prop_scale(_("_Width:"), _("Width of the path"), "prop_scale", &wr, this, 1),
+ original_height(0.0),
+ prop_scale(_("_Width:"), _("Width of the path"), "prop_scale", &wr, this, 1.0),
scale_y_rel(_("W_idth in units of length"), _("Scale the width of the path in units of its length"), "scale_y_rel", &wr, this, false),
vertical_pattern(_("_Original path is vertical"), _("Rotates the original 90 degrees, before bending it along the bend path"), "vertical", &wr, this, false)
{
@@ -63,6 +80,7 @@ LPEBendPath::LPEBendPath(LivePathEffectObject *lpeobject) :
prop_scale.param_set_digits(3);
prop_scale.param_set_increments(0.01, 0.10);
+ _provides_knotholder_entities = true;
concatenate_before_pwd2 = true;
}
@@ -76,7 +94,9 @@ LPEBendPath::doBeforeEffect (SPLPEItem const* lpeitem)
{
// get the item bounding box
original_bbox(lpeitem);
+ original_height = boundingbox_Y.max() - boundingbox_Y.min();
SPLPEItem * item = const_cast<SPLPEItem*>(lpeitem);
+
item->apply_to_clippath(item);
item->apply_to_mask(item);
}
@@ -148,7 +168,75 @@ LPEBendPath::resetDefaults(SPItem const* item)
bend_path.set_new_value( path.toPwSb(), true );
}
+void
+LPEBendPath::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec)
+{
+ hp_vec.push_back(bp_helper_path);
+}
+
+void
+LPEBendPath::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item)
+{
+ KnotHolderEntity *e = new BeP::KnotHolderEntityWidthBendPath(this);
+ e->create(desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, _("Change the width"), SP_KNOT_SHAPE_CIRCLE);
+ knotholder->add(e);
+}
+
+namespace BeP {
+void
+KnotHolderEntityWidthBendPath::knot_set(Geom::Point const &p, Geom::Point const& /*origin*/, guint state)
+{
+ LPEBendPath *lpe = dynamic_cast<LPEBendPath *> (_effect);
+
+ Geom::Point const s = snap_knot_position(p, state);
+ Geom::Path path_in = lpe->bend_path.get_pathvector().pathAt(Geom::PathVectorTime(0, 0, 0.0));
+ Geom::Point ptA = path_in.pointAt(Geom::PathTime(0, 0.0));
+ Geom::Point B = path_in.pointAt(Geom::PathTime(1, 0.0));
+ Geom::Curve const *first_curve = &path_in.curveAt(Geom::PathTime(0, 0.0));
+ Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const *>(&*first_curve);
+ Geom::Ray ray(ptA, B);
+ if (cubic) {
+ ray.setPoints(ptA, (*cubic)[1]);
+ }
+ ray.setAngle(ray.angle() + Geom::deg_to_rad(90));
+ Geom::Point knot_pos = this->knot->pos * item->i2dt_affine().inverse();
+ Geom::Coord nearest_to_ray = ray.nearestTime(knot_pos);
+ if(nearest_to_ray == 0){
+ lpe->prop_scale.param_set_value(-Geom::distance(s , ptA)/(lpe->original_height/2.0));
+ } else {
+ lpe->prop_scale.param_set_value(Geom::distance(s , ptA)/(lpe->original_height/2.0));
+ }
+
+ sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true);
+}
+
+Geom::Point
+KnotHolderEntityWidthBendPath::knot_get() const
+{
+ LPEBendPath *lpe = dynamic_cast<LPEBendPath *> (_effect);
+
+ Geom::Path path_in = lpe->bend_path.get_pathvector().pathAt(Geom::PathVectorTime(0, 0, 0.0));
+ Geom::Point ptA = path_in.pointAt(Geom::PathTime(0, 0.0));
+ Geom::Point B = path_in.pointAt(Geom::PathTime(1, 0.0));
+ Geom::Curve const *first_curve = &path_in.curveAt(Geom::PathTime(0, 0.0));
+ Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const *>(&*first_curve);
+ Geom::Ray ray(ptA, B);
+ if (cubic) {
+ ray.setPoints(ptA,(*cubic)[1]);
+ }
+ ray.setAngle(ray.angle() + Geom::deg_to_rad(90));
+ Geom::Point result_point = Geom::Point::polar(ray.angle(), (lpe->original_height/2.0) * lpe->prop_scale) + ptA;
+
+ bp_helper_path.clear();
+ Geom::Path hp(result_point);
+ hp.appendNew<Geom::LineSegment>(ptA);
+ bp_helper_path.push_back(hp);
+ hp.clear();
+
+ return result_point;
+}
+} // namespace BeP
} // namespace LivePathEffect
} /* namespace Inkscape */
diff --git a/src/live_effects/lpe-bendpath.h b/src/live_effects/lpe-bendpath.h
index 0871d532e..eeda86a5e 100644
--- a/src/live_effects/lpe-bendpath.h
+++ b/src/live_effects/lpe-bendpath.h
@@ -27,6 +27,10 @@
namespace Inkscape {
namespace LivePathEffect {
+namespace BeP {
+class KnotHolderEntityWidthBendPath;
+}
+
//for Bend path on group : we need information concerning the group Bounding box
class LPEBendPath : public Effect, GroupBBoxEffect {
public:
@@ -39,12 +43,19 @@ public:
virtual void resetDefaults(SPItem const* item);
- PathParam bend_path;
+ void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec);
+
+ virtual void addKnotHolderEntities(KnotHolder * knotholder, SPDesktop * desktop, SPItem * item);
+
+ PathParam bend_path;
+
+ friend class BeP::KnotHolderEntityWidthBendPath;
+protected:
+ double original_height;
+ ScalarParam prop_scale;
private:
- ScalarParam prop_scale;
BoolParam scale_y_rel;
- BoolParam vertical_pattern;
-
+ BoolParam vertical_pattern;
Geom::Piecewise<Geom::D2<Geom::SBasis> > uskeleton;
Geom::Piecewise<Geom::D2<Geom::SBasis> > n;
diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index ed65a0d50..706091be9 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -18,6 +18,9 @@
#include <2geom/d2.h>
#include <2geom/piecewise.h>
+#include "knot-holder-entity.h"
+#include "knotholder.h"
+
#include <algorithm>
using std::vector;
@@ -45,6 +48,16 @@ first) but I think we can first forget about them.
namespace Inkscape {
namespace LivePathEffect {
+Geom::PathVector pap_helper_path;
+
+namespace WPAP {
+ class KnotHolderEntityWidthPatternAlongPath : public LPEKnotHolderEntity {
+ public:
+ KnotHolderEntityWidthPatternAlongPath(LPEPatternAlongPath * effect) : LPEKnotHolderEntity(effect) {}
+ virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+ virtual Geom::Point knot_get() const;
+ };
+} // WPAP
static const Util::EnumData<PAPCopyType> PAPCopyTypeData[PAPCT_END] = {
{PAPCT_SINGLE, N_("Single"), "single"},
@@ -57,9 +70,10 @@ static const Util::EnumDataConverter<PAPCopyType> PAPCopyTypeConverter(PAPCopyTy
LPEPatternAlongPath::LPEPatternAlongPath(LivePathEffectObject *lpeobject) :
Effect(lpeobject),
pattern(_("Pattern source:"), _("Path to put along the skeleton path"), "pattern", &wr, this, "M0,0 L1,0"),
+ original_height(0),
+ prop_scale(_("_Width:"), _("Width of the pattern"), "prop_scale", &wr, this, 1.0),
copytype(_("Pattern copies:"), _("How many pattern copies to place along the skeleton path"),
"copytype", PAPCopyTypeConverter, &wr, this, PAPCT_SINGLE_STRETCHED),
- prop_scale(_("_Width:"), _("Width of the pattern"), "prop_scale", &wr, this, 1),
scale_y_rel(_("Wid_th in units of length"),
_("Scale the width of the pattern in units of its length"),
"scale_y_rel", &wr, this, false),
@@ -87,9 +101,11 @@ LPEPatternAlongPath::LPEPatternAlongPath(LivePathEffectObject *lpeobject) :
registerParameter( dynamic_cast<Parameter *>(&prop_units) );
registerParameter( dynamic_cast<Parameter *>(&vertical_pattern) );
registerParameter( dynamic_cast<Parameter *>(&fuse_tolerance) );
-
prop_scale.param_set_digits(3);
prop_scale.param_set_increments(0.01, 0.10);
+
+ _provides_knotholder_entities = true;
+
}
LPEPatternAlongPath::~LPEPatternAlongPath()
@@ -97,6 +113,16 @@ LPEPatternAlongPath::~LPEPatternAlongPath()
}
+void
+LPEPatternAlongPath::doBeforeEffect (SPLPEItem const* lpeitem)
+{
+ // get the pattern bounding box
+ Geom::OptRect bbox = pattern.get_pathvector().boundsFast();
+ if (bbox) {
+ original_height = (*bbox)[Geom::Y].max() - (*bbox)[Geom::Y].min();
+ }
+}
+
Geom::Piecewise<Geom::D2<Geom::SBasis> >
LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in)
{
@@ -238,6 +264,83 @@ LPEPatternAlongPath::transform_multiply(Geom::Affine const& postmul, bool set)
}
}
+void
+LPEPatternAlongPath::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec)
+{
+ hp_vec.push_back(pap_helper_path);
+}
+
+
+void
+LPEPatternAlongPath::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item)
+{
+ KnotHolderEntity *e = new WPAP::KnotHolderEntityWidthPatternAlongPath(this);
+ e->create(desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, _("Change the width"), SP_KNOT_SHAPE_CIRCLE);
+ knotholder->add(e);
+}
+
+namespace WPAP {
+
+void
+KnotHolderEntityWidthPatternAlongPath::knot_set(Geom::Point const &p, Geom::Point const& /*origin*/, guint state)
+{
+ LPEPatternAlongPath *lpe = dynamic_cast<LPEPatternAlongPath *> (_effect);
+
+ Geom::Point const s = snap_knot_position(p, state);
+ SPShape const *sp_shape = dynamic_cast<SPShape const *>(SP_LPE_ITEM(item));
+ if (sp_shape) {
+ Geom::Path const *path_in = sp_shape->getCurveBeforeLPE()->first_path();
+ Geom::Point ptA = path_in->pointAt(Geom::PathTime(0, 0.0));
+ Geom::Point B = path_in->pointAt(Geom::PathTime(1, 0.0));
+ Geom::Curve const *first_curve = &path_in->curveAt(Geom::PathTime(0, 0.0));
+ Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const *>(&*first_curve);
+ Geom::Ray ray(ptA, B);
+ if (cubic) {
+ ray.setPoints(ptA, (*cubic)[1]);
+ }
+ ray.setAngle(ray.angle() + Geom::deg_to_rad(90));
+ Geom::Point knot_pos = this->knot->pos * item->i2dt_affine().inverse();
+ Geom::Coord nearest_to_ray = ray.nearestTime(knot_pos);
+ if(nearest_to_ray == 0){
+ lpe->prop_scale.param_set_value(-Geom::distance(s , ptA)/(lpe->original_height/2.0));
+ } else {
+ lpe->prop_scale.param_set_value(Geom::distance(s , ptA)/(lpe->original_height/2.0));
+ }
+
+ }
+ sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true);
+}
+
+Geom::Point
+KnotHolderEntityWidthPatternAlongPath::knot_get() const
+{
+ LPEPatternAlongPath *lpe = dynamic_cast<LPEPatternAlongPath *> (_effect);
+
+ SPShape const *sp_shape = dynamic_cast<SPShape const *>(SP_LPE_ITEM(item));
+ if (sp_shape) {
+ Geom::Path const *path_in = sp_shape->getCurveBeforeLPE()->first_path();
+ Geom::Point ptA = path_in->pointAt(Geom::PathTime(0, 0.0));
+ Geom::Point B = path_in->pointAt(Geom::PathTime(1, 0.0));
+ Geom::Curve const *first_curve = &path_in->curveAt(Geom::PathTime(0, 0.0));
+ Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const *>(&*first_curve);
+ Geom::Ray ray(ptA, B);
+ if (cubic) {
+ ray.setPoints(ptA, (*cubic)[1]);
+ }
+ ray.setAngle(ray.angle() + Geom::deg_to_rad(90));
+ Geom::Point result_point = Geom::Point::polar(ray.angle(), (lpe->original_height/2.0) * lpe->prop_scale) + ptA;
+
+ pap_helper_path.clear();
+ Geom::Path hp(result_point);
+ hp.appendNew<Geom::LineSegment>(ptA);
+ pap_helper_path.push_back(hp);
+ hp.clear();
+
+ return result_point;
+ }
+ return Geom::Point();
+}
+} // namespace WPAP
} // namespace LivePathEffect
} /* namespace Inkscape */
diff --git a/src/live_effects/lpe-patternalongpath.h b/src/live_effects/lpe-patternalongpath.h
index be2197ddb..3b9a17ab0 100644
--- a/src/live_effects/lpe-patternalongpath.h
+++ b/src/live_effects/lpe-patternalongpath.h
@@ -13,10 +13,15 @@
#include "live_effects/effect.h"
#include "live_effects/parameter/path.h"
#include "live_effects/parameter/bool.h"
+#include "live_effects/parameter/point.h"
namespace Inkscape {
namespace LivePathEffect {
+namespace WPAP {
+class KnotHolderEntityWidthPatternAlongPath;
+}
+
enum PAPCopyType {
PAPCT_SINGLE = 0,
PAPCT_SINGLE_STRETCHED,
@@ -30,14 +35,25 @@ public:
LPEPatternAlongPath(LivePathEffectObject *lpeobject);
virtual ~LPEPatternAlongPath();
+ virtual void doBeforeEffect (SPLPEItem const* lpeitem);
+
virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
virtual void transform_multiply(Geom::Affine const& postmul, bool set);
+ void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec);
+
+ virtual void addKnotHolderEntities(KnotHolder * knotholder, SPDesktop * desktop, SPItem * item);
+
PathParam pattern;
+
+ friend class WPAP::KnotHolderEntityWidthPatternAlongPath;
+protected:
+ double original_height;
+ ScalarParam prop_scale;
+
private:
EnumParam<PAPCopyType> copytype;
- ScalarParam prop_scale;
BoolParam scale_y_rel;
ScalarParam spacing;
ScalarParam normal_offset;
@@ -45,7 +61,6 @@ private:
BoolParam prop_units;
BoolParam vertical_pattern;
ScalarParam fuse_tolerance;
-
void on_pattern_pasted();
LPEPatternAlongPath(const LPEPatternAlongPath&);
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index c117a97f9..b425a1c80 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -709,7 +709,8 @@ SPIEnumBits::write( guint const flags, SPIBase const *const base) const {
unsigned j = 1;
for (unsigned i = 0; enums[i].key; ++i) {
if (j & this->value ) {
- return_string += enums[i].value + " ";
+ return_string += enums[i].key;
+ return_string += " ";
}
j *= 2;
}
diff --git a/src/style-internal.h b/src/style-internal.h
index 889292454..767552784 100644
--- a/src/style-internal.h
+++ b/src/style-internal.h
@@ -342,7 +342,7 @@ public:
computed(0)
{}
- SPILength( Glib::ustring const &name, unsigned value = 0 )
+ SPILength( Glib::ustring const &name, float value = 0 )
: SPIBase( name ),
unit(SP_CSS_UNIT_NONE),
value(value),
@@ -401,7 +401,7 @@ public:
normal(true)
{}
- SPILengthOrNormal( Glib::ustring const &name, unsigned value = 0 )
+ SPILengthOrNormal( Glib::ustring const &name, float value = 0 )
: SPILength( name, value ),
normal(true)
{}
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 16:10:17 +0000