X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphicsParams.cpp;h=9f6ffbb901ecbca5e387869c83d887a247582622;hb=8124e6c02ea1fd6779bb6c47ffe2bca2c8bd2d97;hp=f4cd119f6e34ffd762e24c1bf3b8ce52d8a2ced4;hpb=9fe72c3501e966ea7e19f7229a37388de7171887;p=lyx.git diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp index f4cd119f6e..9f6ffbb901 100644 --- a/src/insets/InsetGraphicsParams.cpp +++ b/src/insets/InsetGraphicsParams.cpp @@ -19,7 +19,6 @@ #include "LyXRC.h" #include "graphics/epstools.h" -#include "graphics/GraphicsParams.h" #include "graphics/GraphicsTypes.h" #include "support/convert.h" @@ -51,12 +50,13 @@ InsetGraphicsParams::InsetGraphicsParams(InsetGraphicsParams const & igp) } -void InsetGraphicsParams::operator=(InsetGraphicsParams const & params) +InsetGraphicsParams & InsetGraphicsParams::operator=(InsetGraphicsParams const & params) { // Are we assigning the object into itself? if (this == ¶ms) - return; + return *this; copy(params); + return *this; } @@ -64,17 +64,17 @@ void InsetGraphicsParams::init() { filename.erase(); lyxscale = 100; // lyx scaling in percentage - display = true; // may be overriden by display mode in preferences + display = true; // may be overridden by display mode in preferences scale = string("100"); // output scaling in percentage 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 + bbox = graphics::BoundingBox(); // bounding box clip = false; // clip image + darkModeSensitive = false; // dark mode dependency rotateAngle = "0"; // angle of rotation in degrees rotateOrigin.erase(); // Origin of rotation @@ -83,26 +83,26 @@ void InsetGraphicsParams::init() } -void InsetGraphicsParams::copy(InsetGraphicsParams const & igp) +void InsetGraphicsParams::copy(InsetGraphicsParams const & params) { - filename = igp.filename; - lyxscale = igp.lyxscale; - display = igp.display; - scale = igp.scale; - width = igp.width; - height = igp.height; - keepAspectRatio = igp.keepAspectRatio; - draft = igp.draft; - noUnzip = igp.noUnzip; - scaleBeforeRotation = igp.scaleBeforeRotation; - - bb = igp.bb; - clip = igp.clip; - - rotateAngle = igp.rotateAngle; - rotateOrigin = igp.rotateOrigin; - special = igp.special; - groupId = igp.groupId; + filename = params.filename; + lyxscale = params.lyxscale; + display = params.display; + scale = params.scale; + width = params.width; + height = params.height; + keepAspectRatio = params.keepAspectRatio; + draft = params.draft; + scaleBeforeRotation = params.scaleBeforeRotation; + + bbox = params.bbox; + clip = params.clip; + darkModeSensitive = params.darkModeSensitive; + + rotateAngle = params.rotateAngle; + rotateOrigin = params.rotateOrigin; + special = params.special; + groupId = params.groupId; } @@ -117,11 +117,11 @@ bool operator==(InsetGraphicsParams const & left, left.height == right.height && left.keepAspectRatio == right.keepAspectRatio && left.draft == right.draft && - left.noUnzip == right.noUnzip && left.scaleBeforeRotation == right.scaleBeforeRotation && - left.bb == right.bb && + left.bbox == right.bbox && left.clip == right.clip && + left.darkModeSensitive == right.darkModeSensitive && left.rotateAngle == right.rotateAngle && left.rotateOrigin == right.rotateOrigin && @@ -146,6 +146,8 @@ void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const os << "\tlyxscale " << lyxscale << '\n'; if (!display) os << "\tdisplay false\n"; + if (darkModeSensitive) + os << "\tdarkModeSensitive\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'; @@ -160,13 +162,11 @@ void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const os << "\tkeepAspectRatio\n"; if (draft) // draft mode os << "\tdraft\n"; - if (noUnzip) - os << "\tnoUnzip\n"; if (scaleBeforeRotation) os << "\tscaleBeforeRotation\n"; - if (!bb.empty()) // bounding box - os << "\tBoundingBox " << bb << '\n'; + if (!bbox.empty()) // bounding box + os << "\tBoundingBox " << bbox << '\n'; if (clip) // clip image os << "\tclip\n"; @@ -182,18 +182,23 @@ void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const } -bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const & bufpath) +bool InsetGraphicsParams::Read(Lexer & lex, string const & token, + Buffer const & buf, bool allowOrigin) { if (token == "filename") { lex.eatLine(); - filename.set(lex.getString(), bufpath); + if (allowOrigin) + filename = buf.getReferencedFileName(lex.getString()); + else + filename.set(lex.getString(), buf.filePath()); } else if (token == "lyxscale") { lex.next(); lyxscale = lex.getInteger(); } else if (token == "display") { lex.next(); - string const type = lex.getString(); display = lex.getString() != "false"; + } else if (token == "darkModeSensitive") { + darkModeSensitive = true; } else if (token == "scale") { lex.next(); scale = lex.getString(); @@ -209,18 +214,17 @@ bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const & keepAspectRatio = true; } else if (token == "draft") { 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) { - if (i != 0) - bb += ' '; - lex.next(); - bb += lex.getString(); - } + lex.next(); + bbox.xl = Length(lex.getString()); + lex.next(); + bbox.yb = Length(lex.getString()); + lex.next(); + bbox.xr = Length(lex.getString()); + lex.next(); + bbox.yt = Length(lex.getString()); } else if (token == "clip") { clip = true; } else if (token == "rotateAngle") { @@ -259,7 +263,7 @@ graphics::Params InsetGraphicsParams::as_grfxParams() const pars.angle = convert(rotateAngle); if (clip) { - pars.bb = bb; + pars.bb = bbox; // Get the original Bounding Box from the file string const tmp = graphics::readBB_from_PSFile(filename); @@ -269,36 +273,34 @@ graphics::Params InsetGraphicsParams::as_grfxParams() const unsigned int const bb_orig_yb = convert(token(tmp, ' ', 1)); // new pars.bb values must be >= zero - if (pars.bb.xl > bb_orig_xl) - pars.bb.xl -= bb_orig_xl; + if (pars.bb.xl.inBP() > static_cast(bb_orig_xl)) + pars.bb.xl = Length(pars.bb.xl.inBP() - bb_orig_xl, Length::BP); else - pars.bb.xl = 0; + pars.bb.xl = Length(); - if (pars.bb.xr > bb_orig_xl) - pars.bb.xr -= bb_orig_xl; + if (pars.bb.xr.inBP() > static_cast(bb_orig_xl)) + pars.bb.xr = Length(pars.bb.xr.inBP() - bb_orig_xl, Length::BP); else - pars.bb.xr = 0; + pars.bb.xr = Length(); - if (pars.bb.yb > bb_orig_yb) - pars.bb.yb -= bb_orig_yb; + if (pars.bb.yb.inBP() > static_cast(bb_orig_yb)) + pars.bb.yb = Length(pars.bb.yb.inBP() - bb_orig_yb, Length::BP); else - pars.bb.yb = 0; + pars.bb.yb = Length(); - if (pars.bb.yt > bb_orig_yb) - pars.bb.yt -= bb_orig_yb; + if (pars.bb.yt.inBP() > static_cast(bb_orig_yb)) + pars.bb.yt = Length(pars.bb.yt.inBP() - bb_orig_yb, Length::BP); else - pars.bb.yt = 0; + pars.bb.yt = Length(); } // Paranoia check. - int const width = pars.bb.xr - pars.bb.xl; - int const height = pars.bb.yt - pars.bb.yb; - - if (width < 0 || height < 0) { - pars.bb.xl = 0; - pars.bb.xr = 0; - pars.bb.yb = 0; - pars.bb.yt = 0; + if (pars.bb.xr.inBP() < pars.bb.xl.inBP() + || pars.bb.yt.inBP() < pars.bb.yb.inBP()) { + pars.bb.xl = Length(); + pars.bb.xr = Length(); + pars.bb.yb = Length(); + pars.bb.yt = Length(); } }