188094 lines

[lyx.git] / src / insets / InsetGraphicsParams.cpp

diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp
index 2d9492afdd1d821abbf629ea04dee54661980d99..c9a01e5ca420d8653b2173a537633aa07d42af61 100644 (file)
--- a/src/insets/InsetGraphicsParams.cpp
+++ b/src/insets/InsetGraphicsParams.cpp
@@ -15,10 +15,12 @@
 
 #include "debug.h"
 #include "LyX.h" // for use_gui
-#include "LyXLex.h"
+#include "Lexer.h"
 #include "LyXRC.h"
+#include "Buffer.h"
 
 #include "graphics/GraphicsParams.h"
+#include "graphics/GraphicsTypes.h"
 
 #include "support/convert.h"
 #include "support/filetools.h"
@@ -32,6 +34,7 @@ namespace lyx {
 using support::float_equal;
 using support::readBB_from_PSFile;
 using support::token;
+using support::DocFileName;
 
 using std::string;
 using std::ostream;
@@ -69,11 +72,12 @@ void InsetGraphicsParams::init()
        lyxscale = 100;                 // lyx scaling in percentage
        display = graphics::DefaultDisplay; // display mode; see preferences
        scale = string("100");                  // output scaling in percentage
-       width = LyXLength();
-       height = LyXLength();
+       width = Length();
+       height = Length();
        keepAspectRatio = false;        // for LaTeX output
        draft = false;                  // draft mode
        noUnzip = false;                // unzip files
+       scaleBeforeRotation = false;    // scale image before rotating
 
        bb = string();                  // bounding box
        clip = false;                   // clip image
@@ -97,6 +101,7 @@ void InsetGraphicsParams::copy(InsetGraphicsParams const & igp)
        keepAspectRatio = igp.keepAspectRatio;
        draft = igp.draft;
        noUnzip = igp.noUnzip;
+       scaleBeforeRotation = igp.scaleBeforeRotation;
 
        bb = igp.bb;
        clip = igp.clip;
@@ -112,7 +117,7 @@ void InsetGraphicsParams::copy(InsetGraphicsParams const & igp)
 bool operator==(InsetGraphicsParams const & left,
                InsetGraphicsParams const & right)
 {
-       if (left.filename == right.filename &&
+       return left.filename == right.filename &&
            left.lyxscale == right.lyxscale &&
            left.display == right.display &&
            left.scale == right.scale &&
@@ -121,7 +126,7 @@ bool operator==(InsetGraphicsParams const & left,
            left.keepAspectRatio == right.keepAspectRatio &&
            left.draft == right.draft &&
            left.noUnzip == right.noUnzip &&
-
+           left.scaleBeforeRotation == right.scaleBeforeRotation &&
 
            left.bb == right.bb &&
            left.clip == right.clip &&
@@ -130,11 +135,7 @@ bool operator==(InsetGraphicsParams const & left,
            left.rotateOrigin == right.rotateOrigin &&
            left.subcaption == right.subcaption &&
            left.subcaptionText == right.subcaptionText &&
-           left.special == right.special
-          )
-               return true;
-
-       return false;
+           left.special == right.special;
 }
 
 
@@ -145,12 +146,13 @@ bool operator!=(InsetGraphicsParams const & left,
 }
 
 
-void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const
+void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const
 {
        // Do not write the default values
-
        if (!filename.empty()) {
-               os << "\tfilename " << filename.outputFilename(bufpath) << '\n';
+               os << "\tfilename " << filename.outputFilename(buffer.filePath()) << '\n';
+               os << "\tinzipName " << filename.inzipName() << '\n';
+               os << "\tembed " << (filename.embedded() ? "true" : "false") << '\n';
        }
        if (lyxscale != 100)
                os << "\tlyxscale " << lyxscale << '\n';
@@ -172,6 +174,8 @@ void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const
                os << "\tdraft\n";
        if (noUnzip)
                os << "\tnoUnzip\n";
+       if (scaleBeforeRotation)
+               os << "\tscaleBeforeRotation\n";
 
        if (!bb.empty())                // bounding box
                os << "\tBoundingBox " << bb << '\n';
@@ -192,11 +196,17 @@ void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const
 }
 
 
-bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const & bufpath)
+bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const & bufpath)
 {
        if (token == "filename") {
                lex.eatLine();
                filename.set(lex.getString(), bufpath);
+       } else if (token == "inzipName") {
+               lex.eatLine();
+               filename.setInzipName(lex.getString());
+       } else if (token == "embed") {
+               lex.next();
+               filename.setEmbed(lex.getBool());               
        } else if (token == "lyxscale") {
                lex.next();
                lyxscale = lex.getInteger();
@@ -209,11 +219,11 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const
                scale = lex.getString();
        } else if (token == "width") {
                lex.next();
-               width = LyXLength(lex.getString());
+               width = Length(lex.getString());
                scale = string();
        } else if (token == "height") {
                lex.next();
-               height = LyXLength(lex.getString());
+               height = Length(lex.getString());
                scale = string();
        } else if (token == "keepAspectRatio") {
                keepAspectRatio = true;
@@ -221,6 +231,8 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const
                draft = true;
        } else if (token == "noUnzip") {
                noUnzip = true;
+       } else if (token == "scaleBeforeRotation") {
+               scaleBeforeRotation = true;
        } else if (token == "BoundingBox") {
                bb.erase();
                for (int i = 0; i < 4; ++i) {
@@ -277,14 +289,12 @@ graphics::Params InsetGraphicsParams::as_grfxParams() const
                string const tmp = readBB_from_PSFile(filename);
                LYXERR(Debug::GRAPHICS) << "BB_from_File: " << tmp << std::endl;
                if (!tmp.empty()) {
-#ifdef WITH_WARNINGS
-# warning why not convert to unsigned int? (Lgb)
-#endif
+                       // FIXME: why not convert to unsigned int? (Lgb)
                        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)
+                       if (pars.bb.xl > bb_orig_xl)
                                pars.bb.xl -= bb_orig_xl;
                        else
                                pars.bb.xl = 0;
@@ -318,15 +328,14 @@ graphics::Params InsetGraphicsParams::as_grfxParams() const
        }
 
        if (display == graphics::DefaultDisplay) {
-               pars.display = lyxrc.display_graphics;
+               pars.display = graphics::DisplayType(lyxrc.display_graphics);
        } else {
                pars.display = display;
        }
 
        // Override the above if we're not using a gui
-       if (!use_gui) {
+       if (!use_gui)
                pars.display = graphics::NoDisplay;
-       }
 
        return pars;
 }