Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / synfig / distance.cpp

diff --git a/synfig-core/trunk/src/synfig/distance.cpp b/synfig-core/trunk/src/synfig/distance.cpp
index 0878d27..efac8e9 100644 (file)
--- a/synfig-core/trunk/src/synfig/distance.cpp
+++ b/synfig-core/trunk/src/synfig/distance.cpp
@@ -2,10 +2,11 @@
 /*!    \file distance.cpp
 **     \brief Template File
 **
-**     $Id: distance.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -43,11 +44,15 @@ using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
-#define POINTS_PER_INCH        (72.0)
+#define POINTS_PER_INCH                  (72.0)
+#define INCHES_PER_METER         (39.3700787402)
+#define POINTS_PER_METER         (POINTS_PER_INCH*INCHES_PER_METER)
+#define CENTIMETERS_PER_METER (100.0)
+#define MILLIMETERS_PER_METER (1000.0)
 
-/* === G L O B A L S ======================================================= */
+#define METERS_PER_UNIT                  (rend_desc.get_physical_w()/abs(rend_desc.get_tl()[0]-rend_desc.get_br()[0]))
 
-#define METERS_PER_UNIT  (rend_desc.get_physical_w()/abs(rend_desc.get_tl()[0]-rend_desc.get_br()[0]))
+/* === G L O B A L S ======================================================= */
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -60,7 +65,7 @@ Distance::Distance(const synfig::String& str)
        float val;
        int ret(strscanf(str,"%f%n",&val,&i));
        synfig::info("Distance::Distance(): ret=%d, val=%f",ret,val);
-       
+
        if(ret<=0)
        {
                // Error
@@ -69,7 +74,7 @@ Distance::Distance(const synfig::String& str)
        }
        else
                value_=val;
-       
+
        synfig::info("Distance::Distance(): system=\"%s\"",String(str.begin()+i,str.end()).c_str());
        system_=ident_system(String(str.begin()+i,str.end()));
 */
@@ -81,8 +86,8 @@ Distance::operator=(const synfig::String& str)
        int i(0);
        float val;
        int ret(strscanf(str,"%f%n",&val,&i));
-       synfig::info("Distance::Distance(): ret=%d, val=%f",ret,val);
-       
+       // synfig::info("Distance::Distance(): ret=%d, val=%f",ret,val);
+
        if(ret<=0)
        {
                // Error
@@ -121,20 +126,20 @@ Distance::get(Distance::System target, const RendDesc& rend_desc)const
                return units(rend_desc);
        if(target==SYSTEM_PIXELS)
                return units(rend_desc)*METERS_PER_UNIT*rend_desc.get_x_res();
-       
-       return meters_to_system(meters(rend_desc),target);      
+
+       return meters_to_system(meters(rend_desc),target);
 }
-       
+
 Real
 Distance::meters()const
 {
        switch(system_)
        {
-               case SYSTEM_INCHES: return value_/39.3700787402;
-               case SYSTEM_POINTS: return value_/POINTS_PER_INCH/39.3700787402;
-               case SYSTEM_METERS: return value_;
-               case SYSTEM_CENTIMETERS: return value_/100.0;
-               case SYSTEM_MILLIMETERS: return value_/1000.0;
+               case SYSTEM_INCHES:              return value_/INCHES_PER_METER;
+               case SYSTEM_POINTS:              return value_/POINTS_PER_METER;
+               case SYSTEM_METERS:              return value_;
+               case SYSTEM_CENTIMETERS: return value_/CENTIMETERS_PER_METER;
+               case SYSTEM_MILLIMETERS: return value_/MILLIMETERS_PER_METER;
                default: throw BadSystem();
        }
 }
@@ -174,11 +179,11 @@ Distance::meters_to_system(Real x,System target_system)
 {
        switch(target_system)
        {
-               case SYSTEM_INCHES: return x*39.3700787402;
-               case SYSTEM_POINTS: return x*39.3700787402*POINTS_PER_INCH;
-               case SYSTEM_METERS: return x;
-               case SYSTEM_CENTIMETERS: return x*100.0;
-               case SYSTEM_MILLIMETERS: return x*1000.0;
+               case SYSTEM_INCHES:              return x*INCHES_PER_METER;
+               case SYSTEM_POINTS:              return x*POINTS_PER_METER;
+               case SYSTEM_METERS:              return x;
+               case SYSTEM_CENTIMETERS: return x*CENTIMETERS_PER_METER;
+               case SYSTEM_MILLIMETERS: return x*MILLIMETERS_PER_METER;
                default: throw BadSystem();
        }
 }
@@ -194,7 +199,7 @@ Distance::ident_system(const synfig::String& x)
        // If it is plural, make it singular
        if(str[str.size()-1]=='S')
                str=synfig::String(str.begin(),str.end()-1);
-       
+
        if(str.empty() || str=="U" || str=="UNIT")
                return SYSTEM_UNITS;
        if(str=="PX" || str=="PIXEL")
@@ -209,9 +214,9 @@ Distance::ident_system(const synfig::String& x)
                return SYSTEM_CENTIMETERS;
        if(str=="MM" || str=="MILLIMETER")
                return SYSTEM_MILLIMETERS;
-       
+
        synfig::warning("Distance::ident_system(): Unknown distance system \"%s\"",x.c_str());
-       
+
        return SYSTEM_UNITS;
 }
 
@@ -227,7 +232,7 @@ Distance::system_name(Distance::System system)
                case SYSTEM_METERS:             return "m";
                case SYSTEM_MILLIMETERS:        return "mm";
                case SYSTEM_CENTIMETERS:        return "cm";
-       
+
                default:                                throw BadSystem();
        }
        return synfig::String();
@@ -245,7 +250,7 @@ Distance::system_local_name(Distance::System system)
                case SYSTEM_METERS:             return _("Meters");
                case SYSTEM_MILLIMETERS:return _("Millimeters");
                case SYSTEM_CENTIMETERS:return _("Centimeters");
-       
+
                default:                                throw BadSystem();
        }
        return synfig::String();