![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 075f7544f88ee4fec9409bd4777be6eaf146d5ff..107f5b24947e1c83df7cb0c23c321a10b68a5058 100644 (file)
*/
#include "live_effects/parameter/point.h"
+#include "live_effects/parameter/pointparam-knotholder.h"
#include "live_effects/effect.h"
#include "svg/svg.h"
#include "svg/stringstream.h"
#include "shape-editor.h"
#include "desktop.h"
#include "selection.h"
-
-#define LPEPOINTPARAM_DEBUG // undefine to disable all on-canvas editing code for PointParam
+#include "libnr/nr-convert2geom.h"
namespace Inkscape {
PointParam::PointParam( const Glib::ustring& label, const Glib::ustring& tip,
const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
- Effect* effect, Geom::Point default_value )
+ Effect* effect, const gchar *htip, Geom::Point default_value)
: Geom::Point(default_value), Parameter(label, tip, key, wr, effect), defvalue(default_value)
{
-#ifdef LPEPOINTPARAM_DEBUG
- oncanvas_editable = true;
-#endif
+ knot_shape = SP_KNOT_SHAPE_DIAMOND;
+ knot_mode = SP_KNOT_MODE_XOR;
+ knot_color = 0xffffff00;
+ handle_tip = g_strdup(htip);
}
PointParam::~PointParam()
{
+ if (handle_tip)
+ g_free(handle_tip);
}
void
}
gchar *
-PointParam::param_writeSVGValue() const
+PointParam::param_getSVGValue() const
{
Inkscape::SVGOStringStream os;
- os << (*this)[0] << "," << (*this)[1];
+ os << *dynamic_cast<Geom::Point const *>( this );
gchar * str = g_strdup(os.str().c_str());
return str;
}
Gtk::Widget *
-PointParam::param_newWidget(Gtk::Tooltips * tooltips)
+PointParam::param_newWidget(Gtk::Tooltips * /*tooltips*/)
{
- Inkscape::UI::Widget::RegisteredPoint * pointwdg = Gtk::manage(
- new Inkscape::UI::Widget::RegisteredPoint( param_label,
- param_tooltip,
- param_key,
- *param_wr,
- param_effect->getRepr(),
- param_effect->getSPDoc() ) );
- pointwdg->setValue( (*this)[0], (*this)[1] );
+ Inkscape::UI::Widget::RegisteredTransformedPoint * pointwdg = Gtk::manage(
+ new Inkscape::UI::Widget::RegisteredTransformedPoint( param_label,
+ param_tooltip,
+ param_key,
+ *param_wr,
+ param_effect->getRepr(),
+ param_effect->getSPDoc() ) );
+ // TODO: fix to get correct desktop (don't use SP_ACTIVE_DESKTOP)
+ SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+ Geom::Matrix transf = desktop->doc2dt();
+ pointwdg->setTransform(transf);
+ pointwdg->setValue( *this );
pointwdg->clearProgrammatically();
pointwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change point parameter"));
- Gtk::Widget* pIcon = Gtk::manage( sp_icon_get_icon( "draw_node", Inkscape::ICON_SIZE_BUTTON) );
- Gtk::Button * pButton = Gtk::manage(new Gtk::Button());
- pButton->set_relief(Gtk::RELIEF_NONE);
- pIcon->show();
- pButton->add(*pIcon);
- pButton->show();
- pButton->signal_clicked().connect(sigc::mem_fun(*this, &PointParam::on_button_click));
-#ifndef LPEPOINTPARAM_DEBUG
- pButton->set_sensitive(false);
-#endif
-
Gtk::HBox * hbox = Gtk::manage( new Gtk::HBox() );
- static_cast<Gtk::HBox*>(hbox)->pack_start(*pButton, true, true);
static_cast<Gtk::HBox*>(hbox)->pack_start(*pointwdg, true, true);
static_cast<Gtk::HBox*>(hbox)->show_all_children();
- tooltips->set_tip(*pButton, _("Edit on-canvas"));
-
return dynamic_cast<Gtk::Widget *> (hbox);
}
PointParam::param_set_and_write_new_value (Geom::Point newpoint)
{
Inkscape::SVGOStringStream os;
- os << newpoint[0] << "," << newpoint[1];
+ os << newpoint;
gchar * str = g_strdup(os.str().c_str());
param_write_to_repr(str);
g_free(str);
}
void
-PointParam::param_editOncanvas(SPItem * item, SPDesktop * dt)
+PointParam::param_transform_multiply(Geom::Matrix const& postmul, bool /*set*/)
{
- // If not already in nodecontext, goto it!
- if (!tools_isactive(dt, TOOLS_NODES)) {
- tools_switch_current(TOOLS_NODES);
- }
+ param_set_and_write_new_value( (*this) * postmul );
+}
+
- ShapeEditor * shape_editor = SP_NODE_CONTEXT( dt->event_context )->shape_editor;
- shape_editor->set_item_lpe_point_parameter(item, SP_OBJECT(param_effect->getLPEObj()), param_key.c_str());
+void
+PointParam::set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color)
+{
+ knot_shape = shape;
+ knot_mode = mode;
+ knot_color = color;
}
+class PointParamKnotHolderEntity : public LPEKnotHolderEntity {
+public:
+ PointParamKnotHolderEntity(PointParam *p) { this->pparam = p; }
+ virtual ~PointParamKnotHolderEntity() {}
+ virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+ virtual Geom::Point knot_get();
+ virtual void knot_click(guint state);
+
+private:
+ PointParam *pparam;
+};
void
-PointParam::param_transform_multiply(Geom::Matrix const& postmul, bool /*set*/)
+PointParamKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/)
{
- param_set_and_write_new_value( (*this) * postmul );
+ Geom::Point const s = snap_knot_position(p);
+ pparam->param_setValue(s);
+ sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false);
}
+Geom::Point
+PointParamKnotHolderEntity::knot_get()
+{
+ return *pparam;
+}
-// CALLBACKS:
+void
+PointParamKnotHolderEntity::knot_click(guint /*state*/)
+{
+ g_print ("This is the handle associated to parameter '%s'\n", pparam->param_key.c_str());
+}
void
-PointParam::on_button_click()
+PointParam::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item)
{
- SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- SPItem * item = sp_desktop_selection(desktop)->singleItem();
- if (item != NULL) {
- param_editOncanvas(item, desktop);
- }
+ PointParamKnotHolderEntity *e = new PointParamKnotHolderEntity(this);
+ // TODO: can we ditch handleTip() etc. because we have access to handle_tip etc. itself???
+ e->create(desktop, item, knotholder, handleTip(), knot_shape, knot_mode, knot_color);
+ knotholder->add(e);
+
}
} /* namespace LivePathEffect */