summaryrefslogtreecommitdiffstats
path: root/src/2geom
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-02-16 20:49:53 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-02-16 20:49:53 +0000
commit9593c78703845bfca18a3a135cbbc47cc03b54f6 (patch)
tree4616e3cb7ed134d82367726aafaaf3f312d1cbc5 /src/2geom
parentadded knots (diff)
downloadinkscape-9593c78703845bfca18a3a135cbbc47cc03b54f6.tar.gz
inkscape-9593c78703845bfca18a3a135cbbc47cc03b54f6.zip
continuing fillet/chamfer
(bzr r13645.1.13)
Diffstat (limited to 'src/2geom')
-rw-r--r--src/2geom/satellite.h31
1 files changed, 23 insertions, 8 deletions
diff --git a/src/2geom/satellite.h b/src/2geom/satellite.h
index 8623ff1b0..06b4a1dd6 100644
--- a/src/2geom/satellite.h
+++ b/src/2geom/satellite.h
@@ -54,6 +54,12 @@ class Satellite
_satellitetype = A;
}
+ 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);
+ _satellitetype = GcharMapToSatelliteType[A];
+ }
+
void setIsTime(bool A)
{
_isTime = A;
@@ -84,42 +90,48 @@ class Satellite
_size = A;
}
- SatelliteType satellitetype() const
+ SatelliteType getSatelliteType() const
{
return _satellitetype;
}
- bool isTime() const
+ 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");
+ return SatelliteTypeToGcharMap[_satellitetype];
+ }
+
+ bool getIsTime() const
{
return _isTime;
}
- bool active() const
+ bool getActive() const
{
return _active;
}
- bool hasMirror() const
+ bool getHasMirror() const
{
return _hasMirror;
}
- bool hidden() const
+ bool getHidden() const
{
return _hidden;
}
- double size() const
+ double getSize() const
{
return _size;
}
- double time() const
+ double getTime() const
{
return _time;
}
- double time(Geom::D2<Geom::SBasis> curve) const
+ double getTime(Geom::D2<Geom::SBasis> curve) const
{
//todo make the process
return _time;
@@ -133,7 +145,10 @@ class Satellite
static const std::map<gchar const *,SatelliteType> GcharMapToSatelliteType;
+ static double getOpositeTime(Geom::D2<Geom::SBasis> SBasisCurve, double time);
+
private:
+
SatelliteType _satellitetype;
bool _isTime;
bool _active;