#include "InsetGraphicsParams.h"
-#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/debug.h"
#include "support/filetools.h"
#include "support/lyxlib.h"
#include "support/lstrings.h"
#include "support/Translator.h"
+#include <ostream>
-namespace lyx {
-
-using support::float_equal;
-using support::readBB_from_PSFile;
-using support::token;
+using namespace std;
+using namespace lyx::support;
-using std::string;
-using std::ostream;
+namespace lyx {
InsetGraphicsParams::InsetGraphicsParams()
}
-InsetGraphicsParams &
-InsetGraphicsParams::operator=(InsetGraphicsParams const & params)
+void InsetGraphicsParams::operator=(InsetGraphicsParams const & params)
{
// Are we assigning the object into itself?
if (this == ¶ms)
- return *this;
+ return;
copy(params);
- return *this;
}
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
rotateAngle = "0"; // angle of rotation in degrees
rotateOrigin.erase(); // Origin of rotation
- subcaption = false; // subfigure
- subcaptionText.erase(); // subfigure caption
special.erase(); // additional userdefined stuff
}
keepAspectRatio = igp.keepAspectRatio;
draft = igp.draft;
noUnzip = igp.noUnzip;
+ scaleBeforeRotation = igp.scaleBeforeRotation;
bb = igp.bb;
clip = igp.clip;
rotateAngle = igp.rotateAngle;
rotateOrigin = igp.rotateOrigin;
- subcaption = igp.subcaption;
- subcaptionText = igp.subcaptionText;
special = igp.special;
}
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 &&
left.keepAspectRatio == right.keepAspectRatio &&
left.draft == right.draft &&
left.noUnzip == right.noUnzip &&
-
+ left.scaleBeforeRotation == right.scaleBeforeRotation &&
left.bb == right.bb &&
left.clip == right.clip &&
left.rotateAngle == right.rotateAngle &&
left.rotateOrigin == right.rotateOrigin &&
- left.subcaption == right.subcaption &&
- left.subcaptionText == right.subcaptionText &&
- left.special == right.special
- )
- return true;
-
- return false;
+ left.special == right.special;
}
}
-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 << "\tembed " << (filename.embedded() ? filename.inzipName() : "\"\"") << '\n';
}
if (lyxscale != 100)
os << "\tlyxscale " << lyxscale << '\n';
os << "\tdraft\n";
if (noUnzip)
os << "\tnoUnzip\n";
+ if (scaleBeforeRotation)
+ os << "\tscaleBeforeRotation\n";
if (!bb.empty()) // bounding box
os << "\tBoundingBox " << bb << '\n';
os << "\trotateAngle " << rotateAngle << '\n';
if (!rotateOrigin.empty())
os << "\trotateOrigin " << rotateOrigin << '\n';
- if (subcaption)
- os << "\tsubcaption\n";
- if (!subcaptionText.empty())
- os << "\tsubcaptionText \"" << subcaptionText << '\"' << '\n';
if (!special.empty())
os << "\tspecial " << special << '\n';
}
-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 == "embed") {
+ lex.next();
+ string const name = lex.getString();
+ filename.setInzipName(name);
+ filename.setEmbed(!name.empty());
} else if (token == "lyxscale") {
lex.next();
lyxscale = lex.getInteger();
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;
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) {
} else if (token == "rotateOrigin") {
lex.next();
rotateOrigin=lex.getString();
- } else if (token == "subcaption") {
- subcaption = true;
- } else if (token == "subcaptionText") {
- lex.eatLine();
- string sub = lex.getString();
- // strip surrounding " "
- subcaptionText = sub.substr(1, sub.length() - 2);
} else if (token == "special") {
lex.eatLine();
special = lex.getString();
graphics::Params InsetGraphicsParams::as_grfxParams() const
{
graphics::Params pars;
- pars.filename = filename;
+ pars.filename = filename.availableFile();
+ pars.icon = filename.embedded() ? "pin.png" : "";
pars.scale = lyxscale;
pars.angle = convert<double>(rotateAngle);
// Get the original Bounding Box from the file
string const tmp = readBB_from_PSFile(filename);
- LYXERR(Debug::GRAPHICS) << "BB_from_File: " << tmp << std::endl;
+ LYXERR(Debug::GRAPHICS, "BB_from_File: " << tmp);
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;
}
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;
}
projects / lyx.git / blobdiff