Add precision to measure. Also change other scalar widgets to a .2 precision instead 3

(bzr r14393.1.26)

3 files changed, 62 insertions, 9 deletions

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 4bb8edcc3..57e519a0e 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -716,11 +716,15 @@ void MeasureTool::toMarkDimension()
     if (!unit_name.compare("")) {
         unit_name = "px";
     }
-    double fontsize = prefs->getInt("/tools/measure/fontsize")  * (96/72);
+    double fontsize = prefs->getInt("/tools/measure/fontsize")  * (96.0/72.0);
+    int precision = prefs->getInt("/tools/measure/precision");
+    std::stringstream precision_str;
+    precision_str.imbue(std::locale::classic());
+    precision_str <<  "%." << precision << "f %s";
     Geom::Point middle = Geom::middle_point(start, end);
     double totallengthval = (end_p - start_p).length();
     totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
-    gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
+    gchar *totallength_str = g_strdup_printf(precision_str.str().c_str(), totallengthval, unit_name.c_str());
     setLabelText(totallength_str, middle, fontsize, Geom::deg_to_rad(180) - ray.angle());
     doc->ensureUpToDate();
     DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add global measure line"));
@@ -1137,7 +1141,11 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         LabelPlacement &place = *it;
 
         // TODO cleanup memory, Glib::ustring, etc.:
-        gchar *measure_str = g_strdup_printf("%.2f %s", place.lengthVal, unit_name.c_str());
+        int precision = prefs->getInt("/tools/measure/precision");
+        std::stringstream precision_str;
+        precision_str.imbue(std::locale::classic());
+        precision_str <<  "%." << precision << "f %s";
+        gchar *measure_str = g_strdup_printf(precision_str.str().c_str(), place.lengthVal, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
                                        place.end,
@@ -1162,7 +1170,11 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
 
     {
         // TODO cleanup memory, Glib::ustring, etc.:
-        gchar *angle_str = g_strdup_printf("%.2f °", Geom::rad_to_deg(angle));
+        int precision = prefs->getInt("/tools/measure/precision");
+        std::stringstream precision_str;
+        precision_str.imbue(std::locale::classic());
+        precision_str <<  "%." << precision << "f °";
+        gchar *angle_str = g_strdup_printf(precision_str.str().c_str(), Geom::rad_to_deg(angle));
 
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
@@ -1187,7 +1199,11 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
 
         // TODO cleanup memory, Glib::ustring, etc.:
-        gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
+        int precision = prefs->getInt("/tools/measure/precision");
+        std::stringstream precision_str;
+        precision_str.imbue(std::locale::classic());
+        precision_str <<  "%." << precision << "f %s";
+        gchar *totallength_str = g_strdup_printf(precision_str.str().c_str(), totallengthval, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
                                        end_p + desktop->w2d(Geom::Point(3*fontsize, -fontsize)),
@@ -1211,7 +1227,11 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
 
         // TODO cleanup memory, Glib::ustring, etc.:
-        gchar *total_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
+        int precision = prefs->getInt("/tools/measure/precision");
+        std::stringstream precision_str;
+        precision_str.imbue(std::locale::classic());
+        precision_str <<  "%." << precision << "f %s";
+        gchar *total_str = g_strdup_printf(precision_str.str().c_str(), totallengthval, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
                                        desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * (dimension_offset * 2),
diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp
index 28f82ba44..8256abc76 100644
--- a/src/widgets/measure-toolbar.cpp
+++ b/src/widgets/measure-toolbar.cpp
@@ -102,6 +102,23 @@ sp_measure_offset_value_changed(GtkAdjustment *adj, GObject *tbl)
     }
 }
 
+
+static void
+sp_measure_precision_value_changed(GtkAdjustment *adj, GObject *tbl)
+{
+    SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data( tbl, "desktop" ));
+
+    if (DocumentUndo::getUndoSensitive(desktop->getDocument())) {
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        prefs->setInt(Glib::ustring("/tools/measure/precision"),
+            gtk_adjustment_get_value(adj));
+        MeasureTool *mt = get_measure_tool();
+        if (mt) {
+            mt->showCanvasItems();
+        }
+    }
+}
+
 static void measure_unit_changed(GtkAction* /*act*/, GObject* tbl)
 {
     UnitTracker* tracker = reinterpret_cast<UnitTracker*>(g_object_get_data(tbl, "tracker"));
@@ -212,8 +229,8 @@ void sp_measure_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, G
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          1, 36, 1.0, 4.0,
                                          0, 0, 0,
-                                         sp_measure_fontsize_value_changed);
-        gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
+                                         sp_measure_fontsize_value_changed, NULL, 0 , 2);
+        gtk_action_group_add_action( mainActions, GTK_ACTION(eact));
     }
 
     // units label
@@ -231,6 +248,20 @@ void sp_measure_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, G
         gtk_action_group_add_action( mainActions, act );
     }
 
+    /* Precission */
+    {
+        eact = create_adjustment_action( "MeasurePrecisionAction",
+                                         _("Precision"), _("Precision:"),
+                                         _("Decimal precision of measure"),
+                                         "/tools/measure/precision", 2,
+                                         GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
+                                         0, 10, 1, 0,
+                                         0, 0, 0,
+                                         sp_measure_precision_value_changed, NULL, 0 ,0);
+        gtk_action_group_add_action( mainActions, GTK_ACTION(eact));
+    }
+
+
     /* Offset */
     {
         eact = create_adjustment_action( "MeasureOffsetAction",
@@ -240,7 +271,7 @@ void sp_measure_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, G
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          0.0, 90000.0, 1.0, 4.0,
                                          0, 0, 0,
-                                         sp_measure_offset_value_changed);
+                                         sp_measure_offset_value_changed, NULL, 0 , 2);
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
     }
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index a2bd16978..e7dd69a28 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -339,6 +339,8 @@ static gchar const * ui_descr =
         "  <toolbar name='MeasureToolbar'>"
         "    <toolitem action='MeasureFontSizeAction' />"
         "    <separator />"
+        "    <toolitem action='MeasurePrecisionAction' />"
+        "    <separator />"
         "    <toolitem action='MeasureOffsetAction' />"
         "    <separator />"
         "    <toolitem action='measure_units_label' />"