Use real world units for page sizes.

(bzr r12475.1.1)

6 files changed, 110 insertions, 43 deletions

diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp
index ea438e91a..359884f05 100644
--- a/src/svg/svg-length.cpp
+++ b/src/svg/svg-length.cpp
@@ -367,7 +367,7 @@ static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit,
                     *unit = SVGLength::PT;
                 }
                 if (computed) {
-                    *computed = v * Inkscape::Util::Quantity::convert(1, "pt", "px");
+                    *computed = Inkscape::Util::Quantity::convert(v, "pt", "px");
                 }
                 break;
             case UVAL('p','c'):
@@ -375,7 +375,7 @@ static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit,
                     *unit = SVGLength::PC;
                 }
                 if (computed) {
-                    *computed = v * Inkscape::Util::Quantity::convert(1, "pc", "px");
+                    *computed = Inkscape::Util::Quantity::convert(v, "pc", "px");
                 }
                 break;
             case UVAL('m','m'):
@@ -383,7 +383,7 @@ static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit,
                     *unit = SVGLength::MM;
                 }
                 if (computed) {
-                    *computed = v * Inkscape::Util::Quantity::convert(1, "mm", "px");
+                    *computed = Inkscape::Util::Quantity::convert(v, "mm", "px");
                 }
                 break;
             case UVAL('c','m'):
@@ -391,7 +391,7 @@ static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit,
                     *unit = SVGLength::CM;
                 }
                 if (computed) {
-                    *computed = v * Inkscape::Util::Quantity::convert(1, "cm", "px");
+                    *computed = Inkscape::Util::Quantity::convert(v, "cm", "px");
                 }
                 break;
             case UVAL('i','n'):
@@ -399,7 +399,7 @@ static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit,
                     *unit = SVGLength::INCH;
                 }
                 if (computed) {
-                    *computed = v * Inkscape::Util::Quantity::convert(1, "in", "px");
+                    *computed = Inkscape::Util::Quantity::convert(v, "in", "px");
                 }
                 break;
             case UVAL('f','t'):
@@ -407,7 +407,7 @@ static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit,
                     *unit = SVGLength::FOOT;
                 }
                 if (computed) {
-                    *computed = v * Inkscape::Util::Quantity::convert(1, "ft", "px");
+                    *computed = Inkscape::Util::Quantity::convert(v, "ft", "px");
                 }
                 break;
             case UVAL('e','m'):
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 77fb182e5..430f28474 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -1433,9 +1433,33 @@ void DocumentProperties::update()
     if (nv->doc_units)
         _rum_deflt.setUnit (nv->doc_units->abbr);
 
-    double const doc_w_px = sp_desktop_document(dt)->getWidth();
-    double const doc_h_px = sp_desktop_document(dt)->getHeight();
-    _page_sizer.setDim (doc_w_px, doc_h_px);
+    double const doc_w = sp_desktop_document(dt)->getRoot()->width.value;
+    Glib::ustring doc_w_unit = unit_table.getUnit(sp_desktop_document(dt)->getRoot()->width.unit).abbr;
+    if (doc_w_unit == "") {
+        if (nv->units) {
+            doc_w_unit = nv->units->abbr;
+        } else {
+            if (nv->doc_units) {
+                doc_w_unit = nv->doc_units->abbr;
+            } else {
+                doc_w_unit = "px";
+            }
+        }
+    }
+    double const doc_h = sp_desktop_document(dt)->getRoot()->height.value;
+    Glib::ustring doc_h_unit = unit_table.getUnit(sp_desktop_document(dt)->getRoot()->height.unit).abbr;
+    if (doc_h_unit == "") {
+        if (nv->units) {
+            doc_h_unit = nv->units->abbr;
+        } else {
+            if (nv->doc_units) {
+                doc_h_unit = nv->doc_units->abbr;
+            } else {
+                doc_h_unit = "px";
+            }
+        }
+    }
+    _page_sizer.setDim(Inkscape::Util::Quantity(doc_w, doc_w_unit), Inkscape::Util::Quantity(doc_h, doc_h_unit));
     _page_sizer.updateFitMarginsUI(nv->getRepr());
 
     //-----------------------------------------------------------guide page
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 8287452d7..5a289096c 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -442,6 +442,7 @@ PageSizer::init ()
     _portrait_connection = _portraitButton.signal_toggled().connect (sigc::mem_fun (*this, &PageSizer::on_portrait));
     _changedw_connection = _dimensionWidth.signal_value_changed().connect (sigc::mem_fun (*this, &PageSizer::on_value_changed));
     _changedh_connection = _dimensionHeight.signal_value_changed().connect (sigc::mem_fun (*this, &PageSizer::on_value_changed));
+    _changedu_connection = _dimensionUnits.getUnitMenu()->signal_changed().connect (sigc::mem_fun (*this, &PageSizer::on_units_changed));
     _fitPageButton.signal_clicked().connect(sigc::mem_fun(*this, &PageSizer::fire_fit_canvas_to_selection_or_drawing));
 
     show_all_children();
@@ -454,11 +455,11 @@ PageSizer::init ()
  * 'changeList' is true, then adjust the paperSizeList to show the closest
  * standard page size.
  *
- * \param w, h given in px
+ * \param w, h
  * \param changeList whether to modify the paper size list
  */
 void
-PageSizer::setDim (double w, double h, bool changeList)
+PageSizer::setDim (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h, bool changeList)
 {
     static bool _called = false;
     if (_called) {
@@ -476,19 +477,19 @@ PageSizer::setDim (double w, double h, bool changeList)
     if (SP_ACTIVE_DESKTOP && !_widgetRegistry->isUpdating()) {
         SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
         double const old_height = doc->getHeight();
-        doc->setWidth (Inkscape::Util::Quantity(w, "px"));
-        doc->setHeight (Inkscape::Util::Quantity(h, "px"));
+        doc->setWidth (w);
+        doc->setHeight (h);
         // The origin for the user is in the lower left corner; this point should remain stationary when
         // changing the page size. The SVG's origin however is in the upper left corner, so we must compensate for this
-        Geom::Translate const vert_offset(Geom::Point(0, (old_height - h)));
+        Geom::Translate const vert_offset(Geom::Point(0, (old_height - h.quantity)));
         doc->getRoot()->translateChildItems(vert_offset);
         DocumentUndo::done(doc, SP_VERB_NONE, _("Set page size"));
     }
 
-    if ( w != h ) {
+    if ( w.quantity != h.quantity ) {
         _landscapeButton.set_sensitive(true);
         _portraitButton.set_sensitive (true);
-        _landscape = ( w > h );
+        _landscape = ( w.quantity > h.quantity );
         _landscapeButton.set_active(_landscape ? true : false);
         _portraitButton.set_active (_landscape ? false : true);
     } else {
@@ -503,9 +504,10 @@ PageSizer::setDim (double w, double h, bool changeList)
             _paperSizeListSelection->select(row);
         }
 
-    Unit const& unit = _dimensionUnits.getUnit();
-    _dimensionWidth.setValue (w / unit.factor);
-    _dimensionHeight.setValue (h / unit.factor);
+    _dimensionWidth.setUnit(w.unit->abbr);
+    _dimensionWidth.setValue (w.quantity);
+    _dimensionHeight.setUnit(h.unit->abbr);
+    _dimensionHeight.setValue (h.quantity);
 
     _paper_size_list_connection.unblock();
     _landscape_connection.unblock();
@@ -547,12 +549,12 @@ PageSizer::updateFitMarginsUI(Inkscape::XML::Node *nv_repr)
  * paperSizeListStore->children().end() if no such paper exists.
  */
 Gtk::ListStore::iterator
-PageSizer::find_paper_size (double w, double h) const
+PageSizer::find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h) const
 {
-    double smaller = w;
-    double larger  = h;
-    if ( h < w ) {
-        smaller = h; larger = w;
+    double smaller = w.quantity;
+    double larger  = h.quantity;
+    if ( h.quantity < w.quantity ) {
+        smaller = h.quantity; larger = w.quantity;
     }
 
     g_return_val_if_fail(smaller <= larger, _paperSizeListStore->children().end());
@@ -562,8 +564,8 @@ PageSizer::find_paper_size (double w, double h) const
          iter != _paperSizeTable.end() ; ++iter) {
         PaperSize paper = iter->second;
         Inkscape::Util::Unit const &i_unit = paper.unit;
-        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, i_unit, "px");
-        double largeX = Inkscape::Util::Quantity::convert(paper.larger, i_unit, "px");
+        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, i_unit, *w.unit);
+        double largeX = Inkscape::Util::Quantity::convert(paper.larger, i_unit, *w.unit);
 
         g_return_val_if_fail(smallX <= largeX, _paperSizeListStore->children().end());
 
@@ -643,8 +645,8 @@ PageSizer::on_paper_size_list_changed()
         return;
     }
     PaperSize paper = piter->second;
-    double w = paper.smaller;
-    double h = paper.larger;
+    Inkscape::Util::Quantity w = Inkscape::Util::Quantity(paper.smaller, paper.unit);
+    Inkscape::Util::Quantity h = Inkscape::Util::Quantity(paper.larger, paper.unit);
 
     if (std::find(lscape_papers.begin(), lscape_papers.end(), paper.name.c_str()) != lscape_papers.end()) {
         // enforce landscape mode if this is desired for the given page format
@@ -654,9 +656,6 @@ PageSizer::on_paper_size_list_changed()
         _landscape = _landscapeButton.get_active();
     }
 
-    w = Inkscape::Util::Quantity::convert(w, paper.unit, "px");
-    h = Inkscape::Util::Quantity::convert(h, paper.unit, "px");
-
     if (_landscape)
         setDim (h, w, false);
     else
@@ -673,9 +672,9 @@ PageSizer::on_portrait()
 {
     if (!_portraitButton.get_active())
         return;
-    double w = _dimensionWidth.getValue ("px");
-    double h = _dimensionHeight.getValue ("px");
-    if (h < w) {
+    Inkscape::Util::Quantity w = Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionWidth.getUnit());
+    Inkscape::Util::Quantity h = Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionHeight.getUnit());
+    if (h.quantity < w.quantity) {
         setDim (h, w);
     }
 }
@@ -689,9 +688,9 @@ PageSizer::on_landscape()
 {
     if (!_landscapeButton.get_active())
         return;
-    double w = _dimensionWidth.getValue ("px");
-    double h = _dimensionHeight.getValue ("px");
-    if (w < h) {
+    Inkscape::Util::Quantity w = Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionWidth.getUnit());
+    Inkscape::Util::Quantity h = Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionHeight.getUnit());
+    if (w.quantity < h.quantity) {
         setDim (h, w);
     }
 }
@@ -703,11 +702,17 @@ void
 PageSizer::on_value_changed()
 {
     if (_widgetRegistry->isUpdating()) return;
-
-    setDim (_dimensionWidth.getValue("px"),
-            _dimensionHeight.getValue("px"));
+    if (_unit != _dimensionUnits.getUnit().abbr) return;
+    setDim (Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionUnits.getUnit()),
+            Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionUnits.getUnit()));
+}
+void
+PageSizer::on_units_changed()
+{
+    _unit = _dimensionUnits.getUnit().abbr;
+    setDim (Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionUnits.getUnit()),
+            Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionUnits.getUnit()));
 }
-
 
 } // namespace Widget
 } // namespace UI
diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h
index 34ed7592d..95836a005 100644
--- a/src/ui/widget/page-sizer.h
+++ b/src/ui/widget/page-sizer.h
@@ -161,7 +161,7 @@ public:
      * Set the page size to the given dimensions.  If 'changeList' is
      * true, then reset the paper size list to the closest match
      */
-    void setDim (double w, double h, bool changeList=true);
+    void setDim (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h, bool changeList=true);
     
     /**
      * Updates the scalar widgets for the fit margins.  (Just changes the value
@@ -179,7 +179,7 @@ protected:
     /**
      *	Find the closest standard paper size in the table, to the
      */
-    Gtk::ListStore::iterator find_paper_size (double w, double h) const;
+    Gtk::ListStore::iterator find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h) const;
  
     void fire_fit_canvas_to_selection_or_drawing();
     
@@ -252,13 +252,17 @@ protected:
 
     //callback
     void on_value_changed();
+    void on_units_changed();
     sigc::connection    _changedw_connection;
     sigc::connection    _changedh_connection;
+    sigc::connection    _changedu_connection;
 
     Registry            *_widgetRegistry;
 
     //### state - whether we are currently landscape or portrait
     bool                 _landscape;
+    
+    Glib::ustring       _unit;
 
 };
 
diff --git a/src/util/units.cpp b/src/util/units.cpp
index 7bc910fcc..e7be3f5e6 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -220,6 +220,36 @@ Unit UnitTable::getUnit(Glib::ustring const &unit_abbr) const
         return Unit();
     }
 }
+Unit UnitTable::getUnit(SVGLength::Unit const u) const
+{
+    Glib::ustring u_str;
+    switch(u) {
+        case 1:
+            u_str = "px"; break;
+        case 2:
+            u_str = "pt"; break;
+        case 3:
+            u_str = "pc"; break;
+        case 4:
+            u_str = "mm"; break;
+        case 5:
+            u_str = "cm"; break;
+        case 6:
+            u_str = "in"; break;
+        case 7:
+            u_str = "ft"; break;
+        case 8:
+            u_str = "em"; break;
+        case 9:
+            u_str = "ex"; break;
+        case 10:
+            u_str = "%"; break;
+        default:
+            u_str = "";
+    }
+    
+    return getUnit(u_str);
+}
 
 Quantity UnitTable::getQuantity(Glib::ustring const& q) const
 {
diff --git a/src/util/units.h b/src/util/units.h
index bb202b96a..c5ee87ae3 100644
--- a/src/util/units.h
+++ b/src/util/units.h
@@ -28,6 +28,7 @@ Need to review the Units support that's in Gtkmm already...
 
 #include <map>
 #include <glibmm/ustring.h>
+#include "svg/svg.h"
 
 namespace Inkscape {
 namespace Util {
@@ -132,6 +133,9 @@ class UnitTable {
     /** Retrieve a given unit based on its string identifier */
     Unit    getUnit(Glib::ustring const &name) const;
     
+    /** Retrieve a given unit based on its SVGLength unit */
+    Unit    getUnit(SVGLength::Unit const u) const;
+    
     /** Retrieve a quantity based on its string identifier */
     Quantity getQuantity(Glib::ustring const &q) const;