X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FinsetgraphicsParams.C;h=c0cdd5fae8826669aa6d68d3e2c1ae08c78acc69;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=351d3f056844de17700f0e69f0dddec8a3cf2f12;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C index 351d3f0568..c0cdd5fae8 100644 --- a/src/insets/insetgraphicsParams.C +++ b/src/insets/insetgraphicsParams.C @@ -14,33 +14,27 @@ #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::strToInt; -using lyx::support::token; -using std::string; -using std::ostream; +namespace lyx { +using support::float_equal; +using support::readBB_from_PSFile; +using support::token; -namespace lyx { -namespace graphics { -/// The translator between the DisplayType and the corresponding lyx string. -extern Translator displayTranslator; -} -} +using std::string; +using std::ostream; InsetGraphicsParams::InsetGraphicsParams() @@ -73,8 +67,8 @@ void InsetGraphicsParams::init() { filename.erase(); lyxscale = 100; // lyx scaling in percentage - display = lyx::graphics::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 @@ -84,7 +78,7 @@ 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 @@ -132,7 +126,7 @@ bool operator==(InsetGraphicsParams const & left, left.bb == right.bb && left.clip == right.clip && - float_equal(left.rotateAngle, right.rotateAngle, 0.001) && + left.rotateAngle == right.rotateAngle && left.rotateOrigin == right.rotateOrigin && left.subcaption == right.subcaption && left.subcaptionText == right.subcaptionText && @@ -160,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 (!float_equal(scale, 0.0, 0.05)) { - if (!float_equal(scale, 100.0, 0.05)) + if (display != graphics::DefaultDisplay) + os << "\tdisplay " << graphics::displayTranslator().find(display) << '\n'; + if (!scale.empty() && !float_equal(convert(scale), 0.0, 0.05)) { + if (!float_equal(convert(scale), 100.0, 0.05)) os << "\tscale " << scale << '\n'; } else { if (!width.zero()) @@ -184,7 +178,8 @@ void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const if (clip) // clip image os << "\tclip\n"; - if (rotateAngle != 0.0) + if (!rotateAngle.empty() + && !float_equal(convert(rotateAngle), 0.0, 0.001)) os << "\trotateAngle " << rotateAngle << '\n'; if (!rotateOrigin.empty()) os << "\trotateOrigin " << rotateOrigin << '\n'; @@ -208,18 +203,18 @@ 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.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 = 0.0; + scale = string(); } else if (token == "keepAspectRatio") { keepAspectRatio = true; } else if (token == "draft") { @@ -238,7 +233,7 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const clip = true; } else if (token == "rotateAngle") { lex.next(); - rotateAngle = lex.getFloat(); + rotateAngle = lex.getString(); } else if (token == "rotateOrigin") { lex.next(); rotateOrigin=lex.getString(); @@ -268,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 = rotateAngle; + pars.angle = convert(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(token(tmp, ' ', 0)); + unsigned int const bb_orig_yb = convert(token(tmp, ' ', 1)); // new pars.bb values must be >= zero if (pars.bb.xl > bb_orig_xl) @@ -319,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