X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fdistance.cpp;h=318e3d21b7893b5ea6a034248d99df65ee5f8ed3;hb=740253c894f69f0f4244119dce8818caee470942;hp=c1a7e65d15dd5816ab1e0d65cefb45731b3109f6;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/distance.cpp b/synfig-core/trunk/src/synfig/distance.cpp
index c1a7e65..318e3d2 100644
--- a/synfig-core/trunk/src/synfig/distance.cpp
+++ b/synfig-core/trunk/src/synfig/distance.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\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 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -38,7 +39,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -52,53 +53,53 @@ using namespace sinfg;
 
 /* === M E T H O D S ======================================================= */
 
-Distance::Distance(const sinfg::String& str)
+Distance::Distance(const synfig::String& str)
 {
 	(*this)=str;
 /*	int i(0);
 	float val;
 	int ret(strscanf(str,"%f%n",&val,&i));
-	sinfg::info("Distance::Distance(): ret=%d, val=%f",ret,val);
-	
+	synfig::info("Distance::Distance(): ret=%d, val=%f",ret,val);
+
 	if(ret<=0)
 	{
 		// Error
-		sinfg::error("Distance::Distance(): Bad value \"%s\"",str.c_str());
+		synfig::error("Distance::Distance(): Bad value \"%s\"",str.c_str());
 		value_=0;
 	}
 	else
 		value_=val;
-	
-	sinfg::info("Distance::Distance(): system=\"%s\"",String(str.begin()+i,str.end()).c_str());
+
+	synfig::info("Distance::Distance(): system=\"%s\"",String(str.begin()+i,str.end()).c_str());
 	system_=ident_system(String(str.begin()+i,str.end()));
 */
 }
 
 Distance&
-Distance::operator=(const sinfg::String& str)
+Distance::operator=(const synfig::String& str)
 {
 	int i(0);
 	float val;
 	int ret(strscanf(str,"%f%n",&val,&i));
-	sinfg::info("Distance::Distance(): ret=%d, val=%f",ret,val);
-	
+	synfig::info("Distance::Distance(): ret=%d, val=%f",ret,val);
+
 	if(ret<=0)
 	{
 		// Error
-		sinfg::error("Distance::Distance(): Bad value \"%s\"",str.c_str());
+		synfig::error("Distance::Distance(): Bad value \"%s\"",str.c_str());
 		return *this;
 	}
 	else
 		value_=val;
 
-	sinfg::String sys(str.begin()+i,str.end());
+	synfig::String sys(str.begin()+i,str.end());
 
 	if(sys.size())
 		system_=ident_system(sys);
 	return *this;
 }
 
-sinfg::String
+synfig::String
 Distance::get_string(int digits)const
 {
 	digits=min(9,max(0,digits));
@@ -120,10 +121,10 @@ 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
 {
@@ -183,17 +184,17 @@ Distance::meters_to_system(Real x,System target_system)
 }
 
 Distance::System // (static)
-Distance::ident_system(const sinfg::String& x)
+Distance::ident_system(const synfig::String& x)
 {
-	sinfg::String str;
+	synfig::String str;
 
 	// Make it all upper case, and remove white space
 	for(unsigned int i=0;i<x.size();i++)if(x[i]!=' ' && x[i]!='\t')str+=toupper(x[i]);
 
 	// If it is plural, make it singular
 	if(str[str.size()-1]=='S')
-		str=sinfg::String(str.begin(),str.end()-1);
-	
+		str=synfig::String(str.begin(),str.end()-1);
+
 	if(str.empty() || str=="U" || str=="UNIT")
 		return SYSTEM_UNITS;
 	if(str=="PX" || str=="PIXEL")
@@ -208,13 +209,13 @@ Distance::ident_system(const sinfg::String& x)
 		return SYSTEM_CENTIMETERS;
 	if(str=="MM" || str=="MILLIMETER")
 		return SYSTEM_MILLIMETERS;
-	
-	sinfg::warning("Distance::ident_system(): Unknown distance system \"%s\"",x.c_str());
-	
+
+	synfig::warning("Distance::ident_system(): Unknown distance system \"%s\"",x.c_str());
+
 	return SYSTEM_UNITS;
 }
 
-sinfg::String  // (static)
+synfig::String  // (static)
 Distance::system_name(Distance::System system)
 {
 	switch(system)
@@ -226,13 +227,13 @@ 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 sinfg::String();
+	return synfig::String();
 }
 
-sinfg::String  // (static)
+synfig::String  // (static)
 Distance::system_local_name(Distance::System system)
 {
 	switch(system)
@@ -244,8 +245,8 @@ 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 sinfg::String();
+	return synfig::String();
 }