![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 31c4ae55bdd04574e46c9eb77da8cd5d35502da5..a54be8baa76aaf3a495eb2076d5996bb31e3bbf8 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 <gtkmm.h>
#include "ui/widget/point.h"
#include "widgets/icon.h"
-
-#include "knot.h"
+#include "ui/widget/registered-widget.h"
#include "inkscape.h"
#include "verbs.h"
-#define noLPEPOINTPARAM_DEBUG
-
-#define PRM_KNOT_COLOR_NORMAL 0xffffff00
-#define PRM_KNOT_COLOR_SELECTED 0x0000ff00
+// needed for on-canvas editting:
+#include "tools-switch.h"
+#include "node-context.h"
+#include "shape-editor.h"
+#include "desktop.h"
+#include "selection.h"
+#include "libnr/nr-convert2geom.h"
namespace Inkscape {
Effect* effect, Geom::Point default_value )
: Geom::Point(default_value), Parameter(label, tip, key, wr, effect), defvalue(default_value)
{
- knot = NULL;
+ oncanvas_editable = true;
+
+ knot_shape = SP_KNOT_SHAPE_SQUARE;
+ knot_mode = SP_KNOT_MODE_XOR;
+ knot_color = 0x00ff0000;
}
PointParam::~PointParam()
{
- if (knot)
- g_object_unref (G_OBJECT (knot));
}
void
PointParam::param_writeSVGValue() 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)
{
- // WIDGET TODO: This implementation is incorrect, it should create a *new* widget for the caller, not just return an already created widget
- g_warning("PointParam::param_newWidget still needs recoding to work with multiple document views");
- 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 = to_2geom(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) );
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);
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)
+{
+ // If not already in nodecontext, goto it!
+ if (!tools_isactive(dt, TOOLS_NODES)) {
+ tools_switch_current(TOOLS_NODES);
+ }
+
+ PointParamKnotHolder * kh = pointparam_knot_holder_new( dt, SP_OBJECT(param_effect->getLPEObj()), param_key.c_str(), item);
+ if (kh) {
+ kh->add_knot(* dynamic_cast<Geom::Point *>( this ), NULL, knot_shape, knot_mode, knot_color, param_getTooltip()->c_str() );
+
+ ShapeEditor * shape_editor = SP_NODE_CONTEXT( dt->event_context )->shape_editor;
+ shape_editor->set_knotholder(kh);
+ }
+}
+
+
+
void
PointParam::param_transform_multiply(Geom::Matrix const& postmul, bool /*set*/)
{
@@ -130,41 +154,24 @@ PointParam::param_transform_multiply(Geom::Matrix const& postmul, bool /*set*/)
}
+void
+PointParam::set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color)
+{
+ knot_shape = shape;
+ knot_mode = mode;
+ knot_color = color;
+}
+
+
// CALLBACKS:
void
PointParam::on_button_click()
{
- g_message("add knot to canvas on correct location :S");
-
- if (!knot) {
- // create the knot
- knot = sp_knot_new (SP_ACTIVE_DESKTOP, NULL);
- knot->setMode(SP_KNOT_MODE_XOR);
- knot->setFill(PRM_KNOT_COLOR_NORMAL, PRM_KNOT_COLOR_NORMAL, PRM_KNOT_COLOR_NORMAL);
- knot->setStroke(0x000000ff, 0x000000ff, 0x000000ff);
- sp_knot_update_ctrl(knot);
-
- // move knot to the given point
- sp_knot_set_position (knot, &NR::Point(*static_cast<Geom::Point*>(this)), SP_KNOT_STATE_NORMAL);
- sp_knot_show (knot);
-/*
- // connect knot's signals
- if ( (draggable) // it can be NULL if a node in unsnapped (eg. focus point unsnapped from center)
- // luckily, midstops never snap to other nodes so are never unsnapped...
- && ( (draggable->point_type == POINT_LG_MID)
- || (draggable->point_type == POINT_RG_MID1)
- || (draggable->point_type == POINT_RG_MID2) ) )
- {
- this->handler_id = g_signal_connect (G_OBJECT (this->knot), "moved", G_CALLBACK (gr_knot_moved_midpoint_handler), this);
- } else {
- this->handler_id = g_signal_connect (G_OBJECT (this->knot), "moved", G_CALLBACK (gr_knot_moved_handler), this);
- }
- g_signal_connect (G_OBJECT (this->knot), "clicked", G_CALLBACK (gr_knot_clicked_handler), this);
- g_signal_connect (G_OBJECT (this->knot), "doubleclicked", G_CALLBACK (gr_knot_doubleclicked_handler), this);
- g_signal_connect (G_OBJECT (this->knot), "grabbed", G_CALLBACK (gr_knot_grabbed_handler), this);
- g_signal_connect (G_OBJECT (this->knot), "ungrabbed", G_CALLBACK (gr_knot_ungrabbed_handler), this);
-*/
+ SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+ SPItem * item = sp_desktop_selection(desktop)->singleItem();
+ if (item != NULL) {
+ param_editOncanvas(item, desktop);
}
}