diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-02-19 21:06:37 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-02-19 21:06:37 +0000 |
| commit | aa9e36cd93c4f71ff8eb0a6fc24d46933fdf7d14 (patch) | |
| tree | 247a7c67e58057cdd987fb7cdf45ee61456aaf97 | |
| parent | reducing size in pointwise LPE data (diff) | |
| download | inkscape-aa9e36cd93c4f71ff8eb0a6fc24d46933fdf7d14.tar.gz inkscape-aa9e36cd93c4f71ff8eb0a6fc24d46933fdf7d14.zip | |
fixed some bugs
(bzr r13645.1.19)
| -rw-r--r-- | src/2geom/satellite.h | 4 | ||||
| -rw-r--r-- | src/live_effects/lpe-fillet-chamfer.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/2geom/satellite.h b/src/2geom/satellite.h index a83de5af2..7b524f912 100644 --- a/src/2geom/satellite.h +++ b/src/2geom/satellite.h @@ -56,7 +56,7 @@ class Satellite void setSatelliteType(gchar const * A) { - std::map<gchar const *,SatelliteType> GcharMapToSatelliteType = boost::assign::map_list_of("FILLET", FILLET)("INVERSE_FILLET", INVERSE_FILLET)("CHAMFER",CHAMFER)("INVERSE_CHAMFER",INVERSE_CHAMFER)("INVALID_SATELLITE",INVALID_SATELLITE); + std::map<gchar const *,SatelliteType> GcharMapToSatelliteType = boost::assign::map_list_of("F", F)("IF", IF)("C",C)("IC",IC)("KO",KO); _satellitetype = GcharMapToSatelliteType[A]; } @@ -97,7 +97,7 @@ class Satellite gchar const * getSatelliteTypeGchar() const { - std::map<SatelliteType,gchar const *> SatelliteTypeToGcharMap = boost::assign::map_list_of(FILLET, "FILLET")(INVERSE_FILLET, "INVERSE_FILLET")(CHAMFER,"CHAMFER")(INVERSE_CHAMFER,"INVERSE_CHAMFER")(INVALID_SATELLITE,"INVALID_SATELLITE"); + std::map<SatelliteType,gchar const *> SatelliteTypeToGcharMap = boost::assign::map_list_of(F, "F")(IF, "IF")(C,"C")(IC,"IC")(KO,"KO"); return SatelliteTypeToGcharMap[_satellitetype]; } diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp index e9d9a21b1..0ef8b5a0e 100644 --- a/src/live_effects/lpe-fillet-chamfer.cpp +++ b/src/live_effects/lpe-fillet-chamfer.cpp @@ -87,7 +87,7 @@ void LPEFilletChamfer::doOnApply(SPLPEItem const *lpeItem) --curve_end; int counter = 0; while (curve_it1 != curve_endit) { - Satellite satellite(FILLET, true, true, false, false, 0.0, 0.0); + Satellite satellite(F, true, true, false, false, 0.0, 0.0); Geom::NodeType nodetype; if (counter==0) { if (path_it->closed()) { @@ -173,7 +173,7 @@ LPEFilletChamfer::doEffect_path(std::vector<Geom::Path> const &path_in) double time0 = 0; while (curve_it1 != curve_endit) { std::vector<Satellite> satVector; - Satellite sat(FILLET, true, true, false, false, 0.0, 0.0); + Satellite sat(F, true, true, false, false, 0.0, 0.0); Curve *curve_it2Fixed = (*path_it->begin()).duplicate(); if(!path_it->closed() || curve_it2 != curve_endit){ curve_it2Fixed = (*curve_it2).duplicate(); |