* 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>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#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 "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;
+
InsetGraphicsParams::InsetGraphicsParams()
{
init();
}
+
InsetGraphicsParams::InsetGraphicsParams(InsetGraphicsParams const & igp)
{
// I decided to skip the initialization since the copy will overwrite
copy(igp);
}
+
InsetGraphicsParams &
InsetGraphicsParams::operator=(InsetGraphicsParams const & params)
{
// Are we assigning the object into itself?
if (this == ¶ms)
- return * this;
+ return *this;
copy(params);
return *this;
}
+
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();
special.erase(); // additional userdefined stuff
}
+
void InsetGraphicsParams::copy(InsetGraphicsParams const & igp)
{
filename = igp.filename;
special = igp.special;
}
+
bool operator==(InsetGraphicsParams const & left,
InsetGraphicsParams const & right)
{
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 &&
return false;
}
+
bool operator!=(InsetGraphicsParams const & left,
InsetGraphicsParams const & right)
{
return !(left == right);
}
-void InsetGraphicsParams::Write(ostream & os) const
+
+void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const
{
// Do not write the default values
if (!filename.empty()) {
- os << "\tfilename " << filename << '\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())
}
-bool InsetGraphicsParams::Read(LyXLex & lex, string const & token)
+bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const & bufpath)
{
if (token == "filename") {
lex.eatLine();
- filename = lex.getString();
+ 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();
} else if (token == "subcaption") {
subcaption = true;
} else if (token == "subcaptionText") {
- lex.next();
- subcaptionText = lex.getString();
+ lex.eatLine();
+ string sub = lex.getString();
+ // strip surrounding " "
+ subcaptionText = sub.substr(1, sub.length() - 2);
} else if (token == "special") {
lex.eatLine();
special = lex.getString();
}
-grfx::Params InsetGraphicsParams::as_grfxParams(string const & filepath) 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;
- if (!filepath.empty())
- pars.filename = MakeAbsPath(pars.filename, filepath);
-
if (clip) {
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));
}
}
- if (display == grfx::DefaultDisplay) {
+ if (display == lyx::graphics::DefaultDisplay) {
pars.display = lyxrc.display_graphics;
} else {
pars.display = display;
}
// Override the above if we're not using a gui
- if (!lyxrc.use_gui) {
- pars.display = grfx::NoDisplay;
+ if (!lyx_gui::use_gui) {
+ pars.display = lyx::graphics::NoDisplay;
}
return pars;
projects / lyx.git / blobdiff