主页 » Jabiertxo Arraiza Cenoz » 资源 » PasteBin » Measur Line r.15035
  1. === modified file 'po/POTFILES.in'
  2. --- po/POTFILES.in 2016-05-30 12:34:46 +0000
  3. +++ po/POTFILES.in 2016-07-30 14:50:37 +0000
  4. @@ -154,6 +154,7 @@
  5. src/live_effects/lpe-rough-hatches.cpp
  6. src/live_effects/lpe-roughen.cpp
  7. src/live_effects/lpe-ruler.cpp
  8. +src/live_effects/lpe-measure-line.cpp
  9. src/live_effects/lpe-show_handles.cpp
  10. src/live_effects/lpe-simplify.cpp
  11. src/live_effects/lpe-sketch.cpp
  12. @@ -171,6 +172,7 @@
  13. src/live_effects/parameter/powerstrokepointarray.cpp
  14. src/live_effects/parameter/random.cpp
  15. src/live_effects/parameter/text.cpp
  16. +src/live_effects/parameter/fontbutton.cpp
  17. src/live_effects/parameter/togglebutton.cpp
  18. src/live_effects/parameter/transformedpoint.cpp
  19. src/live_effects/parameter/unit.cpp
  21. === modified file 'src/live_effects/CMakeLists.txt'
  22. --- src/live_effects/CMakeLists.txt 2015-07-24 19:53:33 +0000
  23. +++ src/live_effects/CMakeLists.txt 2016-07-29 21:22:57 +0000
  24. @@ -27,6 +27,7 @@
  25. lpe-lattice.cpp
  26. lpe-lattice2.cpp
  27. lpe-line_segment.cpp
  28. + lpe-measure-line.cpp
  29. lpe-mirror_symmetry.cpp
  30. lpe-offset.cpp
  31. lpe-parallel.cpp
  32. @@ -68,6 +69,7 @@
  33. parameter/powerstrokepointarray.cpp
  34. parameter/random.cpp
  35. parameter/text.cpp
  36. + parameter/fontbutton.cpp
  37. parameter/togglebutton.cpp
  38. parameter/transformedpoint.cpp
  39. parameter/unit.cpp
  40. @@ -105,6 +107,7 @@
  41. lpe-lattice.h
  42. lpe-lattice2.h
  43. lpe-line_segment.h
  44. + lpe-measure-line.h
  45. lpe-mirror_symmetry.h
  46. lpe-offset.h
  47. lpe-parallel.h
  48. @@ -148,6 +151,7 @@
  49. parameter/powerstrokepointarray.h
  50. parameter/random.h
  51. parameter/text.h
  52. + parameter/fontbutton.h
  53. parameter/togglebutton.h
  54. parameter/transformedpoint.h
  55. parameter/unit.h
  57. === modified file 'src/live_effects/Makefile_insert'
  58. --- src/live_effects/Makefile_insert 2015-07-24 19:53:33 +0000
  59. +++ src/live_effects/Makefile_insert 2016-07-21 18:04:54 +0000
  60. @@ -70,6 +70,8 @@
  61. live_effects/lpe-perspective_path.h \
  62. live_effects/lpe-perspective-envelope.cpp \
  63. live_effects/lpe-perspective-envelope.h \
  64. + live_effects/lpe-measure-line.cpp \
  65. + live_effects/lpe-measure-line.h \
  66. live_effects/lpe-mirror_symmetry.cpp \
  67. live_effects/lpe-mirror_symmetry.h \
  68. live_effects/lpe-circle_3pts.cpp \
  70. === modified file 'src/live_effects/effect-enum.h'
  71. --- src/live_effects/effect-enum.h 2015-01-27 22:09:47 +0000
  72. +++ src/live_effects/effect-enum.h 2016-07-21 18:55:39 +0000
  73. @@ -36,6 +36,7 @@
  74. CONSTRUCT_GRID,
  75. PERP_BISECTOR,
  76. TANGENT_TO_CURVE,
  77. + MEASURE_LINE,
  78. MIRROR_SYMMETRY,
  79. CIRCLE_3PTS,
  80. TRANSFORM_2PTS,
  82. === modified file 'src/live_effects/effect.cpp'
  83. --- src/live_effects/effect.cpp 2016-07-28 11:26:17 +0000
  84. +++ src/live_effects/effect.cpp 2016-07-30 16:41:13 +0000
  85. @@ -40,6 +40,7 @@
  86. #include "live_effects/lpe-lattice2.h"
  87. #include "live_effects/lpe-lattice.h"
  88. #include "live_effects/lpe-line_segment.h"
  89. +#include "live_effects/lpe-measure-line.h"
  90. #include "live_effects/lpe-mirror_symmetry.h"
  91. #include "live_effects/lpe-offset.h"
  92. #include "live_effects/lpe-parallel.h"
  93. @@ -151,6 +152,8 @@
  94. {FILL_BETWEEN_MANY, N_("Fill between many"), "fill_between_many"},
  95. {ELLIPSE_5PTS, N_("Ellipse by 5 points"), "ellipse_5pts"},
  96. {BOUNDING_BOX, N_("Bounding Box"), "bounding_box"},
  97. +/* 9.93 */
  98. + {MEASURE_LINE, N_("Measure Line"), "measure-line"},
  99. };
  100. const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData));
  102. @@ -319,6 +322,9 @@
  103. case TRANSFORM_2PTS:
  104. neweffect = static_cast<Effect*> ( new LPETransform2Pts(lpeobj) );
  105. break;
  106. + case MEASURE_LINE:
  107. + neweffect = static_cast<Effect*> ( new LPEMeasureLine(lpeobj) );
  108. + break;
  109. default:
  110. g_warning("LivePathEffect::Effect::New called with invalid patheffect type (%d)", lpenr);
  111. neweffect = NULL;
  112. @@ -364,6 +370,7 @@
  113. concatenate_before_pwd2(false),
  114. sp_lpe_item(NULL),
  115. current_zoom(1),
  116. + upd_params(true),
  117. sp_curve(NULL),
  118. provides_own_flash_paths(true), // is automatically set to false if providesOwnFlashPaths() is not overridden
  119. is_ready(false) // is automatically set to false if providesOwnFlashPaths() is not overridden
  120. @@ -447,7 +454,9 @@
  121. void Effect::doOnRemove (SPLPEItem const* /*lpeitem*/)
  122. {
  123. }
  124. -
  125. +void Effect::doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/)
  126. +{
  127. +}
  128. //secret impl methods (shhhh!)
  129. void Effect::doOnApply_impl(SPLPEItem const* lpeitem)
  130. {
  131. @@ -691,7 +700,7 @@
  133. ++it;
  134. }
  135. -
  136. + upd_params = false;
  137. return dynamic_cast<Gtk::Widget *>(vbox);
  138. }
  141. === modified file 'src/live_effects/effect.h'
  142. --- src/live_effects/effect.h 2016-03-14 16:47:47 +0000
  143. +++ src/live_effects/effect.h 2016-07-30 16:40:47 +0000
  144. @@ -66,7 +66,7 @@
  146. virtual void doAfterEffect (SPLPEItem const* lpeitem);
  147. virtual void doOnRemove (SPLPEItem const* lpeitem);
  148. -
  149. + virtual void doOnVisibilityToggled(SPLPEItem const* lpeitem);
  150. void writeParamsToSVG();
  152. virtual void acceptParamPath (SPPath const* param_path);
  153. @@ -122,6 +122,7 @@
  155. void editNextParamOncanvas(SPItem * item, SPDesktop * desktop);
  156. bool apply_to_clippath_and_mask;
  157. + bool upd_params;
  159. protected:
  160. Effect(LivePathEffectObject *lpeobject);
  162. === modified file 'src/live_effects/lpe-ellipse_5pts.cpp'
  163. --- src/live_effects/lpe-ellipse_5pts.cpp 2016-07-28 11:26:17 +0000
  164. +++ src/live_effects/lpe-ellipse_5pts.cpp 2016-07-29 09:29:42 +0000
  165. @@ -171,7 +171,7 @@
  167. // figure out if we have a slice, guarding against rounding errors
  169. - Path p(Geom::Point(cos(0), sin(0)));
  170. + Geom::Path p(Geom::Point(cos(0), sin(0)));
  172. double end = 2 * M_PI;
  173. for (s = 0; s < end; s += M_PI_2) {
  175. === modified file 'src/live_effects/lpe-extrude.cpp'
  176. --- src/live_effects/lpe-extrude.cpp 2016-07-28 11:26:17 +0000
  177. +++ src/live_effects/lpe-extrude.cpp 2016-07-29 09:50:56 +0000
  178. @@ -66,7 +66,7 @@
  179. using namespace Geom;
  181. // generate connecting lines (the 'sides' of the extrusion)
  182. - Path path(Point(0.,0.));
  183. + Geom::Path path(Point(0.,0.));
  184. path.appendNew<Geom::LineSegment>( extrude_vector.getVector() );
  185. Piecewise<D2<SBasis> > connector = path.toPwSb();
  188. === modified file 'src/live_effects/lpe-knot.cpp'
  189. --- src/live_effects/lpe-knot.cpp 2016-07-28 11:26:17 +0000
  190. +++ src/live_effects/lpe-knot.cpp 2016-07-29 09:52:43 +0000
  191. @@ -101,7 +101,7 @@
  193. Affine mat = from_basis( T, N, pt_and_dir[0] );
  194. mat = mat.inverse();
  195. - Path p = patha * mat;
  196. + Geom::Path p = patha * mat;
  198. std::vector<double> times;
  200. @@ -484,7 +484,7 @@
  201. // std::cout<<"fusing first and last component\n";
  202. ++beg_comp;
  203. --end_comp;
  204. - Path first = gpaths[i0].portion(dom.back());
  205. + Geom::Path first = gpaths[i0].portion(dom.back());
  206. //FIXME: stitching should not be necessary (?!?)
  207. first.setStitching(true);
  208. first.append(gpaths[i0].portion(dom.front()));
  210. === added file 'src/live_effects/lpe-measure-line.cpp'
  211. --- src/live_effects/lpe-measure-line.cpp 1970-01-01 00:00:00 +0000
  212. +++ src/live_effects/lpe-measure-line.cpp 2016-07-31 15:33:26 +0000
  213. @@ -0,0 +1,596 @@
  214. +/*
  215. + * Author(s):
  216. + * Jabiertxo Arraiza Cenoz <jabier.arraiza@marker.es>
  217. + * Some code and ideas migrated from dimensioning.py by
  218. + * Johannes B. Rutzmoser, johannes.rutzmoser (at) googlemail (dot) com
  219. + * Copyright (C) 2014 Author(s)
  220. +
  221. + * Released under GNU GPL, read the file 'COPYING' for more information
  222. + */
  223. +#include "live_effects/lpe-measure-line.h"
  224. +#include <pangomm/fontdescription.h>
  225. +#include <libnrtype/font-lister.h>
  226. +#include "inkscape.h"
  227. +#include "xml/node.h"
  228. +#include "uri.h"
  229. +#include "uri-references.h"
  230. +#include "preferences.h"
  231. +#include "util/units.h"
  232. +#include "svg/svg-length.h"
  233. +#include "svg/svg-color.h"
  234. +#include "svg/svg.h"
  235. +#include "display/curve.h"
  236. +#include <2geom/affine.h>
  237. +#include "style.h"
  238. +#include "sp-root.h"
  239. +#include "sp-defs.h"
  240. +#include "sp-item.h"
  241. +#include "sp-shape.h"
  242. +#include "sp-path.h"
  243. +#include "desktop.h"
  244. +#include "document.h"
  245. +#include <iomanip>
  246. +
  247. +// TODO due to internal breakage in glibmm headers, this must be last:
  248. +#include <glibmm/i18n.h>
  249. +
  250. +using namespace Geom;
  251. +namespace Inkscape {
  252. +namespace LivePathEffect {
  253. +
  254. +static const Util::EnumData<OrientationMethod> OrientationMethodData[] = {
  255. + { OM_HORIZONTAL, N_("Horizontal"), "horizontal" },
  256. + { OM_VERTICAL, N_("Vertical"), "vertical" },
  257. + { OM_PARALLEL, N_("Parallel"), "parallel" }
  258. +};
  259. +static const Util::EnumDataConverter<OrientationMethod> OMConverter(OrientationMethodData, OM_END);
  260. +
  261. +LPEMeasureLine::LPEMeasureLine(LivePathEffectObject *lpeobject) :
  262. + Effect(lpeobject),
  263. + fontbutton(_("Font*"), _("Font Selector"), "fontbutton", &wr, this),
  264. + orientation(_("Orientation"), _("Orientation method"), "orientation", OMConverter, &wr, this, OM_PARALLEL, false),
  265. + curve_linked(_("Curve on origin"), _("Curve on origin, set 0 to start/end"), "curve_linked", &wr, this, 1),
  266. + scale(_("Scale*"), _("Scaling factor"), "scale", &wr, this, 1.0),
  267. + precision(_("Precision*"), _("Precision"), "precision", &wr, this, 2),
  268. + position(_("Positon*"), _("Positon"), "position", &wr, this, 5),
  269. + text_distance(_("Text distance*"), _("Text distance"), "text_distance", &wr, this, 12),
  270. + helpline_distance(_("Helpline distance*"), _("Helpline distance"), "helpline_distance", &wr, this, 0.0),
  271. + helpline_overlap(_("Helpline overlap*"), _("Helpline overlap"), "helpline_overlap", &wr, this, 2.0),
  272. + unit(_("Unit*"), _("Unit"), "unit", &wr, this),
  273. + format(_("Format*"), _("Format the number ex:measure+ +unit"), "format", &wr, this, "measure+unit"),
  274. + arrows_outside(_("Arrows outside"), _("Arrows outside"), "arrows_outside", &wr, this, false),
  275. + flip_side(_("Flip side*"), _("Flip side"), "flip_side", &wr, this, false),
  276. + scale_insensitive(_("Scale insensitive*"), _("Scale insensitive to transforms in element, parents..."), "scale_insensitive", &wr, this, true),
  277. + local_locale(_("Local Number Format*"), _("Local number format"), "local_locale", &wr, this, true),
  278. + line_group_05(_("Line Group 0.5*"), _("Line Group 0.5, from 0.7"), "line_group_05", &wr, this, true),
  279. + rotate_anotation(_("Rotate Anotation*"), _("Rotate Anotation"), "rotate_anotation", &wr, this, true)
  280. +{
  281. + registerParameter(&fontbutton);
  282. + registerParameter(&orientation);
  283. + registerParameter(&curve_linked);
  284. + registerParameter(&scale);
  285. + registerParameter(&precision);
  286. + registerParameter(&position);
  287. + registerParameter(&text_distance);
  288. + registerParameter(&helpline_distance);
  289. + registerParameter(&helpline_overlap);
  290. + registerParameter(&unit);
  291. + registerParameter(&format);
  292. + registerParameter(&arrows_outside);
  293. + registerParameter(&flip_side);
  294. + registerParameter(&scale_insensitive);
  295. + registerParameter(&local_locale);
  296. + registerParameter(&line_group_05);
  297. + registerParameter(&rotate_anotation);
  298. + Inkscape::Preferences *prefs = Inkscape::Preferences::get();
  299. + fontbutton.param_update_default(prefs->getString("/live_effects/measure-line/fontbutton"));
  300. + scale.param_update_default(prefs->getDouble("/live_effects/measure-line/scale", 1.0));
  301. + precision.param_update_default(prefs->getInt("/live_effects/measure-line/precision", 2));
  302. + position.param_update_default(prefs->getDouble("/live_effects/measure-line/position", 10.0));
  303. + text_distance.param_update_default(prefs->getDouble("/live_effects/measure-line/text_distance", 5.0));
  304. + helpline_distance.param_update_default(prefs->getDouble("/live_effects/measure-line/helpline_distance", 0.0));
  305. + helpline_overlap.param_update_default(prefs->getDouble("/live_effects/measure-line/helpline_overlap", 0.0));
  306. + unit.param_update_default(prefs->getString("/live_effects/measure-line/unit"));
  307. + format.param_update_default(prefs->getString("/live_effects/measure-line/format"));
  308. + flip_side.param_update_default(prefs->getBool("/live_effects/measure-line/flip_side"));
  309. + scale_insensitive.param_update_default(prefs->getBool("/live_effects/measure-line/scale_insensitive"));
  310. + local_locale.param_update_default(prefs->getBool("/live_effects/measure-line/local_locale"));
  311. + line_group_05.param_update_default(prefs->getBool("/live_effects/measure-line/line_group_05"));
  312. + rotate_anotation.param_update_default(prefs->getBool("/live_effects/measure-line/rotate_anotation"));
  313. + format.param_hide_canvas_text();
  314. + precision.param_set_range(0, 100);
  315. + precision.param_set_increments(1, 1);
  316. + precision.param_set_digits(0);
  317. + precision.param_make_integer(true);
  318. + curve_linked.param_set_range(0, 999);
  319. + curve_linked.param_set_increments(1, 1);
  320. + curve_linked.param_set_digits(0);
  321. + curve_linked.param_make_integer(true);
  322. + precision.param_make_integer(true);
  323. + position.param_set_range(-999999.0, 999999.0);
  324. + position.param_set_increments(1, 1);
  325. + position.param_set_digits(2);
  326. + text_distance.param_set_range(-999999.0, 999999.0);
  327. + text_distance.param_set_increments(1, 1);
  328. + text_distance.param_set_digits(2);
  329. + helpline_distance.param_set_range(-999999.0, 999999.0);
  330. + helpline_distance.param_set_increments(1, 1);
  331. + helpline_distance.param_set_digits(2);
  332. + helpline_overlap.param_set_range(-999999.0, 999999.0);
  333. + helpline_overlap.param_set_increments(1, 1);
  334. + helpline_overlap.param_set_digits(2);
  335. +}
  336. +
  337. +LPEMeasureLine::~LPEMeasureLine() {}
  338. +
  339. +void
  340. +LPEMeasureLine::doOnApply(SPLPEItem const* lpeitem)
  341. +{
  342. + if (!SP_IS_SHAPE(lpeitem)) {
  343. + g_warning("LPE measure line can only be applied to shapes (not groups).");
  344. + SPLPEItem * item = const_cast<SPLPEItem*>(lpeitem);
  345. + item->removeCurrentPathEffect(false);
  346. + }
  347. +}
  348. +
  349. +void
  350. +LPEMeasureLine::doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/)
  351. +{
  352. + if (SPDesktop *desktop = SP_ACTIVE_DESKTOP) {
  353. + Inkscape::URI SVGElem_uri(((Glib::ustring)"#" + (Glib::ustring)"text-on-" + (Glib::ustring)this->getRepr()->attribute("id")).c_str());
  354. + Inkscape::URIReference* SVGElemRef = new Inkscape::URIReference(desktop->doc());
  355. + SVGElemRef->attach(SVGElem_uri);
  356. + SPObject *elemref = NULL;
  357. + Inkscape::XML::Node *rtext = NULL;
  358. + if (elemref = SVGElemRef->getObject()) {
  359. + rtext = elemref->getRepr();
  360. + if (!this->isVisible()) {
  361. + rtext->setAttribute("style", "display:none");
  362. + } else {
  363. + rtext->setAttribute("style", NULL);
  364. + }
  365. + }
  366. + }
  367. +}
  368. +
  369. +void
  370. +LPEMeasureLine::createArrowMarker(Glib::ustring mode)
  371. +{
  372. + if (SPDesktop *desktop = SP_ACTIVE_DESKTOP) {
  373. + Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
  374. + Inkscape::URI SVGElem_uri(((Glib::ustring)"#" + mode).c_str());
  375. + Inkscape::URIReference* SVGElemRef = new Inkscape::URIReference(desktop->doc());
  376. + SVGElemRef->attach(SVGElem_uri);
  377. + SPObject *elemref = NULL;
  378. + Inkscape::XML::Node *arrow = NULL;
  379. + if (!(elemref = SVGElemRef->getObject())) {
  380. + arrow = xml_doc->createElement("svg:marker");
  381. + arrow->setAttribute("id", mode.c_str());
  382. + arrow->setAttribute("inkscape:stockid", mode.c_str());
  383. + arrow->setAttribute("orient", "auto");
  384. + arrow->setAttribute("refX", "0.0");
  385. + arrow->setAttribute("refY", "0.0");
  386. + arrow->setAttribute("style", "overflow:visible");
  387. + /* Create <path> */
  388. + Inkscape::XML::Node *arrow_path = xml_doc->createElement("svg:path");
  389. + if (mode == (Glib::ustring)"ArrowDIN-start") {
  390. + arrow_path->setAttribute("d", "M -8,0 8,-2.11 8,2.11 z");
  391. + } else if (mode == (Glib::ustring)"ArrowDIN-end") {
  392. + arrow_path->setAttribute("d", "M 8,0 -8,2.11 -8,-2.11 z");
  393. + } else if (mode == (Glib::ustring)"ArrowDINout-start") {
  394. + arrow_path->setAttribute("d", "M 0,0 -16,2.11 -16,0.5 -26,0.5 -26,-0.5 -16,-0.5 -16,-2.11 z");
  395. + } else {
  396. + arrow_path->setAttribute("d", "M 0,0 16,2.11 16,0.5 26,0.5 26,-0.5 16,-0.5 16,-2.11 z");
  397. + }
  398. + arrow_path->setAttribute("id", (mode + (Glib::ustring)"_path").c_str());
  399. + arrow_path->setAttribute("style", "fill:#000000;stroke:none");
  400. + arrow->addChild(arrow_path, NULL);
  401. + Inkscape::GC::release(arrow_path);
  402. + SPObject * arrow_obj = SP_OBJECT(desktop->getDocument()->getDefs()->appendChildRepr(arrow));
  403. + Inkscape::GC::release(arrow);
  404. + }
  405. + }
  406. +}
  407. +
  408. +void
  409. +LPEMeasureLine::createTextLabel(Geom::Point pos, double length, Geom::Coord angle, double fontsize, bool remove)
  410. +{
  411. + if (SPDesktop *desktop = SP_ACTIVE_DESKTOP) {
  412. + Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
  413. + Inkscape::XML::Node *rtext = NULL;
  414. + double doc_w = desktop->getDocument()->getRoot()->width.value;
  415. +// Glib::ustring doc_unit = unit_table.getUnit(desktop->getDocument()->getRoot()->width.unit)->abbr;
  416. +// if (doc_unit == "") {
  417. +// doc_unit = "px";
  418. +// } else if (doc_unit == "%" && desktop->getDocument()->getRoot()->viewBox_set) {
  419. +// doc_w_unit = "px";
  420. +// doc_w = desktop->getDocument()->getRoot()->viewBox.width();
  421. +// }
  422. +// doc_unit = Inkscape::Util::unit_table.getUnit(desktop->doc()->getRoot()->height.unit)->abbr;
  423. +// if (doc_unit.empty()) {
  424. +// doc_unit = "px";
  425. +// }
  426. + Geom::Scale scale = desktop->getDocument()->getDocumentScale();
  427. + SPNamedView *nv = desktop->getNamedView();
  428. + Glib::ustring display_unit = nv->display_units->abbr;
  429. + if (display_unit.empty()) {
  430. + display_unit = "px";
  431. + }
  432. + //only check constrain viewbox on X
  433. + doc_scale = Inkscape::Util::Quantity::convert( scale[Geom::X], "px", nv->display_units );
  434. + if( doc_scale > 0 ) {
  435. + doc_scale= 1.0/doc_scale;
  436. + } else {
  437. + doc_scale = 1.0;
  438. + }
  439. + Inkscape::URI SVGElem_uri(((Glib::ustring)"#" + (Glib::ustring)"text-on-" + (Glib::ustring)this->getRepr()->attribute("id")).c_str());
  440. + Inkscape::URIReference* SVGElemRef = new Inkscape::URIReference(desktop->doc());
  441. + SVGElemRef->attach(SVGElem_uri);
  442. + SPObject *elemref = NULL;
  443. + Inkscape::XML::Node *rtspan = NULL;
  444. + if (elemref = SVGElemRef->getObject()) {
  445. + if (remove) {
  446. + elemref->deleteObject();
  447. + return;
  448. + }
  449. + rtext = elemref->getRepr();
  450. + sp_repr_set_svg_double(rtext, "x", pos[Geom::X]);
  451. + sp_repr_set_svg_double(rtext, "y", pos[Geom::Y]);
  452. + } else {
  453. + if (remove) {
  454. + return;
  455. + }
  456. + rtext = xml_doc->createElement("svg:text");
  457. + rtext->setAttribute("xml:space", "preserve");
  458. + rtext->setAttribute("id", ( (Glib::ustring)"text-on-" + (Glib::ustring)this->getRepr()->attribute("id")).c_str());
  459. + sp_repr_set_svg_double(rtext, "x", pos[Geom::X]);
  460. + sp_repr_set_svg_double(rtext, "y", pos[Geom::Y]);
  461. + rtspan = xml_doc->createElement("svg:tspan");
  462. + rtspan->setAttribute("sodipodi:role", "line");
  463. + }
  464. + gchar * transform;
  465. + if (rotate_anotation) {
  466. + Geom::Affine affine = Geom::Affine(Geom::Translate(pos).inverse());
  467. + affine *= Geom::Rotate(angle);
  468. + affine *= Geom::Translate(pos);
  469. + transform = sp_svg_transform_write(affine);
  470. + } else {
  471. + transform = NULL;
  472. + }
  473. + rtext->setAttribute("transform", transform);
  474. + SPCSSAttr *css = sp_repr_css_attr_new();
  475. + Inkscape::FontLister *fontlister = Inkscape::FontLister::get_instance();
  476. + fontlister->fill_css( css, (Glib::ustring)fontbutton.param_getSVGValue() );
  477. + std::stringstream font_size;
  478. + font_size.imbue(std::locale::classic());
  479. + font_size << fontsize << "pt";
  480. + sp_repr_css_set_property (css, "font-size", font_size.str().c_str());
  481. + sp_repr_css_set_property (css, "line-height", "125%");
  482. + sp_repr_css_set_property (css, "letter-spacing", "0");
  483. + sp_repr_css_set_property (css, "word-spacing", "0");
  484. + sp_repr_css_set_property (css, "text-align", "center");
  485. + sp_repr_css_set_property (css, "text-anchor", "middle");
  486. + sp_repr_css_set_property (css, "fill", "#000000");
  487. + sp_repr_css_set_property (css, "fill-opacity", "1");
  488. + sp_repr_css_set_property (css, "stroke", "none");
  489. + Glib::ustring css_str;
  490. + sp_repr_css_write_string(css,css_str);
  491. + if (!rtspan) {
  492. + rtspan = rtext->firstChild();
  493. + }
  494. + rtspan->setAttribute("style", css_str.c_str());
  495. + sp_repr_css_attr_unref (css);
  496. + if (!elemref) {
  497. + rtext->addChild(rtspan, NULL);
  498. + Inkscape::GC::release(rtspan);
  499. + }
  500. + length = Inkscape::Util::Quantity::convert(length / doc_scale, display_unit.c_str(), unit.get_abbreviation());
  501. + std::stringstream length_str;
  502. + length_str.precision(precision);
  503. + length_str.setf(std::ios::fixed, std::ios::floatfield);
  504. + if (local_locale) {
  505. + length_str.imbue(std::locale(""));
  506. + } else {
  507. + length_str.imbue(std::locale::classic());
  508. + }
  509. + length_str << std::fixed << length;
  510. + length_str << unit.get_abbreviation();
  511. + Inkscape::XML::Node *rstring = NULL;
  512. + if (!elemref) {
  513. + rstring = xml_doc->createTextNode(length_str.str().c_str());
  514. + rtspan->addChild(rstring, NULL);
  515. + Inkscape::GC::release(rstring);
  516. + } else {
  517. + rstring = rtspan->firstChild();
  518. + rstring->setContent(length_str.str().c_str());
  519. + }
  520. + SPObject * text_obj = NULL;
  521. + if (!elemref) {
  522. + text_obj = SP_OBJECT(desktop->currentLayer()->appendChildRepr(rtext));
  523. + Inkscape::GC::release(rtext);
  524. + }
  525. + }
  526. +}
  527. +
  528. +void
  529. +LPEMeasureLine::createLine(Geom::Point start,Geom::Point end, Glib::ustring id, bool main, bool remove)
  530. +{
  531. + if (SPDesktop *desktop = SP_ACTIVE_DESKTOP) {
  532. + Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
  533. + Inkscape::URI SVGElem_uri(((Glib::ustring)"#" + id).c_str());
  534. + Inkscape::URIReference* SVGElemRef = new Inkscape::URIReference(desktop->doc());
  535. + SVGElemRef->attach(SVGElem_uri);
  536. + SPObject *elemref = NULL;
  537. + Inkscape::XML::Node *line = NULL;
  538. + if (!main) {
  539. + Geom::Ray ray(start, end);
  540. + Geom::Coord angle = ray.angle();
  541. + start = start + Point::polar(angle, helpline_distance );
  542. + end = end + Point::polar(angle, helpline_overlap );
  543. + }
  544. + Geom::Path line_path;
  545. + line_path.start(start);
  546. + line_path.appendNew<Geom::LineSegment>(end);
  547. + Geom::PathVector line_pathv;
  548. + line_pathv.push_back(line_path);
  549. + gchar * line_str = sp_svg_write_path( line_pathv );
  550. + line_pathv.clear();
  551. + if (elemref = SVGElemRef->getObject()) {
  552. + if (remove) {
  553. + elemref->deleteObject();
  554. + return;
  555. + }
  556. + line = elemref->getRepr();
  557. + line->setAttribute("d" , line_str);
  558. + } else {
  559. + if (remove) {
  560. + return;
  561. + }
  562. + line = xml_doc->createElement("svg:path");
  563. + line->setAttribute("id", id.c_str());
  564. + line->setAttribute("d" , line_str);
  565. + }
  566. + Glib::ustring style = (Glib::ustring)"stroke:#000000;fill:none;";
  567. + if (main) {
  568. + line->setAttribute("inkscape:label", "dinline");
  569. + if (arrows_outside) {
  570. + style = style + (Glib::ustring)"marker-start:url(#ArrowDINout-start);marker-end:url(#ArrowDINout-end);";
  571. + } else {
  572. + style = style + (Glib::ustring)"marker-start:url(#ArrowDIN-start);marker-end:url(#ArrowDIN-end);";
  573. + }
  574. + } else {
  575. + line->setAttribute("inkscape:label", "dinhelpline");
  576. + }
  577. + std::stringstream stroke_w;
  578. + stroke_w.imbue(std::locale::classic());
  579. + if (line_group_05) {
  580. + double stroke_width = Inkscape::Util::Quantity::convert(0.25 / doc_scale, "mm", display_unit.c_str());
  581. + stroke_w << stroke_width;
  582. + style = style + (Glib::ustring)"stroke-width:" + (Glib::ustring)stroke_w.str();
  583. + } else {
  584. + double stroke_width = Inkscape::Util::Quantity::convert(0.35 / doc_scale, "mm", display_unit.c_str());
  585. + stroke_w << stroke_width;
  586. + style = style + (Glib::ustring)"stroke-width:" + (Glib::ustring)stroke_w.str();
  587. + }
  588. + line->setAttribute("style", style.c_str());
  589. + SPObject * line_obj = NULL;
  590. + if (!elemref) {
  591. + line_obj = SP_OBJECT(desktop->currentLayer()->appendChildRepr(line));
  592. + Inkscape::GC::release(line);
  593. + }
  594. + }
  595. +}
  596. +
  597. +void
  598. +LPEMeasureLine::doBeforeEffect (SPLPEItem const* lpeitem)
  599. +{
  600. + SPLPEItem * splpeitem = const_cast<SPLPEItem *>(lpeitem);
  601. + SPPath *sp_path = dynamic_cast<SPPath *>(splpeitem);
  602. + if (sp_path) {
  603. + Geom::PathVector pathvector = sp_path->get_original_curve()->get_pathvector();
  604. + if (arrows_outside) {
  605. + createArrowMarker((Glib::ustring)"ArrowDINout-start");
  606. + createArrowMarker((Glib::ustring)"ArrowDINout-end");
  607. + } else {
  608. + createArrowMarker((Glib::ustring)"ArrowDIN-start");
  609. + createArrowMarker((Glib::ustring)"ArrowDIN-end");
  610. + }
  611. + if (SPDesktop *desktop = SP_ACTIVE_DESKTOP) {
  612. + size_t ncurves = pathvector.curveCount();
  613. + curve_linked.param_set_range(0, ncurves);
  614. + Geom::Point start = pathvector.initialPoint();
  615. + Geom::Point end = pathvector.finalPoint();
  616. + if (curve_linked) { //!0
  617. + start = pathvector.pointAt(curve_linked -1);
  618. + end = pathvector.pointAt(curve_linked);
  619. + }
  620. + Geom::Point hstart = start;
  621. + Geom::Point hend = end;
  622. + bool remove = false;
  623. + if (Geom::are_near(hstart, hend)) {
  624. + remove = true;
  625. + }
  626. + if (orientation == OM_VERTICAL) {
  627. + Coord xpos = std::max(hstart[Geom::X],hend[Geom::X]);
  628. + if (flip_side) {
  629. + xpos = std::min(hstart[Geom::X],hend[Geom::X]);
  630. + }
  631. + hstart[Geom::X] = xpos;
  632. + hend[Geom::X] = xpos;
  633. + if (hstart[Geom::Y] > hend[Geom::Y]) {
  634. + swap(hstart,hend);
  635. + swap(start,end);
  636. + }
  637. + if (Geom::are_near(hstart[Geom::Y], hend[Geom::Y])) {
  638. + remove = true;
  639. + }
  640. + }
  641. + if (orientation == OM_HORIZONTAL) {
  642. + Coord ypos = std::max(hstart[Geom::Y],hend[Geom::Y]);
  643. + if (flip_side) {
  644. + ypos = std::min(hstart[Geom::Y],hend[Geom::Y]);
  645. + }
  646. + hstart[Geom::Y] = ypos;
  647. + hend[Geom::Y] = ypos;
  648. + if (hstart[Geom::X] < hend[Geom::X]) {
  649. + swap(hstart,hend);
  650. + swap(start,end);
  651. + }
  652. + if (Geom::are_near(hstart[Geom::X], hend[Geom::X])) {
  653. + remove = true;
  654. + }
  655. + }
  656. + double length = Geom::distance(hstart,hend) * scale;
  657. + Geom::Point pos = Geom::middle_point(hstart,hend);
  658. + Geom::Ray ray(hstart,hend);
  659. + Geom::Coord angle = ray.angle();
  660. + if (flip_side) {
  661. + angle = std::fmod(angle + rad_from_deg(180), 2*M_PI);
  662. + if (angle < 0) angle += 2*M_PI;
  663. + }
  664. + Geom::Coord angle_cross = std::fmod(angle + rad_from_deg(90), 2*M_PI);
  665. + if (angle_cross < 0) angle_cross += 2*M_PI;
  666. + //We get the font size to offset the text to the middle
  667. + Pango::FontDescription fontdesc((Glib::ustring)fontbutton.param_getSVGValue());
  668. + double fontsize = fontdesc.get_size()/Pango::SCALE;
  669. + fontsize *= desktop->doc()->getRoot()->c2p.inverse().expansionX();
  670. + pos = pos - Point::polar(angle_cross, (position + text_distance) - fontsize/2.0);
  671. + if (!scale_insensitive) {
  672. + Geom::Affine affinetransform = i2anc_affine(SP_OBJECT(lpeitem), SP_OBJECT(desktop->doc()->getRoot()));
  673. + length *= (affinetransform.expansionX() + affinetransform.expansionY()) / 2.0;
  674. + }
  675. + createTextLabel(pos, length, angle, fontsize, remove);
  676. + //LINE
  677. + double arrow_gap = 8 * Inkscape::Util::Quantity::convert(0.35 / doc_scale, "mm", display_unit.c_str());
  678. + if (line_group_05) {
  679. + arrow_gap = 8 * Inkscape::Util::Quantity::convert(0.25 / doc_scale, "mm", display_unit.c_str());
  680. + }
  681. + if (flip_side) {
  682. + arrow_gap *= -1;
  683. + }
  684. + angle_cross = std::fmod(angle + rad_from_deg(90), 2*M_PI);
  685. + if (angle_cross < 0) angle_cross += 2*M_PI;
  686. + hstart = hstart - Point::polar(angle_cross, position);
  687. + Glib::ustring id = (Glib::ustring)"infoline-on-start-" + (Glib::ustring)this->getRepr()->attribute("id");
  688. + createLine(start, hstart, id, false, remove);
  689. + hend = hend - Point::polar(angle_cross, position);
  690. + id = (Glib::ustring)"infoline-on-end-" + (Glib::ustring)this->getRepr()->attribute("id");
  691. + createLine(end, hend, id, false, remove);
  692. + if (!arrows_outside) {
  693. + hstart = hstart + Point::polar(angle, arrow_gap);
  694. + hend = hend - Point::polar(angle, arrow_gap );
  695. + }
  696. + id = (Glib::ustring)"infoline-" + (Glib::ustring)this->getRepr()->attribute("id");
  697. + createLine(hstart, hend, id, true, remove);
  698. + }
  699. + }
  700. +}
  701. +
  702. +void LPEMeasureLine::doOnRemove (SPLPEItem const* lpeitem)
  703. +{
  704. + if (SPDesktop *desktop = SP_ACTIVE_DESKTOP) {
  705. + SPLPEItem * splpeitem = const_cast<SPLPEItem *>(lpeitem);
  706. + Inkscape::URI SVGElem_uri(( (Glib::ustring)"text-on-" + (Glib::ustring)this->getRepr()->attribute("id")).c_str());
  707. + Inkscape::URIReference* SVGElemRef = new Inkscape::URIReference(desktop->doc());
  708. + SVGElemRef->attach(SVGElem_uri);
  709. + SPObject *elemref = NULL;
  710. + if (elemref = SVGElemRef->getObject()) {
  711. + elemref->deleteObject();
  712. + }
  713. + Inkscape::URI SVGElem_uri2(( (Glib::ustring)"infoline-on-end-" + (Glib::ustring)this->getRepr()->attribute("id")).c_str());
  714. + SVGElemRef->attach(SVGElem_uri2);
  715. + elemref = NULL;
  716. + if (elemref = SVGElemRef->getObject()) {
  717. + elemref->deleteObject();
  718. + }
  719. + Inkscape::URI SVGElem_uri3(( (Glib::ustring)"infoline-on-start-" + (Glib::ustring)this->getRepr()->attribute("id")).c_str());
  720. + SVGElemRef->attach(SVGElem_uri3);
  721. + elemref = NULL;
  722. + if (elemref = SVGElemRef->getObject()) {
  723. + elemref->deleteObject();
  724. + }
  725. + Inkscape::URI SVGElem_uri4(( (Glib::ustring)"infoline-" + (Glib::ustring)this->getRepr()->attribute("id")).c_str());
  726. + SVGElemRef->attach(SVGElem_uri4);
  727. + elemref = NULL;
  728. + if (elemref = SVGElemRef->getObject()) {
  729. + elemref->deleteObject();
  730. + }
  731. + }
  732. +}
  733. +
  734. +Gtk::Widget *LPEMeasureLine::newWidget()
  735. +{
  736. + // use manage here, because after deletion of Effect object, others might
  737. + // still be pointing to this widget.
  738. + Gtk::VBox *vbox = Gtk::manage(new Gtk::VBox(Effect::newWidget()));
  739. +
  740. + vbox->set_border_width(5);
  741. + vbox->set_homogeneous(false);
  742. + vbox->set_spacing(2);
  743. +
  744. + std::vector<Parameter *>::iterator it = param_vector.begin();
  745. + Gtk::HBox * button1 = Gtk::manage(new Gtk::HBox(true,0));
  746. + while (it != param_vector.end()) {
  747. + if ((*it)->widget_is_visible) {
  748. + Parameter *param = *it;
  749. + Gtk::Widget *widg = dynamic_cast<Gtk::Widget *>(param->param_newWidget());
  750. + Glib::ustring *tip = param->param_getTooltip();
  751. + if (widg) {
  752. + vbox->pack_start(*widg, true, true, 2);
  753. + if (tip) {
  754. + widg->set_tooltip_text(*tip);
  755. + } else {
  756. + widg->set_tooltip_text("");
  757. + widg->set_has_tooltip(false);
  758. + }
  759. + }
  760. + }
  761. +
  762. + ++it;
  763. + }
  764. + Gtk::Button *save_default = Gtk::manage(new Gtk::Button(Glib::ustring(_("Save '*' as default"))));
  765. + save_default->signal_clicked().connect(sigc::mem_fun(*this, &LPEMeasureLine::saveDefault));
  766. + button1->pack_start(*save_default, true, true, 2);
  767. + vbox->pack_start(*button1, true, true, 2);
  768. + return dynamic_cast<Gtk::Widget *>(vbox);
  769. +}
  770. +
  771. +Geom::PathVector
  772. +LPEMeasureLine::doEffect_path(Geom::PathVector const &path_in)
  773. +{
  774. + return path_in;
  775. +}
  776. +
  777. +void
  778. +LPEMeasureLine::saveDefault()
  779. +{
  780. + Inkscape::Preferences *prefs = Inkscape::Preferences::get();
  781. + prefs->setString("/live_effects/measure-line/fontbutton", (Glib::ustring)fontbutton.param_getSVGValue());
  782. + prefs->setDouble("/live_effects/measure-line/scale", scale);
  783. + prefs->setInt("/live_effects/measure-line/precision", precision);
  784. + prefs->setDouble("/live_effects/measure-line/position", position);
  785. + prefs->setDouble("/live_effects/measure-line/text_distance", text_distance);
  786. + prefs->setDouble("/live_effects/measure-line/helpline_distance", helpline_distance);
  787. + prefs->setDouble("/live_effects/measure-line/helpline_overlap", helpline_overlap);
  788. + prefs->setString("/live_effects/measure-line/unit", (Glib::ustring)unit.get_abbreviation());
  789. + prefs->setString("/live_effects/measure-line/format", (Glib::ustring)format.param_getSVGValue());
  790. + prefs->setBool("/live_effects/measure-line/flip_side", flip_side);
  791. + prefs->setBool("/live_effects/measure-line/scale_insensitive", scale_insensitive);
  792. + prefs->setBool("/live_effects/measure-line/local_locale", local_locale);
  793. + prefs->setBool("/live_effects/measure-line/line_group_05", line_group_05);
  794. + prefs->setBool("/live_effects/measure-line/rotate_anotation", rotate_anotation);
  795. +}
  796. +
  797. +}; //namespace LivePathEffect
  798. +}; /* namespace Inkscape */
  799. +
  800. +/*
  801. + Local Variables:
  802. + mode:c++
  803. + c-file-style:"stroustrup"
  804. + c-file-offset:((innamespace . 0)(inline-open . 0)(case-label . +))
  805. + indent-tabs-mode:nil
  806. + fill-column:99
  807. + End:
  808. +*/
  809. +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
  811. === added file 'src/live_effects/lpe-measure-line.h'
  812. --- src/live_effects/lpe-measure-line.h 1970-01-01 00:00:00 +0000
  813. +++ src/live_effects/lpe-measure-line.h 2016-07-31 14:37:23 +0000
  814. @@ -0,0 +1,89 @@
  815. +#ifndef INKSCAPE_LPE_MEASURE_LINE_H
  816. +#define INKSCAPE_LPE_MEASURE_LINE_H
  817. +
  818. +/*
  819. + * Author(s):
  820. + * Jabiertxo Arraiza Cenoz <jabier.arraiza@marker.es>
  821. + *
  822. + * Copyright (C) 2014 Author(s)
  823. + *
  824. + * Released under GNU GPL, read the file 'COPYING' for more information
  825. + */
  826. +
  827. +#include "live_effects/effect.h"
  828. +#include "live_effects/parameter/enum.h"
  829. +#include "live_effects/parameter/fontbutton.h"
  830. +#include "live_effects/parameter/text.h"
  831. +#include "live_effects/parameter/unit.h"
  832. +#include "live_effects/parameter/bool.h"
  833. +#include "live_effects/parameter/originalpath.h"
  834. +#include <libnrtype/font-lister.h>
  835. +#include <2geom/angle.h>
  836. +#include <2geom/ray.h>
  837. +#include <2geom/point.h>
  838. +
  839. +namespace Inkscape {
  840. +namespace LivePathEffect {
  841. +
  842. +enum OrientationMethod {
  843. + OM_HORIZONTAL,
  844. + OM_VERTICAL,
  845. + OM_PARALLEL,
  846. + OM_END
  847. +};
  848. +
  849. +class LPEMeasureLine : public Effect {
  850. +public:
  851. + LPEMeasureLine(LivePathEffectObject *lpeobject);
  852. + virtual ~LPEMeasureLine();
  853. + virtual void doBeforeEffect (SPLPEItem const* lpeitem);
  854. + virtual void doOnApply(SPLPEItem const* lpeitem);
  855. + virtual void doOnRemove (SPLPEItem const* lpeitem);
  856. + virtual void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/);
  857. + virtual Geom::PathVector doEffect_path(Geom::PathVector const &path_in);
  858. + void createLine(Geom::Point start,Geom::Point end,Glib::ustring id, bool main, bool remove);
  859. + void createTextLabel(Geom::Point pos, double length, Geom::Coord angle, double fontsize, bool remove);
  860. + void createArrowMarker(Glib::ustring mode);
  861. + void saveDefault();
  862. + virtual Gtk::Widget *newWidget();
  863. +private:
  864. + FontButtonParam fontbutton;
  865. + EnumParam<OrientationMethod> orientation;
  866. + ScalarParam curve_linked;
  867. + ScalarParam scale;
  868. + ScalarParam precision;
  869. + ScalarParam position;
  870. + ScalarParam text_distance;
  871. + ScalarParam helpline_distance;
  872. + ScalarParam helpline_overlap;
  873. + UnitParam unit;
  874. + TextParam format;
  875. + BoolParam arrows_outside;
  876. + BoolParam flip_side;
  877. + BoolParam scale_insensitive;
  878. + BoolParam local_locale;
  879. + BoolParam line_group_05;
  880. + BoolParam rotate_anotation;
  881. + Glib::ustring display_unit;
  882. + double doc_scale;
  883. +/* Geom::Affine affine_over;*/
  884. + LPEMeasureLine(const LPEMeasureLine &);
  885. + LPEMeasureLine &operator=(const LPEMeasureLine &);
  886. +
  887. +};
  888. +
  889. +} //namespace LivePathEffect
  890. +} //namespace Inkscape
  891. +
  892. +#endif
  893. +
  894. +/*
  895. + Local Variables:
  896. + mode:c++
  897. + c-file-style:"stroustrup"
  898. + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
  899. + indent-tabs-mode:nil
  900. + fill-column:99
  901. + End:
  902. +*/
  903. +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
  905. === modified file 'src/live_effects/lpe-transform_2pts.cpp'
  906. --- src/live_effects/lpe-transform_2pts.cpp 2016-07-28 11:26:17 +0000
  907. +++ src/live_effects/lpe-transform_2pts.cpp 2016-07-24 16:00:12 +0000
  908. @@ -90,7 +90,6 @@
  909. {
  910. using namespace Geom;
  911. original_bbox(lpeitem);
  912. -
  913. point_a = Point(boundingbox_X.min(), boundingbox_Y.middle());
  914. point_b = Point(boundingbox_X.max(), boundingbox_Y.middle());
  915. SPLPEItem * splpeitem = const_cast<SPLPEItem *>(lpeitem);
  917. === modified file 'src/live_effects/parameter/Makefile_insert'
  918. --- src/live_effects/parameter/Makefile_insert 2015-03-02 01:29:50 +0000
  919. +++ src/live_effects/parameter/Makefile_insert 2016-07-29 21:24:09 +0000
  920. @@ -11,6 +11,8 @@
  921. live_effects/parameter/random.h \
  922. live_effects/parameter/point.cpp \
  923. live_effects/parameter/point.h \
  924. + live_effects/parameter/fontbutton.cpp \
  925. + live_effects/parameter/fontbutton.h \
  926. live_effects/parameter/enum.h \
  927. live_effects/parameter/path-reference.cpp \
  928. live_effects/parameter/path-reference.h \
  930. === modified file 'src/live_effects/parameter/bool.cpp'
  931. --- src/live_effects/parameter/bool.cpp 2015-10-18 19:13:13 +0000
  932. +++ src/live_effects/parameter/bool.cpp 2016-07-24 23:27:14 +0000
  933. @@ -36,6 +36,12 @@
  934. param_setValue(defvalue);
  935. }
  937. +void
  938. +BoolParam::param_update_default(bool const default_value)
  939. +{
  940. + defvalue = default_value;
  941. +}
  942. +
  943. bool
  944. BoolParam::param_readSVGValue(const gchar * strvalue)
  945. {
  947. === modified file 'src/live_effects/parameter/bool.h'
  948. --- src/live_effects/parameter/bool.h 2015-10-18 19:13:13 +0000
  949. +++ src/live_effects/parameter/bool.h 2016-07-24 23:26:29 +0000
  950. @@ -36,7 +36,7 @@
  952. void param_setValue(bool newvalue);
  953. virtual void param_set_default();
  954. -
  955. + void param_update_default(bool const default_value);
  956. bool get_value() const { return value; };
  958. inline operator bool() const { return value; };
  960. === modified file 'src/live_effects/parameter/enum.h'
  961. --- src/live_effects/parameter/enum.h 2014-03-27 01:33:44 +0000
  962. +++ src/live_effects/parameter/enum.h 2016-07-29 18:13:50 +0000
  963. @@ -27,12 +27,14 @@
  964. const Util::EnumDataConverter<E>& c,
  965. Inkscape::UI::Widget::Registry* wr,
  966. Effect* effect,
  967. - E default_value)
  968. + E default_value,
  969. + bool sort = true)
  970. : Parameter(label, tip, key, wr, effect)
  971. {
  972. enumdataconv = &c;
  973. defvalue = default_value;
  974. value = defvalue;
  975. + sorted = sort;
  976. };
  978. virtual ~EnumParam() { };
  979. @@ -40,12 +42,11 @@
  980. virtual Gtk::Widget * param_newWidget() {
  981. Inkscape::UI::Widget::RegisteredEnum<E> *regenum = Gtk::manage (
  982. new Inkscape::UI::Widget::RegisteredEnum<E>( param_label, param_tooltip,
  983. - param_key, *enumdataconv, *param_wr, param_effect->getRepr(), param_effect->getSPDoc() ) );
  984. + param_key, *enumdataconv, *param_wr, param_effect->getRepr(), param_effect->getSPDoc(), sorted ) );
  986. regenum->set_active_by_id(value);
  987. regenum->combobox()->setProgrammatically = false;
  988. regenum->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change enumeration parameter"));
  989. -
  990. return dynamic_cast<Gtk::Widget *> (regenum);
  991. };
  993. @@ -86,6 +87,7 @@
  995. E value;
  996. E defvalue;
  997. + bool sorted;
  999. const Util::EnumDataConverter<E> * enumdataconv;
  1000. };
  1002. === added file 'src/live_effects/parameter/fontbutton.cpp'
  1003. --- src/live_effects/parameter/fontbutton.cpp 1970-01-01 00:00:00 +0000
  1004. +++ src/live_effects/parameter/fontbutton.cpp 2016-07-29 21:26:48 +0000
  1005. @@ -0,0 +1,92 @@
  1006. +/*
  1007. + * Authors:
  1008. + *
  1009. + * Released under GNU GPL, read the file 'COPYING' for more information
  1010. + */
  1011. +
  1012. +
  1013. +#include "ui/widget/registered-widget.h"
  1014. +#include "live_effects/parameter/fontbutton.h"
  1015. +#include "live_effects/effect.h"
  1016. +#include "ui/widget/font-button.h"
  1017. +#include "svg/svg.h"
  1018. +#include "svg/stringstream.h"
  1019. +#include "verbs.h"
  1020. +
  1021. +#include <glibmm/i18n.h>
  1022. +
  1023. +namespace Inkscape {
  1024. +
  1025. +namespace LivePathEffect {
  1026. +
  1027. +FontButtonParam::FontButtonParam( const Glib::ustring& label, const Glib::ustring& tip,
  1028. + const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
  1029. + Effect* effect, const Glib::ustring default_value )
  1030. + : Parameter(label, tip, key, wr, effect),
  1031. + value(default_value),
  1032. + defvalue(default_value)
  1033. +{
  1034. +}
  1035. +
  1036. +void
  1037. +FontButtonParam::param_set_default()
  1038. +{
  1039. + param_setValue(defvalue);
  1040. +}
  1041. +void
  1042. +FontButtonParam::param_update_default(const Glib::ustring default_value){
  1043. + defvalue = default_value;
  1044. +}
  1045. +
  1046. +bool
  1047. +FontButtonParam::param_readSVGValue(const gchar * strvalue)
  1048. +{
  1049. + Inkscape::SVGOStringStream os;
  1050. + os << strvalue;
  1051. + param_setValue((Glib::ustring)os.str());
  1052. + return true;
  1053. +}
  1054. +
  1055. +gchar *
  1056. +FontButtonParam::param_getSVGValue() const
  1057. +{
  1058. + return g_strdup(value.c_str());
  1059. +}
  1060. +
  1061. +Gtk::Widget *
  1062. +FontButtonParam::param_newWidget()
  1063. +{
  1064. + Inkscape::UI::Widget::RegisteredFontButton * fontbuttonwdg = Gtk::manage(
  1065. + new Inkscape::UI::Widget::RegisteredFontButton( param_label,
  1066. + param_tooltip,
  1067. + param_key,
  1068. + *param_wr,
  1069. + param_effect->getRepr(),
  1070. + param_effect->getSPDoc() ) );
  1071. + Glib::ustring fontspec = param_getSVGValue();
  1072. + fontbuttonwdg->setValue( fontspec);
  1073. + fontbuttonwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change font button parameter"));
  1074. + param_effect->upd_params = false;
  1075. + return dynamic_cast<Gtk::Widget *> (fontbuttonwdg);
  1076. +}
  1077. +
  1078. +void
  1079. +FontButtonParam::param_setValue(const Glib::ustring newvalue)
  1080. +{
  1081. + value = newvalue;
  1082. +}
  1083. +
  1084. +} /* namespace LivePathEffect */
  1085. +
  1086. +} /* namespace Inkscape */
  1087. +
  1088. +/*
  1089. + Local Variables:
  1090. + mode:c++
  1091. + c-file-style:"stroustrup"
  1092. + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
  1093. + indent-tabs-mode:nil
  1094. + fill-column:99
  1095. + End:
  1096. +*/
  1097. +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
  1099. === added file 'src/live_effects/parameter/fontbutton.h'
  1100. --- src/live_effects/parameter/fontbutton.h 1970-01-01 00:00:00 +0000
  1101. +++ src/live_effects/parameter/fontbutton.h 2016-07-29 20:44:37 +0000
  1102. @@ -0,0 +1,62 @@
  1103. +#ifndef INKSCAPE_LIVEPATHEFFECT_PARAMETER_FONT_H
  1104. +#define INKSCAPE_LIVEPATHEFFECT_PARAMETER_FONT_H
  1105. +
  1106. +/*
  1107. + * Inkscape::LivePathEffectParameters
  1108. + *
  1109. + * Authors:
  1110. + * Released under GNU GPL, read the file 'COPYING' for more information
  1111. + */
  1112. +#include <glib.h>
  1113. +#include <gtkmm.h>
  1114. +#include "live_effects/parameter/parameter.h"
  1115. +
  1116. +namespace Inkscape {
  1117. +
  1118. +namespace LivePathEffect {
  1119. +
  1120. +class FontButtonParam : public Parameter {
  1121. +public:
  1122. + FontButtonParam( const Glib::ustring& label,
  1123. + const Glib::ustring& tip,
  1124. + const Glib::ustring& key,
  1125. + Inkscape::UI::Widget::Registry* wr,
  1126. + Effect* effect,
  1127. + const Glib::ustring default_value = "");
  1128. + virtual ~FontButtonParam() {}
  1129. +
  1130. + virtual Gtk::Widget * param_newWidget();
  1131. + virtual bool param_readSVGValue(const gchar * strvalue);
  1132. + void param_update_default(const Glib::ustring defvalue);
  1133. + virtual gchar * param_getSVGValue() const;
  1134. +
  1135. + void param_setValue(const Glib::ustring newvalue);
  1136. +
  1137. + virtual void param_set_default();
  1138. +
  1139. + const Glib::ustring get_value() const { return defvalue; };
  1140. +
  1141. +private:
  1142. + FontButtonParam(const FontButtonParam&);
  1143. + FontButtonParam& operator=(const FontButtonParam&);
  1144. + Glib::ustring value;
  1145. + Glib::ustring defvalue;
  1146. +
  1147. +};
  1148. +
  1149. +} //namespace LivePathEffect
  1150. +
  1151. +} //namespace Inkscape
  1152. +
  1153. +#endif
  1154. +
  1155. +/*
  1156. + Local Variables:
  1157. + mode:c++
  1158. + c-file-style:"stroustrup"
  1159. + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
  1160. + indent-tabs-mode:nil
  1161. + fill-column:99
  1162. + End:
  1163. +*/
  1164. +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
  1166. === modified file 'src/live_effects/parameter/parameter.cpp'
  1167. --- src/live_effects/parameter/parameter.cpp 2015-10-18 19:13:13 +0000
  1168. +++ src/live_effects/parameter/parameter.cpp 2016-07-30 16:08:21 +0000
  1169. @@ -4,11 +4,9 @@
  1170. * Released under GNU GPL, read the file 'COPYING' for more information
  1171. */
  1173. -#include "ui/widget/registered-widget.h"
  1174. -#include <glibmm/i18n.h>
  1176. +#include "live_effects/effect.h"
  1177. #include "live_effects/parameter/parameter.h"
  1178. -#include "live_effects/effect.h"
  1179. #include "svg/svg.h"
  1180. #include "xml/repr.h"
  1182. @@ -16,6 +14,8 @@
  1184. #include "verbs.h"
  1186. +#include <glibmm/i18n.h>
  1187. +
  1188. #define noLPEREALPARAM_DEBUG
  1190. namespace Inkscape {
  1191. @@ -101,9 +101,16 @@
  1192. param_set_value(defvalue);
  1193. }
  1195. +void
  1196. +ScalarParam::param_update_default(gdouble default_value)
  1197. +{
  1198. + defvalue = default_value;
  1199. +}
  1200. +
  1201. void
  1202. ScalarParam::param_set_value(gdouble val)
  1203. {
  1204. + param_effect->upd_params = true;
  1205. value = val;
  1206. if (integer)
  1207. value = round(value);
  1208. @@ -121,7 +128,7 @@
  1209. // Once again, in gtk2, this is not a problem. But in gtk3,
  1210. // widgets get allocated the amount of size they ask for,
  1211. // leading to excessively long widgets.
  1212. -
  1213. + param_effect->upd_params = true;
  1214. if (min >= -SCALARPARAM_G_MAXDOUBLE) {
  1215. this->min = min;
  1216. } else {
  1217. @@ -130,15 +137,15 @@
  1218. if (max <= SCALARPARAM_G_MAXDOUBLE) {
  1219. this->max = max;
  1220. } else {
  1221. - this->max = SCALARPARAM_G_MAXDOUBLE;
  1222. + this->max = SCALARPARAM_G_MAXDOUBLE;
  1223. }
  1224. -
  1225. param_set_value(value); // reset value to see whether it is in ranges
  1226. }
  1228. void
  1229. ScalarParam::param_make_integer(bool yes)
  1230. {
  1231. + param_effect->upd_params = true;
  1232. integer = yes;
  1233. digits = 0;
  1234. inc_step = 1;
  1235. @@ -169,6 +176,7 @@
  1236. if(!overwrite_widget){
  1237. rsu->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change scalar parameter"));
  1238. }
  1239. + param_effect->upd_params = false;
  1240. return dynamic_cast<Gtk::Widget *> (rsu);
  1241. } else {
  1242. return NULL;
  1243. @@ -178,12 +186,14 @@
  1244. void
  1245. ScalarParam::param_set_digits(unsigned digits)
  1246. {
  1247. + param_effect->upd_params = true;
  1248. this->digits = digits;
  1249. }
  1251. void
  1252. ScalarParam::param_set_increments(double step, double page)
  1253. {
  1254. + param_effect->upd_params = true;
  1255. inc_step = step;
  1256. inc_page = page;
  1257. }
  1259. === modified file 'src/live_effects/parameter/parameter.h'
  1260. --- src/live_effects/parameter/parameter.h 2015-10-18 19:13:13 +0000
  1261. +++ src/live_effects/parameter/parameter.h 2016-07-30 16:05:28 +0000
  1262. @@ -12,6 +12,7 @@
  1263. #include <glibmm/ustring.h>
  1264. #include <2geom/forward.h>
  1265. #include <2geom/pathvector.h>
  1266. +#include "ui/widget/registered-widget.h"
  1268. // In gtk2, this wasn't an issue; we could toss around
  1269. // G_MAXDOUBLE and not worry about size allocations. But
  1270. @@ -110,12 +111,12 @@
  1271. virtual gchar * param_getSVGValue() const;
  1273. virtual void param_set_default();
  1274. + void param_update_default(gdouble default_value);
  1275. void param_set_value(gdouble val);
  1276. void param_make_integer(bool yes = true);
  1277. void param_set_range(gdouble min, gdouble max);
  1278. void param_set_digits(unsigned digits);
  1279. void param_set_increments(double step, double page);
  1280. -
  1281. void addSlider(bool add_slider_widget) { add_slider = add_slider_widget; };
  1283. void param_overwrite_widget(bool overwrite_widget);
  1285. === modified file 'src/live_effects/parameter/point.cpp'
  1286. --- src/live_effects/parameter/point.cpp 2016-01-17 19:18:53 +0000
  1287. +++ src/live_effects/parameter/point.cpp 2016-07-29 09:36:40 +0000
  1288. @@ -4,7 +4,6 @@
  1289. * Released under GNU GPL, read the file 'COPYING' for more information
  1290. */
  1292. -#include "ui/widget/registered-widget.h"
  1293. #include "live_effects/parameter/point.h"
  1294. #include "live_effects/effect.h"
  1295. #include "svg/svg.h"
  1296. @@ -30,7 +29,8 @@
  1297. : Parameter(label, tip, key, wr, effect),
  1298. defvalue(default_value),
  1299. liveupdate(live_update),
  1300. - knoth(NULL)
  1301. + knoth(NULL),
  1302. + _pointwdg(NULL)
  1303. {
  1304. knot_shape = SP_KNOT_SHAPE_DIAMOND;
  1305. knot_mode = SP_KNOT_MODE_XOR;
  1306. @@ -62,9 +62,9 @@
  1307. }
  1309. void
  1310. -PointParam::param_update_default(Geom::Point newpoint)
  1311. +PointParam::param_update_default(const Geom::Point default_point)
  1312. {
  1313. - defvalue = newpoint;
  1314. + defvalue = default_point;
  1315. }
  1317. void
  1318. @@ -81,6 +81,9 @@
  1319. if(knoth && liveupdate){
  1320. knoth->update_knots();
  1321. }
  1322. + if (_pointwdg) {
  1323. + _pointwdg->setValue( newpoint );
  1324. + }
  1325. }
  1327. bool
  1328. @@ -116,7 +119,7 @@
  1329. Gtk::Widget *
  1330. PointParam::param_newWidget()
  1331. {
  1332. - Inkscape::UI::Widget::RegisteredTransformedPoint * pointwdg = Gtk::manage(
  1333. + _pointwdg = Gtk::manage(
  1334. new Inkscape::UI::Widget::RegisteredTransformedPoint( param_label,
  1335. param_tooltip,
  1336. param_key,
  1337. @@ -126,15 +129,15 @@
  1338. // TODO: fix to get correct desktop (don't use SP_ACTIVE_DESKTOP)
  1339. SPDesktop *desktop = SP_ACTIVE_DESKTOP;
  1340. Geom::Affine transf = desktop->doc2dt();
  1341. - pointwdg->setTransform(transf);
  1342. - pointwdg->setValue( *this );
  1343. - pointwdg->clearProgrammatically();
  1344. - pointwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change point parameter"));
  1345. + _pointwdg->setTransform(transf);
  1346. + _pointwdg->setValue( *this );
  1347. + _pointwdg->clearProgrammatically();
  1348. + _pointwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change point parameter"));
  1350. Gtk::HBox * hbox = Gtk::manage( new Gtk::HBox() );
  1351. - static_cast<Gtk::HBox*>(hbox)->pack_start(*pointwdg, true, true);
  1352. + static_cast<Gtk::HBox*>(hbox)->pack_start(*_pointwdg, true, true);
  1353. static_cast<Gtk::HBox*>(hbox)->show_all_children();
  1354. -
  1355. + param_effect->upd_params = false;
  1356. return dynamic_cast<Gtk::Widget *> (hbox);
  1357. }
  1359. @@ -191,13 +194,13 @@
  1360. PointParamKnotHolderEntity::knot_click(guint state)
  1361. {
  1362. if (state & GDK_CONTROL_MASK) {
  1363. - if (state & GDK_MOD1_MASK) {
  1364. - this->pparam->param_set_default();
  1365. - SPLPEItem * splpeitem = dynamic_cast<SPLPEItem *>(item);
  1366. - if(splpeitem){
  1367. - sp_lpe_item_update_patheffect(splpeitem, false, false);
  1368. - }
  1369. + if (state & GDK_MOD1_MASK) {
  1370. + this->pparam->param_set_default();
  1371. + SPLPEItem * splpeitem = dynamic_cast<SPLPEItem *>(item);
  1372. + if(splpeitem){
  1373. + sp_lpe_item_update_patheffect(splpeitem, false, false);
  1374. }
  1375. + }
  1376. }
  1377. }
  1380. === modified file 'src/live_effects/parameter/point.h'
  1381. --- src/live_effects/parameter/point.h 2016-01-17 19:18:53 +0000
  1382. +++ src/live_effects/parameter/point.h 2016-07-29 09:28:12 +0000
  1383. @@ -11,7 +11,7 @@
  1385. #include <glib.h>
  1386. #include <2geom/point.h>
  1387. -
  1388. +#include "ui/widget/registered-widget.h"
  1389. #include "live_effects/parameter/parameter.h"
  1391. #include "knot-holder-entity.h"
  1392. @@ -43,7 +43,7 @@
  1393. void param_set_default();
  1394. Geom::Point param_get_default() const;
  1395. void param_set_liveupdate(bool live_update);
  1396. - void param_update_default(Geom::Point newpoint);
  1397. + void param_update_default(const Geom::Point default_point);
  1398. virtual void param_transform_multiply(Geom::Affine const& /*postmul*/, bool /*set*/);
  1400. void set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color);
  1401. @@ -62,6 +62,7 @@
  1402. SPKnotModeType knot_mode;
  1403. guint32 knot_color;
  1404. gchar *handle_tip;
  1405. + Inkscape::UI::Widget::RegisteredTransformedPoint * _pointwdg;
  1406. };
  1410. === modified file 'src/live_effects/parameter/text.cpp'
  1411. --- src/live_effects/parameter/text.cpp 2014-12-21 21:58:32 +0000
  1412. +++ src/live_effects/parameter/text.cpp 2016-07-31 02:24:26 +0000
  1413. @@ -31,7 +31,8 @@
  1414. Effect* effect, const Glib::ustring default_value )
  1415. : Parameter(label, tip, key, wr, effect),
  1416. value(default_value),
  1417. - defvalue(default_value)
  1418. + defvalue(default_value),
  1419. + _hide_canvas_text(false)
  1420. {
  1421. SPDesktop *desktop = SP_ACTIVE_DESKTOP; // FIXME: we shouldn't use this!
  1422. canvas_text = (SPCanvasText *) sp_canvastext_new(desktop->getTempGroup(), desktop, Geom::Point(0,0), "");
  1423. @@ -46,9 +47,24 @@
  1424. }
  1426. void
  1427. +TextParam::param_update_default(Glib::ustring default_value)
  1428. +{
  1429. + defvalue = default_value;
  1430. +}
  1431. +
  1432. +void
  1433. +TextParam::param_hide_canvas_text()
  1434. +{
  1435. + _hide_canvas_text = true;
  1436. + sp_canvastext_set_text (canvas_text,"");
  1437. +}
  1438. +
  1439. +void
  1440. TextParam::setPos(Geom::Point pos)
  1441. {
  1442. - sp_canvastext_set_coords (canvas_text, pos);
  1443. + if (!_hide_canvas_text) {
  1444. + sp_canvastext_set_coords (canvas_text, pos);
  1445. + }
  1446. }
  1448. void
  1449. @@ -63,9 +79,10 @@
  1450. Point dir = unit_vector(derivative(pwd2_reparam).valueAt(t_reparam));
  1451. Point n = -rot90(dir);
  1452. double angle = Geom::angle_between(dir, Point(1,0));
  1453. -
  1454. - sp_canvastext_set_coords(canvas_text, pos + n * length);
  1455. - sp_canvastext_set_anchor_manually(canvas_text, std::sin(angle), -std::cos(angle));
  1456. + if (!_hide_canvas_text) {
  1457. + sp_canvastext_set_coords(canvas_text, pos + n * length);
  1458. + sp_canvastext_set_anchor_manually(canvas_text, std::sin(angle), -std::cos(angle));
  1459. + }
  1460. }
  1462. void
  1463. @@ -73,7 +90,9 @@
  1464. {
  1465. anchor_x = x_value;
  1466. anchor_y = y_value;
  1467. - sp_canvastext_set_anchor_manually (canvas_text, anchor_x, anchor_y);
  1468. + if (!_hide_canvas_text) {
  1469. + sp_canvastext_set_anchor_manually (canvas_text, anchor_x, anchor_y);
  1470. + }
  1471. }
  1473. bool
  1474. @@ -107,8 +126,9 @@
  1475. TextParam::param_setValue(const Glib::ustring newvalue)
  1476. {
  1477. value = newvalue;
  1478. -
  1479. - sp_canvastext_set_text (canvas_text, newvalue.c_str());
  1480. + if (!_hide_canvas_text) {
  1481. + sp_canvastext_set_text (canvas_text, newvalue.c_str());
  1482. + }
  1483. }
  1485. } /* namespace LivePathEffect */
  1487. === modified file 'src/live_effects/parameter/text.h'
  1488. --- src/live_effects/parameter/text.h 2014-03-27 01:33:44 +0000
  1489. +++ src/live_effects/parameter/text.h 2016-07-31 02:24:55 +0000
  1490. @@ -40,7 +40,9 @@
  1491. virtual gchar * param_getSVGValue() const;
  1493. void param_setValue(const Glib::ustring newvalue);
  1494. + void param_hide_canvas_text();
  1495. virtual void param_set_default();
  1496. + void param_update_default(Glib::ustring default_value);
  1497. void setPos(Geom::Point pos);
  1498. void setPosAndAnchor(const Geom::Piecewise<Geom::D2<Geom::SBasis> > &pwd2,
  1499. const double t, const double length, bool use_curvature = false);
  1500. @@ -53,7 +55,7 @@
  1501. TextParam& operator=(const TextParam&);
  1502. double anchor_x;
  1503. double anchor_y;
  1504. -
  1505. + bool _hide_canvas_text;
  1506. Glib::ustring value;
  1507. Glib::ustring defvalue;
  1510. === modified file 'src/live_effects/parameter/togglebutton.cpp'
  1511. --- src/live_effects/parameter/togglebutton.cpp 2016-07-24 15:05:29 +0000
  1512. +++ src/live_effects/parameter/togglebutton.cpp 2016-07-24 16:53:55 +0000
  1513. @@ -12,6 +12,7 @@
  1514. #include "live_effects/effect.h"
  1515. #include "svg/svg.h"
  1516. #include "svg/stringstream.h"
  1517. +#include "selection.h"
  1518. #include "widgets/icon.h"
  1519. #include "inkscape.h"
  1520. #include "verbs.h"
  1521. @@ -108,13 +109,14 @@
  1522. }else{
  1523. gtk_box_pack_start (GTK_BOX(box_button), label_button, false, false, 1);
  1524. }
  1525. +
  1526. checkwdg->add(*Gtk::manage(Glib::wrap(box_button)));
  1527. checkwdg->setActive(value);
  1528. checkwdg->setProgrammatically = false;
  1529. checkwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change togglebutton parameter"));
  1531. _toggled_connection = checkwdg->signal_toggled().connect(sigc::mem_fun(*this, &ToggleButtonParam::toggled));
  1532. -
  1533. + param_effect->upd_params = false;
  1534. return checkwdg;
  1535. }
  1537. @@ -161,6 +163,12 @@
  1539. void
  1540. ToggleButtonParam::toggled() {
  1541. + //Force redraw for update widgets
  1542. + param_effect->upd_params = true;
  1543. + if (SP_ACTIVE_DESKTOP) {
  1544. + Inkscape::Selection *selection = SP_ACTIVE_DESKTOP->getSelection();
  1545. + selection ->emitModified();
  1546. + }
  1547. _signal_toggled.emit();
  1548. }
  1551. === modified file 'src/live_effects/parameter/unit.cpp'
  1552. --- src/live_effects/parameter/unit.cpp 2014-03-27 01:33:44 +0000
  1553. +++ src/live_effects/parameter/unit.cpp 2016-07-24 23:34:35 +0000
  1554. @@ -54,6 +54,12 @@
  1555. param_set_value(*defunit);
  1556. }
  1558. +void
  1559. +UnitParam::param_update_default(const Glib::ustring default_unit)
  1560. +{
  1561. + defunit = unit_table.getUnit(default_unit);
  1562. +}
  1563. +
  1564. void
  1565. UnitParam::param_set_value(Inkscape::Util::Unit const &val)
  1566. {
  1568. === modified file 'src/live_effects/parameter/unit.h'
  1569. --- src/live_effects/parameter/unit.h 2014-03-27 01:33:44 +0000
  1570. +++ src/live_effects/parameter/unit.h 2016-07-24 23:34:56 +0000
  1571. @@ -33,6 +33,7 @@
  1572. virtual gchar * param_getSVGValue() const;
  1573. virtual void param_set_default();
  1574. void param_set_value(Inkscape::Util::Unit const &val);
  1575. + void param_update_default(const Glib::ustring default_unit);
  1576. const gchar *get_abbreviation() const;
  1578. virtual Gtk::Widget * param_newWidget();
  1580. === modified file 'src/selection.cpp'
  1581. --- src/selection.cpp 2016-07-28 11:26:17 +0000
  1582. +++ src/selection.cpp 2016-07-24 16:00:12 +0000
  1583. @@ -282,6 +282,11 @@
  1584. _emitChanged();
  1585. }
  1587. +void Selection::emitModified()
  1588. +{
  1589. + _emitChanged();
  1590. +}
  1591. +
  1592. std::vector<SPObject*> const &Selection::list() {
  1593. if(!_objs_vector.empty())
  1594. return _objs_vector;
  1596. === modified file 'src/selection.h'
  1597. --- src/selection.h 2016-07-28 11:26:17 +0000
  1598. +++ src/selection.h 2016-07-24 16:00:12 +0000
  1599. @@ -192,6 +192,11 @@
  1600. void clear();
  1602. /**
  1603. + * Emmit modified signal
  1604. + */
  1605. + void emitModified();
  1606. +
  1607. + /**
  1608. * Returns true if no items are selected.
  1609. */
  1610. bool isEmpty() const { return _objs.empty(); }
  1612. === modified file 'src/ui/CMakeLists.txt'
  1613. --- src/ui/CMakeLists.txt 2016-02-07 15:49:01 +0000
  1614. +++ src/ui/CMakeLists.txt 2016-07-29 21:24:51 +0000
  1615. @@ -128,6 +128,7 @@
  1616. widget/entity-entry.cpp
  1617. widget/entry.cpp
  1618. widget/filter-effect-chooser.cpp
  1619. + widget/font-button.cpp
  1620. widget/font-variants.cpp
  1621. widget/frame.cpp
  1622. widget/gimpcolorwheel.c
  1623. @@ -312,6 +313,7 @@
  1624. widget/entity-entry.h
  1625. widget/entry.h
  1626. widget/filter-effect-chooser.h
  1627. + widget/font-button.h
  1628. widget/font-variants.h
  1629. widget/frame.h
  1630. widget/gimpspinscale.h
  1632. === modified file 'src/ui/dialog/livepatheffect-editor.cpp'
  1633. --- src/ui/dialog/livepatheffect-editor.cpp 2016-07-28 11:26:17 +0000
  1634. +++ src/ui/dialog/livepatheffect-editor.cpp 2016-07-30 17:02:04 +0000
  1635. @@ -61,7 +61,7 @@
  1636. {
  1637. LivePathEffectEditor *lpeeditor = static_cast<LivePathEffectEditor *>(data);
  1638. lpeeditor->lpe_list_locked = false;
  1639. - lpeeditor->onSelectionChanged(selection);
  1640. + lpeeditor->onSelectionChanged(selection, true);
  1641. }
  1643. static void lpeeditor_selection_modified (Inkscape::Selection * selection, guint /*flags*/, gpointer data)
  1644. @@ -98,7 +98,8 @@
  1645. button_up(),
  1646. button_down(),
  1647. current_desktop(NULL),
  1648. - current_lpeitem(NULL)
  1649. + current_lpeitem(NULL),
  1650. + current_lperef(NULL)
  1651. {
  1652. Gtk::Box *contents = _getContents();
  1653. contents->set_spacing(4);
  1654. @@ -206,6 +207,10 @@
  1655. void
  1656. LivePathEffectEditor::showParams(LivePathEffect::Effect& effect)
  1657. {
  1658. + if ( ! effect.upd_params ) {
  1659. + return;
  1660. + }
  1661. +
  1662. if (effectwidget) {
  1663. effectcontrol_vbox.remove(*effectwidget);
  1664. delete effectwidget;
  1665. @@ -265,9 +270,8 @@
  1666. button_down.set_sensitive(sensitive);
  1667. }
  1669. -
  1670. void
  1671. -LivePathEffectEditor::onSelectionChanged(Inkscape::Selection *sel)
  1672. +LivePathEffectEditor::onSelectionChanged(Inkscape::Selection *sel, bool upd_params)
  1673. {
  1674. if (lpe_list_locked) {
  1675. // this was triggered by selecting a row in the list, so skip reloading
  1676. @@ -291,6 +295,9 @@
  1677. if ( lpeitem->hasPathEffect() ) {
  1678. Inkscape::LivePathEffect::Effect *lpe = lpeitem->getCurrentLPE();
  1679. if (lpe) {
  1680. + if (upd_params) {
  1681. + lpe->upd_params = true;
  1682. + }
  1683. showParams(*lpe);
  1684. lpe_list_locked = true;
  1685. selectInList(lpe);
  1686. @@ -494,6 +501,12 @@
  1687. SPItem *item = sel->singleItem();
  1688. SPLPEItem *lpeitem = dynamic_cast<SPLPEItem *>(item);
  1689. if ( lpeitem ) {
  1690. + if (current_lperef && current_lperef->lpeobject) {
  1691. + LivePathEffect::Effect * effect = current_lperef->lpeobject->get_lpe();
  1692. + if (effect) {
  1693. + effect->upd_params = true;
  1694. + }
  1695. + }
  1696. lpeitem->removeCurrentPathEffect(false);
  1698. DocumentUndo::done( current_desktop->getDocument(), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
  1699. @@ -548,11 +561,17 @@
  1700. Gtk::TreeModel::iterator it = sel->get_selected();
  1701. LivePathEffect::LPEObjectReference * lperef = (*it)[columns.lperef];
  1703. - if (lperef && current_lpeitem) {
  1704. + if (lperef && current_lpeitem && current_lperef != lperef) {
  1705. + //The last condition ignore Gtk::TreeModel may occasionally be changed emitted when nothing has happened
  1706. if (lperef->lpeobject->get_lpe()) {
  1707. lpe_list_locked = true; // prevent reload of the list which would lose selection
  1708. current_lpeitem->setCurrentPathEffect(lperef);
  1709. - showParams(*lperef->lpeobject->get_lpe());
  1710. + current_lperef = lperef;
  1711. + LivePathEffect::Effect * effect = lperef->lpeobject->get_lpe();
  1712. + if (effect) {
  1713. + effect->upd_params = true;
  1714. + showParams(*effect);
  1715. + }
  1716. }
  1717. }
  1718. }
  1719. @@ -570,6 +589,14 @@
  1720. /* FIXME: this explicit writing to SVG is wrong. The lpe_item should have a method to disable/enable an effect within its stack.
  1721. * So one can call: lpe_item->setActive(lpeobjref->lpeobject); */
  1722. lpeobjref->lpeobject->get_lpe()->getRepr()->setAttribute("is_visible", newValue ? "true" : "false");
  1723. + Inkscape::Selection *sel = _getSelection();
  1724. + if ( sel && !sel->isEmpty() ) {
  1725. + SPItem *item = sel->singleItem();
  1726. + SPLPEItem *lpeitem = dynamic_cast<SPLPEItem *>(item);
  1727. + if ( lpeitem ) {
  1728. + lpeobjref->lpeobject->get_lpe()->doOnVisibilityToggled(lpeitem);
  1729. + }
  1730. + }
  1731. DocumentUndo::done( current_desktop->getDocument(), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
  1732. newValue ? _("Activate path effect") : _("Deactivate path effect"));
  1733. }
  1735. === modified file 'src/ui/dialog/livepatheffect-editor.h'
  1736. --- src/ui/dialog/livepatheffect-editor.h 2014-03-27 01:33:44 +0000
  1737. +++ src/ui/dialog/livepatheffect-editor.h 2016-07-24 16:00:12 +0000
  1738. @@ -45,7 +45,8 @@
  1740. static LivePathEffectEditor &getInstance() { return *new LivePathEffectEditor(); }
  1742. - void onSelectionChanged(Inkscape::Selection *sel);
  1743. + void onSelectionChanged(Inkscape::Selection *sel, bool upd_params = false);
  1744. + void onSelectionModified(Inkscape::Selection *sel);
  1745. virtual void on_effect_selection_changed();
  1746. void setDesktop(SPDesktop *desktop);
  1748. @@ -126,6 +127,8 @@
  1750. SPLPEItem * current_lpeitem;
  1752. + LivePathEffect::LPEObjectReference * current_lperef;
  1753. +
  1754. friend void lpeeditor_selection_changed (Inkscape::Selection * selection, gpointer data);
  1756. LivePathEffectEditor(LivePathEffectEditor const &d);
  1758. === modified file 'src/ui/widget/Makefile_insert'
  1759. --- src/ui/widget/Makefile_insert 2015-05-17 09:20:36 +0000
  1760. +++ src/ui/widget/Makefile_insert 2016-07-29 21:25:30 +0000
  1761. @@ -33,6 +33,8 @@
  1762. ui/widget/entry.h \
  1763. ui/widget/filter-effect-chooser.h \
  1764. ui/widget/filter-effect-chooser.cpp \
  1765. + ui/widget/font-button.h \
  1766. + ui/widget/font-button.cpp \
  1767. ui/widget/font-variants.h \
  1768. ui/widget/font-variants.cpp \
  1769. ui/widget/gimpspinscale.c \
  1771. === modified file 'src/ui/widget/combo-enums.h'
  1772. --- src/ui/widget/combo-enums.h 2012-02-15 11:19:00 +0000
  1773. +++ src/ui/widget/combo-enums.h 2016-07-29 18:13:37 +0000
  1774. @@ -16,7 +16,6 @@
  1775. #include <gtkmm/liststore.h>
  1776. #include "attr-widget.h"
  1777. #include "util/enums.h"
  1778. -
  1779. #include <glibmm/i18n.h>
  1781. namespace Inkscape {
  1782. @@ -190,9 +189,11 @@
  1783. const Util::EnumDataConverter<E>& c,
  1784. Glib::ustring const &suffix = "",
  1785. Glib::ustring const &icon = "",
  1786. - bool mnemonic = true)
  1787. - : Labelled(label, tooltip, new ComboBoxEnum<E>(c), suffix, icon, mnemonic)
  1788. - { }
  1789. + bool mnemonic = true,
  1790. + bool sorted = true)
  1791. + : Labelled(label, tooltip, new ComboBoxEnum<E>(c, SP_ATTR_INVALID, sorted), suffix, icon, mnemonic)
  1792. + {
  1793. + }
  1795. ComboBoxEnum<E>* getCombobox() {
  1796. return static_cast< ComboBoxEnum<E>* > (_widget);
  1798. === added file 'src/ui/widget/font-button.cpp'
  1799. --- src/ui/widget/font-button.cpp 1970-01-01 00:00:00 +0000
  1800. +++ src/ui/widget/font-button.cpp 2016-07-30 00:01:38 +0000
  1801. @@ -0,0 +1,58 @@
  1802. +/*
  1803. + *
  1804. + * Released under GNU GPL. Read the file 'COPYING' for more information.
  1805. + */
  1806. +
  1807. +#ifdef HAVE_CONFIG_H
  1808. +# include <config.h>
  1809. +#endif
  1810. +
  1811. +#include "font-button.h"
  1812. +#include <glibmm/i18n.h>
  1813. +
  1814. +namespace Inkscape {
  1815. +namespace UI {
  1816. +namespace Widget {
  1817. +
  1818. +FontButton::FontButton(Glib::ustring const &label, Glib::ustring const &tooltip,
  1819. + Glib::ustring const &suffix,
  1820. + Glib::ustring const &icon,
  1821. + bool mnemonic)
  1822. + : Labelled(label, tooltip, new Gtk::FontButton("Sans 10"), suffix, icon, mnemonic)
  1823. +{
  1824. +}
  1825. +
  1826. +Glib::ustring FontButton::getValue() const
  1827. +{
  1828. + g_assert(_widget != NULL);
  1829. + return static_cast<Gtk::FontButton*>(_widget)->get_font_name();
  1830. +}
  1831. +
  1832. +
  1833. +void FontButton::setValue (Glib::ustring fontspec)
  1834. +{
  1835. + g_assert(_widget != NULL);
  1836. + static_cast<Gtk::FontButton*>(_widget)->set_font_name(fontspec);
  1837. +}
  1838. +
  1839. +Glib::SignalProxy0<void> FontButton::signal_font_value_changed()
  1840. +{
  1841. + g_assert(_widget != NULL);
  1842. + return static_cast<Gtk::FontButton*>(_widget)->signal_font_set();
  1843. +}
  1844. +
  1845. +
  1846. +} // namespace Widget
  1847. +} // namespace UI
  1848. +} // namespace Inkscape
  1849. +
  1850. +/*
  1851. + Local Variables:
  1852. + mode:c++
  1853. + c-file-style:"stroustrup"
  1854. + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
  1855. + indent-tabs-mode:nil
  1856. + fill-column:99
  1857. + End:
  1858. +*/
  1859. +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
  1861. === added file 'src/ui/widget/font-button.h'
  1862. --- src/ui/widget/font-button.h 1970-01-01 00:00:00 +0000
  1863. +++ src/ui/widget/font-button.h 2016-07-29 22:58:22 +0000
  1864. @@ -0,0 +1,63 @@
  1865. +/*
  1866. + *
  1867. + * Copyright (C) 2007 Author
  1868. + *
  1869. + * Released under GNU GPL. Read the file 'COPYING' for more information.
  1870. + */
  1871. +
  1872. +#ifndef INKSCAPE_UI_WIDGET_FONT_BUTTON_H
  1873. +#define INKSCAPE_UI_WIDGET_FONT_BUTTON_H
  1874. +
  1875. +#include <gtkmm.h>
  1876. +#include "labelled.h"
  1877. +
  1878. +namespace Inkscape {
  1879. +namespace UI {
  1880. +namespace Widget {
  1881. +
  1882. +/**
  1883. + * A labelled font button for entering font values
  1884. + */
  1885. +class FontButton : public Labelled
  1886. +{
  1887. +public:
  1888. + /**
  1889. + * Construct a FontButton Widget.
  1890. + *
  1891. + * @param label Label.
  1892. + * @param suffix Suffix, placed after the widget (defaults to "").
  1893. + * @param icon Icon filename, placed before the label (defaults to "").
  1894. + * @param mnemonic Mnemonic toggle; if true, an underscore (_) in the label
  1895. + * indicates the next character should be used for the
  1896. + * mnemonic accelerator key (defaults to false).
  1897. + */
  1898. + FontButton( Glib::ustring const &label,
  1899. + Glib::ustring const &tooltip,
  1900. + Glib::ustring const &suffix = "",
  1901. + Glib::ustring const &icon = "",
  1902. + bool mnemonic = true);
  1903. +
  1904. + Glib::ustring getValue() const;
  1905. + void setValue (Glib::ustring fontspec);
  1906. + /**
  1907. + * Signal raised when the font button's value changes.
  1908. + */
  1909. + Glib::SignalProxy0<void> signal_font_value_changed();
  1910. +};
  1911. +
  1912. +} // namespace Widget
  1913. +} // namespace UI
  1914. +} // namespace Inkscape
  1915. +
  1916. +#endif // INKSCAPE_UI_WIDGET_RANDOM_H
  1917. +
  1918. +/*
  1919. + Local Variables:
  1920. + mode:c++
  1921. + c-file-style:"stroustrup"
  1922. + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
  1923. + indent-tabs-mode:nil
  1924. + fill-column:99
  1925. + End:
  1926. +*/
  1927. +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
  1929. === modified file 'src/ui/widget/registered-enums.h'
  1930. --- src/ui/widget/registered-enums.h 2011-10-25 07:45:35 +0000
  1931. +++ src/ui/widget/registered-enums.h 2016-07-29 18:13:43 +0000
  1932. @@ -33,11 +33,11 @@
  1933. const Util::EnumDataConverter<E>& c,
  1934. Registry& wr,
  1935. Inkscape::XML::Node* repr_in = NULL,
  1936. - SPDocument *doc_in = NULL )
  1937. - : RegisteredWidget< LabelledComboBoxEnum<E> >(label, tip, c)
  1938. + SPDocument *doc_in = NULL,
  1939. + bool sorted = true )
  1940. + : RegisteredWidget< LabelledComboBoxEnum<E> >(label, tip, c, (const Glib::ustring &)"", (const Glib::ustring &)"", true, sorted)
  1941. {
  1942. RegisteredWidget< LabelledComboBoxEnum<E> >::init_parent(key, wr, repr_in, doc_in);
  1943. -
  1944. _changed_connection = combobox()->signal_changed().connect (sigc::mem_fun (*this, &RegisteredEnum::on_changed));
  1945. }
  1948. === modified file 'src/ui/widget/registered-widget.cpp'
  1949. --- src/ui/widget/registered-widget.cpp 2016-07-28 11:26:17 +0000
  1950. +++ src/ui/widget/registered-widget.cpp 2016-07-31 02:52:27 +0000
  1951. @@ -25,6 +25,7 @@
  1952. #include "ui/widget/scalar-unit.h"
  1953. #include "ui/widget/point.h"
  1954. #include "ui/widget/random.h"
  1955. +#include "ui/widget/font-button.h"
  1956. #include "widgets/spinbutton-events.h"
  1958. #include "xml/repr.h"
  1959. @@ -297,7 +298,6 @@
  1960. setProgrammatically = false;
  1961. return;
  1962. }
  1963. -
  1964. if (_wr->isUpdating()) {
  1965. return;
  1966. }
  1967. @@ -803,6 +803,47 @@
  1968. _wr->setUpdating (false);
  1969. }
  1971. +/*#########################################
  1972. + * Registered FONT-BUTTON
  1973. + */
  1974. +
  1975. +RegisteredFontButton::~RegisteredFontButton()
  1976. +{
  1977. + _signal_font_set.disconnect();
  1978. +}
  1979. +
  1980. +RegisteredFontButton::RegisteredFontButton ( const Glib::ustring& label, const Glib::ustring& tip,
  1981. + const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in,
  1982. + SPDocument* doc_in )
  1983. + : RegisteredWidget<FontButton>(label, tip)
  1984. +{
  1985. + init_parent(key, wr, repr_in, doc_in);
  1986. + _signal_font_set = signal_font_value_changed().connect (sigc::mem_fun (*this, &RegisteredFontButton::on_value_changed));
  1987. +}
  1988. +
  1989. +void
  1990. +RegisteredFontButton::setValue (Glib::ustring fontspec)
  1991. +{
  1992. + FontButton::setValue(fontspec);
  1993. +}
  1994. +
  1995. +void
  1996. +RegisteredFontButton::on_value_changed()
  1997. +{
  1998. +
  1999. + if (_wr->isUpdating())
  2000. + return;
  2001. +
  2002. + _wr->setUpdating (true);
  2003. +
  2004. + Inkscape::SVGOStringStream os;
  2005. + os << getValue();
  2006. +
  2007. + write_to_xml(os.str().c_str());
  2008. +
  2009. + _wr->setUpdating (false);
  2010. +}
  2011. +
  2012. } // namespace Dialog
  2013. } // namespace UI
  2014. } // namespace Inkscape
  2016. === modified file 'src/ui/widget/registered-widget.h'
  2017. --- src/ui/widget/registered-widget.h 2016-07-24 15:05:29 +0000
  2018. +++ src/ui/widget/registered-widget.h 2016-07-29 22:45:14 +0000
  2019. @@ -22,6 +22,7 @@
  2020. #include "ui/widget/text.h"
  2021. #include "ui/widget/random.h"
  2022. #include "ui/widget/unit-menu.h"
  2023. +#include "ui/widget/font-button.h"
  2024. #include "ui/widget/color-picker.h"
  2025. #include "inkscape.h"
  2027. @@ -77,6 +78,8 @@
  2028. RegisteredWidget( A& a, B& b, C c, D d ): W( a, b, c, d ) { construct(); }
  2029. template< typename A, typename B, typename C, typename D, typename E , typename F>
  2030. RegisteredWidget( A& a, B& b, C c, D& d, E& e, F* f): W( a, b, c, d, e, f) { construct(); }
  2031. + template< typename A, typename B, typename C, typename D, typename E , typename F, typename G>
  2032. + RegisteredWidget( A& a, B& b, C& c, D& d, E& e, F f, G& g): W( a, b, c, d, e, f, g) { construct(); }
  2034. virtual ~RegisteredWidget() {};
  2036. @@ -418,6 +421,23 @@
  2037. void on_value_changed();
  2038. };
  2040. +class RegisteredFontButton : public RegisteredWidget<FontButton> {
  2041. +public:
  2042. + virtual ~RegisteredFontButton();
  2043. + RegisteredFontButton ( const Glib::ustring& label,
  2044. + const Glib::ustring& tip,
  2045. + const Glib::ustring& key,
  2046. + Registry& wr,
  2047. + Inkscape::XML::Node* repr_in = NULL,
  2048. + SPDocument *doc_in = NULL);
  2049. +
  2050. + void setValue (Glib::ustring fontspec);
  2051. +
  2052. +protected:
  2053. + sigc::connection _signal_font_set;
  2054. + void on_value_changed();
  2055. +};
  2056. +
  2057. } // namespace Widget
  2058. } // namespace UI
  2059. } // namespace Inkscape
  2061. === modified file 'src/ui/widget/scalar.cpp'
  2062. --- src/ui/widget/scalar.cpp 2014-03-27 01:33:44 +0000
  2063. +++ src/ui/widget/scalar.cpp 2016-07-30 15:23:12 +0000
  2064. @@ -126,10 +126,12 @@
  2065. static_cast<SpinButton*>(_widget)->set_range(min, max);
  2066. }
  2068. -void Scalar::setValue(double value)
  2069. +void Scalar::setValue(double value, bool setProg)
  2070. {
  2071. g_assert(_widget != NULL);
  2072. - setProgrammatically = true; // callback is supposed to reset back, if it cares
  2073. + if (setProg) {
  2074. + setProgrammatically = true; // callback is supposed to reset back, if it cares
  2075. + }
  2076. static_cast<SpinButton*>(_widget)->set_value(value);
  2077. }
  2080. === modified file 'src/ui/widget/scalar.h'
  2081. --- src/ui/widget/scalar.h 2012-04-30 22:04:12 +0000
  2082. +++ src/ui/widget/scalar.h 2016-07-30 15:23:27 +0000
  2083. @@ -139,7 +139,7 @@
  2084. /**
  2085. * Sets the value of the spin button.
  2086. */
  2087. - void setValue(double value);
  2088. + void setValue(double value, bool setProg = true);
  2090. /**
  2091. * Manually forces an update of the spin button.
  2093. === modified file 'src/widgets/font-selector.cpp'
  2094. --- src/widgets/font-selector.cpp 2016-07-28 11:26:17 +0000
  2095. +++ src/widgets/font-selector.cpp 2016-07-22 19:59:31 +0000
  2096. @@ -19,9 +19,6 @@
  2097. # include "config.h"
  2098. #endif
  2100. -#include <libnrtype/font-lister.h>
  2101. -#include <libnrtype/font-instance.h>
  2102. -
  2103. #include <2geom/transforms.h>
  2105. #include <gtk/gtk.h>
  2106. @@ -34,29 +31,7 @@
  2108. /* SPFontSelector */
  2110. -struct SPFontSelector
  2111. -{
  2112. -#if GTK_CHECK_VERSION(3,0,0)
  2113. - GtkBox hbox;
  2114. -#else
  2115. - GtkHBox hbox;
  2116. -#endif
  2117. -
  2118. - unsigned int block_emit : 1;
  2119. -
  2120. - GtkWidget *family;
  2121. - GtkWidget *style;
  2122. - GtkWidget *size;
  2123. -
  2124. - GtkWidget *family_treeview;
  2125. - GtkWidget *style_treeview;
  2126. -
  2127. - NRNameList families;
  2128. - NRStyleList styles;
  2129. - gfloat fontsize;
  2130. - bool fontsize_dirty;
  2131. - Glib::ustring *fontspec;
  2132. -};
  2133. +
  2136. struct SPFontSelectorClass
  2137. @@ -274,6 +249,7 @@
  2139. if (fsel->fontspec) {
  2140. delete fsel->fontspec;
  2141. + fsel->fontspec = 0;
  2142. }
  2144. if (fsel->families.length > 0) {
  2146. === modified file 'src/widgets/font-selector.h'
  2147. --- src/widgets/font-selector.h 2014-08-18 20:19:55 +0000
  2148. +++ src/widgets/font-selector.h 2016-07-22 19:59:29 +0000
  2149. @@ -15,10 +15,33 @@
  2150. *
  2151. * Released under GNU GPL, read the file 'COPYING' for more information
  2152. */
  2153. -
  2154. +#include <libnrtype/font-lister.h>
  2155. +#include <libnrtype/font-instance.h>
  2156. #include <glib.h>
  2158. -struct SPFontSelector;
  2159. +struct SPFontSelector
  2160. +{
  2161. +#if GTK_CHECK_VERSION(3,0,0)
  2162. + GtkBox hbox;
  2163. +#else
  2164. + GtkHBox hbox;
  2165. +#endif
  2166. +
  2167. + unsigned int block_emit : 1;
  2168. +
  2169. + GtkWidget *family;
  2170. + GtkWidget *style;
  2171. + GtkWidget *size;
  2172. +
  2173. + GtkWidget *family_treeview;
  2174. + GtkWidget *style_treeview;
  2175. +
  2176. + NRNameList families;
  2177. + NRStyleList styles;
  2178. + gfloat fontsize;
  2179. + bool fontsize_dirty;
  2180. + Glib::ustring *fontspec;
  2181. +};
  2183. #define SP_TYPE_FONT_SELECTOR (sp_font_selector_get_type ())
  2184. #define SP_FONT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_FONT_SELECTOR, SPFontSelector))
  1. More ...
 
 

106

 

1112

Measur Line r.15035

- Jabiertxo Arraiza Cenoz

-

PasteBin

行数
2184
词数
6980
文件大小
77.6 KB
创建于
类型
text/plain
General Public License v2 (GPLv2)
请登录后发言！

Inkscape 是遵循GPL的自由开源软件。