X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FinsetgraphicsParams.C;h=c0cdd5fae8826669aa6d68d3e2c1ae08c78acc69;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=2a4c0b00409672d184126cbe53f5a920a7006576;hpb=e1edfbe8a06e20c9d6d4a6017da2c7f13758f143;p=lyx.git

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index 2a4c0b0040..c0cdd5fae8 100644
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -4,37 +4,45 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voss
+ * \author Herbert Voß
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "insetgraphicsParams.h"
 
+#include "debug.h"
+#include "lyx_main.h" // for use_gui
+#include "lyxlex.h"
+#include "lyxrc.h"
+
 #include "graphics/GraphicsParams.h"
 
+#include "support/convert.h"
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "support/LOstream.h"
-#include "support/LAssert.h"
 #include "support/lstrings.h"
-#include "lyxrc.h"
-#include "debug.h"
-#include "lyxlex.h"
+#include "support/translator.h"
+
+
+namespace lyx {
+
+using support::float_equal;
+using support::readBB_from_PSFile;
+using support::token;
 
+using std::string;
 using std::ostream;
 
+
 InsetGraphicsParams::InsetGraphicsParams()
 {
 	init();
 }
 
+
 InsetGraphicsParams::InsetGraphicsParams(InsetGraphicsParams const & igp)
 {
 	// I decided to skip the initialization since the copy will overwrite
@@ -43,22 +51,24 @@ InsetGraphicsParams::InsetGraphicsParams(InsetGraphicsParams const & igp)
 	copy(igp);
 }
 
+
 InsetGraphicsParams &
 InsetGraphicsParams::operator=(InsetGraphicsParams const & params)
 {
 	// Are we assigning the object into itself?
 	if (this == &params)
-		return * this;
+		return *this;
 	copy(params);
 	return *this;
 }
 
+
 void InsetGraphicsParams::init()
 {
 	filename.erase();
 	lyxscale = 100;			// lyx scaling in percentage
-	display = grfx::DefaultDisplay;	// display mode; see preferences
-	scale = 100.0;			// output scaling in percentage
+	display = graphics::DefaultDisplay; // display mode; see preferences
+	scale = string();			// output scaling in percentage
 	width = LyXLength();
 	height = LyXLength();
 	keepAspectRatio = false;	// for LaTeX output
@@ -68,13 +78,14 @@ void InsetGraphicsParams::init()
 	bb = string();			// bounding box
 	clip = false;			// clip image
 
-	rotateAngle = 0.0;		// angle of rotation in degrees
+	rotateAngle = "0";		// angle of rotation in degrees
 	rotateOrigin.erase();		// Origin of rotation
 	subcaption = false;		// subfigure
 	subcaptionText.erase();		// subfigure caption
 	special.erase();		// additional userdefined stuff
 }
 
+
 void InsetGraphicsParams::copy(InsetGraphicsParams const & igp)
 {
 	filename = igp.filename;
@@ -97,6 +108,7 @@ void InsetGraphicsParams::copy(InsetGraphicsParams const & igp)
 	special = igp.special;
 }
 
+
 bool operator==(InsetGraphicsParams const & left,
 		InsetGraphicsParams const & right)
 {
@@ -114,7 +126,7 @@ bool operator==(InsetGraphicsParams const & left,
 	    left.bb == right.bb &&
 	    left.clip == right.clip &&
 
-	    lyx::float_equal(left.rotateAngle, right.rotateAngle, 0.001) &&
+	    left.rotateAngle == right.rotateAngle &&
 	    left.rotateOrigin == right.rotateOrigin &&
 	    left.subcaption == right.subcaption &&
 	    left.subcaptionText == right.subcaptionText &&
@@ -125,33 +137,35 @@ bool operator==(InsetGraphicsParams const & left,
 	return false;
 }
 
+
 bool operator!=(InsetGraphicsParams const & left,
 		InsetGraphicsParams const & right)
 {
 	return	!(left == right);
 }
 
-void InsetGraphicsParams::Write(ostream & os) const
+
+void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const
 {
 	// Do not write the default values
 
 	if (!filename.empty()) {
-		os << "\tfilename " << filename << '\n';
+		os << "\tfilename " << filename.outputFilename(bufpath) << '\n';
 	}
 	if (lyxscale != 100)
 		os << "\tlyxscale " << lyxscale << '\n';
-	if (display != grfx::DefaultDisplay)
-		os << "\tdisplay " << grfx::displayTranslator.find(display) << '\n';
-	if (scale) {
-		if (!lyx::float_equal(scale, 100.0, 0.05))
+	if (display != graphics::DefaultDisplay)
+		os << "\tdisplay " << graphics::displayTranslator().find(display) << '\n';
+	if (!scale.empty() && !float_equal(convert<double>(scale), 0.0, 0.05)) {
+		if (!float_equal(convert<double>(scale), 100.0, 0.05))
 			os << "\tscale " << scale << '\n';
 	} else {
 		if (!width.zero())
 			os << "\twidth " << width.asString() << '\n';
+		if (!height.zero())
+			os << "\theight " << height.asString() << '\n';
 	}
 
-	if (!height.zero())
-		os << "\theight " << height.asString() << '\n';
 	if (keepAspectRatio)
 		os << "\tkeepAspectRatio\n";
 	if (draft)			// draft mode
@@ -164,7 +178,8 @@ void InsetGraphicsParams::Write(ostream & os) const
 	if (clip)			// clip image
 		os << "\tclip\n";
 
-	if (rotateAngle != 0.0)
+	if (!rotateAngle.empty()
+		&& !float_equal(convert<double>(rotateAngle), 0.0, 0.001))
 		os << "\trotateAngle " << rotateAngle << '\n';
 	if (!rotateOrigin.empty())
 		os << "\trotateOrigin " << rotateOrigin << '\n';
@@ -177,28 +192,29 @@ void InsetGraphicsParams::Write(ostream & os) const
 }
 
 
-bool InsetGraphicsParams::Read(LyXLex & lex, string const & token)
+bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const & bufpath)
 {
 	if (token == "filename") {
 		lex.eatLine();
-		filename = lex.getString();
+		filename.set(lex.getString(), bufpath);
 	} else if (token == "lyxscale") {
 		lex.next();
 		lyxscale = lex.getInteger();
 	} else if (token == "display") {
 		lex.next();
 		string const type = lex.getString();
-		display = grfx::displayTranslator.find(type);
+		display = graphics::displayTranslator().find(type);
 	} else if (token == "scale") {
 		lex.next();
-		scale = lex.getFloat();
+		scale = lex.getString();
 	} else if (token == "width") {
 		lex.next();
 		width = LyXLength(lex.getString());
-		scale = 0.0;
+		scale = string();
 	} else if (token == "height") {
 		lex.next();
 		height = LyXLength(lex.getString());
+		scale = string();
 	} else if (token == "keepAspectRatio") {
 		keepAspectRatio = true;
 	} else if (token == "draft") {
@@ -206,23 +222,28 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token)
 	} else if (token == "noUnzip") {
 		noUnzip = true;
 	} else if (token == "BoundingBox") {
-		for (int i=0; i<4 ;i++) {
+		bb.erase();
+		for (int i = 0; i < 4; ++i) {
+			if (i != 0)
+				bb += ' ';
 			lex.next();
-			bb += (lex.getString()+" ");
+			bb += lex.getString();
 		}
 	} else if (token == "clip") {
 		clip = true;
 	} else if (token == "rotateAngle") {
 		lex.next();
-		rotateAngle = lex.getFloat();
+		rotateAngle = lex.getString();
 	} else if (token == "rotateOrigin") {
 		lex.next();
 		rotateOrigin=lex.getString();
 	} else if (token == "subcaption") {
 		subcaption = true;
 	} else if (token == "subcaptionText") {
-		lex.next();
-		subcaptionText = lex.getString();
+		lex.eatLine();
+		string sub = lex.getString();
+		// strip surrounding " "
+		subcaptionText = sub.substr(1, sub.length() - 2);
 	} else if (token == "special") {
 		lex.eatLine();
 		special = lex.getString();
@@ -242,15 +263,12 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token)
 }
 
 
-grfx::Params InsetGraphicsParams::as_grfxParams(string const & filepath) const
+graphics::Params InsetGraphicsParams::as_grfxParams() const
 {
-	grfx::Params pars;
+	graphics::Params pars;
 	pars.filename = filename;
 	pars.scale = lyxscale;
-	pars.angle = rotateAngle;
-
-	if (!filepath.empty())
-		pars.filename = MakeAbsPath(pars.filename, filepath);
+	pars.angle = convert<double>(rotateAngle);
 
 	if (clip) {
 		pars.bb = bb;
@@ -259,25 +277,28 @@ grfx::Params InsetGraphicsParams::as_grfxParams(string const & filepath) const
 		string const tmp = readBB_from_PSFile(filename);
 		lyxerr[Debug::GRAPHICS] << "BB_from_File: " << tmp << std::endl;
 		if (!tmp.empty()) {
-			unsigned int const bb_orig_xl = strToInt(token(tmp, ' ', 0));
-			unsigned int const bb_orig_yb = strToInt(token(tmp, ' ', 1));
+#ifdef WITH_WARNINGS
+# warning why not convert to unsigned int? (Lgb)
+#endif
+			unsigned int const bb_orig_xl = convert<int>(token(tmp, ' ', 0));
+			unsigned int const bb_orig_yb = convert<int>(token(tmp, ' ', 1));
 
-			// new pars.bb values must be >= zero 
+			// new pars.bb values must be >= zero
 			if  (pars.bb.xl > bb_orig_xl)
 				pars.bb.xl -= bb_orig_xl;
 			else
 				pars.bb.xl = 0;
-			
+
 			if (pars.bb.xr > bb_orig_xl)
 				pars.bb.xr -= bb_orig_xl;
 			else
 				pars.bb.xr = 0;
-				
+
 			if (pars.bb.yb > bb_orig_yb)
 				pars.bb.yb -= bb_orig_yb;
 			else
 				pars.bb.yb = 0;
-				
+
 			if (pars.bb.yt > bb_orig_yb)
 				pars.bb.yt -= bb_orig_yb;
 			else
@@ -295,17 +316,20 @@ grfx::Params InsetGraphicsParams::as_grfxParams(string const & filepath) const
 			pars.bb.yt = 0;
 		}
 	}
-	
-	if (display == grfx::DefaultDisplay) {
+
+	if (display == graphics::DefaultDisplay) {
 		pars.display = lyxrc.display_graphics;
 	} else {
 		pars.display = display;
 	}
-	
+
 	// Override the above if we're not using a gui
-	if (!lyxrc.use_gui) {
-		pars.display = grfx::NoDisplay;
+	if (!use_gui) {
+		pars.display = graphics::NoDisplay;
 	}
 
 	return pars;
 }
+
+
+} // namespace lyx