diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-03-08 14:31:15 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-03-08 14:31:15 +0000 |
| commit | 351660cb86c992fe7be5edd31250e2826714c9cb (patch) | |
| tree | c4d56725c68dbda0a7838ce5bd55380e3bbb06fd /src/ui | |
| parent | minor changes to helper paths (diff) | |
| parent | Update simplify and bspline to auto size some helper paths based on current zoom (diff) | |
| download | inkscape-351660cb86c992fe7be5edd31250e2826714c9cb.tar.gz inkscape-351660cb86c992fe7be5edd31250e2826714c9cb.zip | |
update to trunk and fixed helper paths
(bzr r13645.1.38)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/lpe-fillet-chamfer-properties.cpp | 12 | ||||
| -rw-r--r-- | src/ui/dialog/lpe-fillet-chamfer-properties.h | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp index 8a6cbadad..d0f52775a 100644 --- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp +++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp @@ -129,8 +129,12 @@ void FilletChamferPropertiesDialog::showDialog( const gchar *unit, bool use_distance, bool aprox_radius, +<<<<<<< TREE Glib::ustring const * documentUnit, Geom::Satellite satellite) +======= + Glib::ustring documentUnit) +>>>>>>> MERGE-SOURCE { FilletChamferPropertiesDialog *dialog = new FilletChamferPropertiesDialog(); @@ -174,7 +178,7 @@ void FilletChamferPropertiesDialog::_apply() } d_pos = d_pos / 100; } else { - d_pos = Inkscape::Util::Quantity::convert(d_pos, unit, *document_unit); + d_pos = Inkscape::Util::Quantity::convert(d_pos, unit, document_unit); } _satellite.setAmount( d_pos); unsigned int steps = (unsigned int)_fillet_chamfer_chamfer_subdivisions.get_value(); @@ -230,7 +234,7 @@ void FilletChamferPropertiesDialog::_set_satellite(Geom::Satellite satellite) std::string posConcat = Glib::ustring::compose (_("%1 (%2):"), distance_or_radius, unit); _fillet_chamfer_position_label.set_label(_(posConcat.c_str())); position = amount; - position = Inkscape::Util::Quantity::convert(position, *document_unit, unit); + position = Inkscape::Util::Quantity::convert(position, document_unit, unit); } _fillet_chamfer_position_numeric.set_value(position); if (satellite.getSatelliteType() == Geom::F) { @@ -261,6 +265,7 @@ void FilletChamferPropertiesDialog::_set_unit(const gchar *abbr) unit = abbr; } +<<<<<<< TREE void FilletChamferPropertiesDialog::_set_amount(double amm) { amount = amm; @@ -270,6 +275,9 @@ void FilletChamferPropertiesDialog::_set_amount(double amm) void FilletChamferPropertiesDialog::_set_document_unit(Glib::ustring const *abbr) +======= +void FilletChamferPropertiesDialog::_set_document_unit(Glib::ustring abbr) +>>>>>>> MERGE-SOURCE { document_unit = abbr; } diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.h b/src/ui/dialog/lpe-fillet-chamfer-properties.h index 6051b49d3..533f7af2a 100644 --- a/src/ui/dialog/lpe-fillet-chamfer-properties.h +++ b/src/ui/dialog/lpe-fillet-chamfer-properties.h @@ -33,7 +33,7 @@ public: const gchar *unit, bool use_distance, bool aprox_radius, - Glib::ustring const * documentUnit, + Glib::ustring documentUnit, Geom::Satellite satellite); protected: @@ -69,7 +69,7 @@ protected: void _set_pt(const Inkscape::LivePathEffect:: FilletChamferKnotHolderEntity *pt); void _set_unit(const gchar *abbr); - void _set_document_unit(Glib::ustring const * abbr); + void _set_document_unit(Glib::ustring abbr); void _set_use_distance(bool use_knot_distance); void _set_aprox(bool aprox_radius); void _apply(); @@ -77,7 +77,7 @@ protected: bool _flexible; Geom::Satellite _satellite; const gchar *unit; - Glib::ustring const * document_unit; + Glib::ustring document_unit; bool use_distance; double amount; bool aprox; |