Final touch 'inset display()'; fix 'is a bit silly' bug

[lyx.git] / src / insets / insetgraphicsParams.C

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index 3f6a1b395ba4595c257dfddfbcce99565e96f5bf..a38cca4177e3a2c86812b4f27612c1e4aea4b0dc 100644 (file)
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -4,28 +4,34 @@
  * 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>
 
-
 #include "insetgraphicsParams.h"
 
+#include "debug.h"
+#include "lyxlex.h"
+#include "lyxrc.h"
+
+#include "frontends/lyx_gui.h"
+
 #include "graphics/GraphicsParams.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 "frontends/lyx_gui.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;
 
 
@@ -59,7 +65,7 @@ void InsetGraphicsParams::init()
 {
        filename.erase();
        lyxscale = 100;                 // lyx scaling in percentage
-       display = grfx::DefaultDisplay; // display mode; see preferences
+       display = lyx::graphics::DefaultDisplay; // display mode; see preferences
        scale = 100.0;                  // output scaling in percentage
        width = LyXLength();
        height = LyXLength();
@@ -118,7 +124,7 @@ bool operator==(InsetGraphicsParams const & left,
            left.bb == right.bb &&
            left.clip == right.clip &&
 
-           lyx::float_equal(left.rotateAngle, right.rotateAngle, 0.001) &&
+           float_equal(left.rotateAngle, right.rotateAngle, 0.001) &&
            left.rotateOrigin == right.rotateOrigin &&
            left.subcaption == right.subcaption &&
            left.subcaptionText == right.subcaptionText &&
@@ -142,14 +148,14 @@ void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const
        // Do not write the default values
 
        if (!filename.empty()) {
-               os << "\tfilename " << MakeRelPath(filename, bufpath) << '\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 (!lyx::float_equal(scale, 0.0, 0.05)) {
-               if (!lyx::float_equal(scale, 100.0, 0.05))
+       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))
                        os << "\tscale " << scale << '\n';
        } else {
                if (!width.zero())
@@ -187,14 +193,14 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const
 {
        if (token == "filename") {
                lex.eatLine();
-               filename = MakeAbsPath(lex.getString(), bufpath);
+               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 = lyx::graphics::displayTranslator().find(type);
        } else if (token == "scale") {
                lex.next();
                scale = lex.getFloat();
@@ -254,10 +260,10 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const
 }
 
 
-grfx::Params InsetGraphicsParams::as_grfxParams() const
+lyx::graphics::Params InsetGraphicsParams::as_grfxParams() const
 {
-       grfx::Params pars;
-       pars.filename = filename;
+       lyx::graphics::Params pars;
+       pars.filename = filename.absFilename();
        pars.scale = lyxscale;
        pars.angle = rotateAngle;
 
@@ -265,7 +271,7 @@ grfx::Params InsetGraphicsParams::as_grfxParams() const
                pars.bb = bb;
 
                // Get the original Bounding Box from the file
-               string const tmp = readBB_from_PSFile(filename);
+               string const tmp = readBB_from_PSFile(filename.absFilename());
                lyxerr[Debug::GRAPHICS] << "BB_from_File: " << tmp << std::endl;
                if (!tmp.empty()) {
                        unsigned int const bb_orig_xl = strToInt(token(tmp, ' ', 0));
@@ -305,7 +311,7 @@ grfx::Params InsetGraphicsParams::as_grfxParams() const
                }
        }
 
-       if (display == grfx::DefaultDisplay) {
+       if (display == lyx::graphics::DefaultDisplay) {
                pars.display = lyxrc.display_graphics;
        } else {
                pars.display = display;
@@ -313,7 +319,7 @@ grfx::Params InsetGraphicsParams::as_grfxParams() const
 
        // Override the above if we're not using a gui
        if (!lyx_gui::use_gui) {
-               pars.display = grfx::NoDisplay;
+               pars.display = lyx::graphics::NoDisplay;
        }
 
        return pars;