X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftags%2Fstable%2Fsrc%2Fsynfig%2Fdistance.cpp;h=efac8e93b47f48dfd89d7d7457d3c52864f35f46;hb=47fce282611fbba1044921d22ca887f9b53ad91a;hp=318e3d21b7893b5ea6a034248d99df65ee5f8ed3;hpb=d3408370fc3297609b3aa8d4ff7edf1f238df251;p=synfig.git

diff --git a/synfig-core/tags/stable/src/synfig/distance.cpp b/synfig-core/tags/stable/src/synfig/distance.cpp
index 318e3d2..efac8e9 100644
--- a/synfig-core/tags/stable/src/synfig/distance.cpp
+++ b/synfig-core/tags/stable/src/synfig/distance.cpp
@@ -6,6 +6,7 @@
 **
 **	\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 ================================================= */
 
@@ -81,7 +86,7 @@ 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)
 	{
@@ -130,11 +135,11 @@ 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();
 	}
 }