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

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index 22ef15bf38..c0cdd5fae8 100644
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -14,23 +14,24 @@
 #include "insetgraphicsParams.h"
 
 #include "debug.h"
+#include "lyx_main.h" // for use_gui
 #include "lyxlex.h"
 #include "lyxrc.h"
 
-#include "frontends/lyx_gui.h"
-
 #include "graphics/GraphicsParams.h"
 
+#include "support/convert.h"
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
 #include "support/translator.h"
 
-using lyx::support::float_equal;
-using lyx::support::readBB_from_PSFile;
-using lyx::support::strToDbl;
-using lyx::support::strToInt;
-using lyx::support::token;
+
+namespace lyx {
+
+using support::float_equal;
+using support::readBB_from_PSFile;
+using support::token;
 
 using std::string;
 using std::ostream;
@@ -66,7 +67,7 @@ void InsetGraphicsParams::init()
 {
 	filename.erase();
 	lyxscale = 100;			// lyx scaling in percentage
-	display = lyx::graphics::DefaultDisplay; // display mode; see preferences
+	display = graphics::DefaultDisplay; // display mode; see preferences
 	scale = string();			// output scaling in percentage
 	width = LyXLength();
 	height = LyXLength();
@@ -153,10 +154,10 @@ void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const
 	}
 	if (lyxscale != 100)
 		os << "\tlyxscale " << lyxscale << '\n';
-	if (display != lyx::graphics::DefaultDisplay)
-		os << "\tdisplay " << lyx::graphics::displayTranslator().find(display) << '\n';
-	if (!scale.empty() && !float_equal(strToDbl(scale), 0.0, 0.05)) {
-		if (!float_equal(strToDbl(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())
@@ -177,8 +178,8 @@ void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const
 	if (clip)			// clip image
 		os << "\tclip\n";
 
-	if (!rotateAngle.empty() 
-		&& !float_equal(strToDbl(rotateAngle), 0.0, 0.001))
+	if (!rotateAngle.empty()
+		&& !float_equal(convert<double>(rotateAngle), 0.0, 0.001))
 		os << "\trotateAngle " << rotateAngle << '\n';
 	if (!rotateOrigin.empty())
 		os << "\trotateOrigin " << rotateOrigin << '\n';
@@ -202,7 +203,7 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const
 	} else if (token == "display") {
 		lex.next();
 		string const type = lex.getString();
-		display = lyx::graphics::displayTranslator().find(type);
+		display = graphics::displayTranslator().find(type);
 	} else if (token == "scale") {
 		lex.next();
 		scale = lex.getString();
@@ -262,22 +263,25 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const
 }
 
 
-lyx::graphics::Params InsetGraphicsParams::as_grfxParams() const
+graphics::Params InsetGraphicsParams::as_grfxParams() const
 {
-	lyx::graphics::Params pars;
-	pars.filename = filename.absFilename();
+	graphics::Params pars;
+	pars.filename = filename;
 	pars.scale = lyxscale;
-	pars.angle = lyx::support::strToDbl(rotateAngle);
+	pars.angle = convert<double>(rotateAngle);
 
 	if (clip) {
 		pars.bb = bb;
 
 		// Get the original Bounding Box from the file
-		string const tmp = readBB_from_PSFile(filename.absFilename());
+		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
 			if  (pars.bb.xl > bb_orig_xl)
@@ -313,16 +317,19 @@ lyx::graphics::Params InsetGraphicsParams::as_grfxParams() const
 		}
 	}
 
-	if (display == lyx::graphics::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 (!lyx_gui::use_gui) {
-		pars.display = lyx::graphics::NoDisplay;
+	if (!use_gui) {
+		pars.display = graphics::NoDisplay;
 	}
 
 	return pars;
 }
+
+
+} // namespace lyx