X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fseltrans.h;h=0183683ffe028026dd0bbdd525a0c4e4cd04d5ba;hb=42382dfb4164b919ffcdf03766da9f8be4e43b42;hp=00d7fb1c494dcd865184cb580385cff42ead8348;hpb=c350508cfbe7720966a9b53c84388ab7e5f2e5ca;p=inkscape.git diff --git a/src/seltrans.h b/src/seltrans.h index 00d7fb1c4..0183683ff 100644 --- a/src/seltrans.h +++ b/src/seltrans.h @@ -16,14 +16,15 @@ */ #include -#include -#include -#include +#include <2geom/point.h> +#include <2geom/matrix.h> +#include <2geom/rect.h> #include "knot.h" #include "forward.h" #include "selcue.h" #include "message-context.h" #include +#include "sp-item.h" struct SPKnot; class SPDesktop; @@ -33,7 +34,7 @@ class SPSelTransHandle; namespace Inkscape { -NR::scale calcScaleFactors(NR::Point const &initial_point, NR::Point const &new_point, NR::Point const &origin, bool const skew = false); +Geom::Scale calcScaleFactors(Geom::Point const &initial_point, Geom::Point const &new_point, Geom::Point const &origin, bool const skew = false); namespace XML { @@ -52,26 +53,26 @@ public: void increaseState(); void resetState(); - void setCenter(NR::Point const &p); - void grab(NR::Point const &p, gdouble x, gdouble y, bool show_handles); - void transform(NR::Matrix const &rel_affine, NR::Point const &norm); + void setCenter(Geom::Point const &p); + void grab(Geom::Point const &p, gdouble x, gdouble y, bool show_handles, bool translating); + void transform(Geom::Matrix const &rel_affine, Geom::Point const &norm); void ungrab(); void stamp(); - void moveTo(NR::Point const &xy, guint state); - void stretch(SPSelTransHandle const &handle, NR::Point &pt, guint state); - void scale(NR::Point &pt, guint state); - void skew(SPSelTransHandle const &handle, NR::Point &pt, guint state); - void rotate(NR::Point &pt, guint state); - gboolean scaleRequest(NR::Point &pt, guint state); - gboolean stretchRequest(SPSelTransHandle const &handle, NR::Point &pt, guint state); - gboolean skewRequest(SPSelTransHandle const &handle, NR::Point &pt, guint state); - gboolean rotateRequest(NR::Point &pt, guint state); - gboolean centerRequest(NR::Point &pt, guint state); - - gboolean handleRequest(SPKnot *knot, NR::Point *position, guint state, SPSelTransHandle const &handle); + void moveTo(Geom::Point const &xy, guint state); + void stretch(SPSelTransHandle const &handle, Geom::Point &pt, guint state); + void scale(Geom::Point &pt, guint state); + void skew(SPSelTransHandle const &handle, Geom::Point &pt, guint state); + void rotate(Geom::Point &pt, guint state); + gboolean scaleRequest(Geom::Point &pt, guint state); + gboolean stretchRequest(SPSelTransHandle const &handle, Geom::Point &pt, guint state); + gboolean skewRequest(SPSelTransHandle const &handle, Geom::Point &pt, guint state); + gboolean rotateRequest(Geom::Point &pt, guint state); + gboolean centerRequest(Geom::Point &pt, guint state); + + gboolean handleRequest(SPKnot *knot, Geom::Point *position, guint state, SPSelTransHandle const &handle); void handleGrab(SPKnot *knot, guint state, SPSelTransHandle const &handle); void handleClick(SPKnot *knot, guint state, SPSelTransHandle const &handle); - void handleNewEvent(SPKnot *knot, NR::Point *position, guint state, SPSelTransHandle const &handle); + void handleNewEvent(SPKnot *knot, Geom::Point *position, guint state, SPSelTransHandle const &handle); enum Show { @@ -86,7 +87,7 @@ public: return _empty; } bool isGrabbed() { - return _grabbed; + return _grabbed; } bool centerIsVisible() { return ( _chandle && SP_KNOT_IS_VISIBLE (_chandle) ); @@ -99,23 +100,28 @@ private: void _selModified(Inkscape::Selection *selection, guint flags); void _showHandles(SPKnot *knot[], SPSelTransHandle const handle[], gint num, gchar const *even_tip, gchar const *odd_tip); - NR::Point _getGeomHandlePos(NR::Point const &visual_handle_pos); - NR::Point _calcAbsAffineDefault(NR::scale const default_scale); - NR::Point _calcAbsAffineGeom(NR::scale const geom_scale); + Geom::Point _getGeomHandlePos(Geom::Point const &visual_handle_pos); + Geom::Point _calcAbsAffineDefault(Geom::Scale const default_scale); + Geom::Point _calcAbsAffineGeom(Geom::Scale const geom_scale); + void _keepClosestPointOnly(std::vector &points, const Geom::Point &reference); + void _display_snapsource(); enum State { STATE_SCALE, //scale or stretch STATE_ROTATE //rotate or skew }; - + SPDesktop *_desktop; - std::vector > _items; - std::vector > _items_centers; - - std::vector _snap_points; - std::vector _bbox_points; - + std::vector _items; + std::vector _items_const; + std::vector _items_affines; + std::vector _items_centers; + + std::vector _snap_points; + std::vector _bbox_points; // the bbox point of the selection as a whole, i.e. max. 4 corners plus optionally some midpoints + std::vector _bbox_points_for_translating; // the bbox points of each selected item, only to be used for translating + Inkscape::SelCue _selcue; Inkscape::Selection *_selection; @@ -128,31 +134,31 @@ private: bool _changed; SPItem::BBoxType _snap_bbox_type; - - NR::Maybe _bbox; - NR::Maybe _approximate_bbox; - NR::Maybe _geometric_bbox; + + Geom::OptRect _bbox; + Geom::OptRect _approximate_bbox; + Geom::OptRect _geometric_bbox; gdouble _strokewidth; - - NR::Matrix _current_relative_affine; - NR::Matrix _absolute_affine; - NR::Matrix _relative_affine; + + Geom::Matrix _current_relative_affine; + Geom::Matrix _absolute_affine; + Geom::Matrix _relative_affine; /* According to Merriam - Webster's online dictionary * Affine: a transformation (as a translation, a rotation, or a uniform stretching) that carries straight * lines into straight lines and parallel lines into parallel lines but may alter distance between points * and angles between lines */ - - NR::Point _opposite; ///< opposite point to where a scale is taking place - NR::Point _opposite_for_specpoints; - NR::Point _opposite_for_bboxpoints; - NR::Point _origin_for_specpoints; - NR::Point _origin_for_bboxpoints; + + Geom::Point _opposite; ///< opposite point to where a scale is taking place + Geom::Point _opposite_for_specpoints; + Geom::Point _opposite_for_bboxpoints; + Geom::Point _origin_for_specpoints; + Geom::Point _origin_for_bboxpoints; gdouble _handle_x; gdouble _handle_y; - NR::Maybe _center; + boost::optional _center; bool _center_is_set; ///< we've already set _center, no need to reread it from items SPKnot *_shandle[8]; @@ -165,9 +171,9 @@ private: guint _sel_modified_id; GSList *_stamp_cache; - NR::Point _origin; ///< position of origin for transforms - NR::Point _point; ///< original position of the knot being used for the current transform - NR::Point _point_geom; ///< original position of the knot being used for the current transform + Geom::Point _origin; ///< position of origin for transforms + Geom::Point _point; ///< original position of the knot being used for the current transform + Geom::Point _point_geom; ///< original position of the knot being used for the current transform Inkscape::MessageContext _message_context; sigc::connection _sel_changed_connection; sigc::connection _sel_modified_connection;