The speed patch: redraw only rows that have changed

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

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index 12ab7177709bbfd5c069082726a9c8747dd604cc..c0e140316c02189689f0036aac80bc42a9793483 100644 (file)
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -4,40 +4,36 @@
  * 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/convert.h"
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "support/LOstream.h"
-#include "support/LAssert.h"
 #include "support/lstrings.h"
 #include "support/translator.h"
-#include "lyxrc.h"
-#include "debug.h"
-#include "lyxlex.h"
-#include "frontends/lyx_gui.h"
 
-using namespace lyx::support;
+using lyx::support::float_equal;
+using lyx::support::readBB_from_PSFile;
+using lyx::support::token;
 
+using std::string;
 using std::ostream;
 
-namespace lyx {
-namespace graphics {
-/// The translator between the DisplayType and the corresponding lyx string.
-extern Translator<DisplayType, string> displayTranslator;
-}
-}
-
 
 InsetGraphicsParams::InsetGraphicsParams()
 {
@@ -70,7 +66,7 @@ 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
+       scale = string();                       // output scaling in percentage
        width = LyXLength();
        height = LyXLength();
        keepAspectRatio = false;        // for LaTeX output
@@ -80,7 +76,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
@@ -128,7 +124,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 &&
@@ -157,9 +153,9 @@ 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))
+               os << "\tdisplay " << lyx::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())
@@ -180,7 +176,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<double>(rotateAngle), 0.0, 0.001))
                os << "\trotateAngle " << rotateAngle << '\n';
        if (!rotateOrigin.empty())
                os << "\trotateOrigin " << rotateOrigin << '\n';
@@ -204,18 +201,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 = lyx::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") {
@@ -234,7 +231,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();
@@ -269,7 +266,7 @@ lyx::graphics::Params InsetGraphicsParams::as_grfxParams() const
        lyx::graphics::Params pars;
        pars.filename = filename.absFilename();
        pars.scale = lyxscale;
-       pars.angle = rotateAngle;
+       pars.angle = convert<double>(rotateAngle);
 
        if (clip) {
                pars.bb = bb;
@@ -278,8 +275,11 @@ lyx::graphics::Params InsetGraphicsParams::as_grfxParams() const
                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));
-                       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)