#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "insets/insetgraphics.h"
#include "insets/insetgraphicsParams.h"
#include "graphics/GraphicsParams.h"
#include "lyxtext.h"
+#include "dimension.h"
#include "buffer.h"
#include "BufferView.h"
#include "converter.h"
-#include "frontends/Painter.h"
-#include "lyxrc.h"
-#include "frontends/font_metrics.h"
#include "debug.h"
+#include "format.h"
+#include "funcrequest.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
+#include "latexrunparams.h"
+#include "Lsstream.h"
#include "lyxlex.h"
+#include "lyxrc.h"
+#include "Lsstream.h"
+#include "frontends/lyx_gui.h"
#include "frontends/Alert.h"
#include "frontends/Dialogs.h"
+#include "frontends/font_metrics.h"
#include "frontends/LyXView.h"
-
-#include "frontends/controllers/helper_funcs.h" // getVectorFromString
+#include "frontends/Painter.h"
#include "support/LAssert.h"
#include "support/filetools.h"
#include "support/lyxalgo.h" // lyx::count
#include "support/lyxlib.h" // float_equal
#include "support/path.h"
+#include "support/tostr.h"
#include "support/systemcall.h"
#include "support/os.h"
+#include "support/lstrings.h"
#include <boost/weak_ptr.hpp>
#include <boost/bind.hpp>
#include <boost/signals/trackable.hpp>
-#include "BoostFormat.h"
#include <algorithm> // For the std::max
extern string system_tempdir;
+// set by Exporters
using std::ostream;
using std::endl;
string const uniqueID()
{
static unsigned int seed = 1000;
-
- ostringstream ost;
- ost << "graph" << ++seed;
-
- // Needed if we use lyxstring.
- return STRCONV(ost.str());
+ return "graph" + tostr(++seed);
}
-string findTargetFormat(string const & suffix)
+string findTargetFormat(string const & suffix, LatexRunParams const & runparams)
{
- // lyxrc.pdf_mode means:
- // Are we creating a PDF or a PS file?
- // (Should actually mean, are we using latex or pdflatex).
- if (lyxrc.pdf_mode) {
+ // Are we using latex or pdflatex).
+ if (runparams.flavor == LatexRunParams::PDFLATEX) {
lyxerr[Debug::GRAPHICS] << "findTargetFormat: PDF mode\n";
if (contains(suffix, "ps") || suffix == "pdf")
return "pdf";
- else if (suffix == "jpg") // pdflatex can use jpeg
+ if (suffix == "jpg") // pdflatex can use jpeg
return suffix;
- else
- return "png"; // and also png
+ return "png"; // and also png
}
// If it's postscript, we always do eps.
lyxerr[Debug::GRAPHICS] << "findTargetFormat: PostScript mode\n";
- if (suffix != "ps") // any other than ps
- return "eps"; // is changed to eps
- else
- return suffix; // let ps untouched
+ if (suffix != "ps") // any other than ps
+ return "eps"; // is changed to eps
+ return suffix; // let ps untouched
}
} // namespace anon
}
+Inset * InsetGraphics::clone(Buffer const & buffer, bool same_id) const
+{
+ return new InsetGraphics(*this, buffer.filePath(), same_id);
+}
+
+
InsetGraphics::~InsetGraphics()
{
- // Emits the hide signal to the dialog connected (if any)
- hideDialog();
+ InsetGraphicsMailer mailer(*this);
+ mailer.hideDialog();
+}
+
+
+dispatch_result InsetGraphics::localDispatch(FuncRequest const & cmd)
+{
+ switch (cmd.action) {
+ case LFUN_INSET_MODIFY: {
+ InsetGraphicsParams p;
+ InsetGraphicsMailer::string2params(cmd.argument, p);
+ if (!p.filename.empty()) {
+ string const filepath = cmd.view()->buffer()->filePath();
+ setParams(p, filepath);
+ cmd.view()->updateInset(this);
+ }
+ return DISPATCHED;
+ }
+
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetGraphicsMailer(*this).updateDialog(cmd.view());
+ return DISPATCHED;
+
+ case LFUN_INSET_EDIT:
+ case LFUN_MOUSE_RELEASE:
+ InsetGraphicsMailer(*this).showDialog(cmd.view());
+ return DISPATCHED;
+
+ default:
+ return Inset::localDispatch(cmd);
+ }
}
string const InsetGraphics::statusMessage() const
{
- string msg;
+ using namespace grfx;
switch (cache_->loader.status()) {
- case grfx::WaitingToLoad:
- msg = _("Waiting for draw request to start loading...");
- break;
- case grfx::Loading:
- msg = _("Loading...");
- break;
- case grfx::Converting:
- msg = _("Converting to loadable format...");
- break;
- case grfx::Loaded:
- msg = _("Loaded into memory. Must now generate pixmap.");
- break;
- case grfx::ScalingEtc:
- msg = _("Scaling etc...");
- break;
- case grfx::Ready:
- msg = _("Ready to display");
- break;
- case grfx::ErrorNoFile:
- msg = _("No file found!");
- break;
- case grfx::ErrorConverting:
- msg = _("Error converting to loadable format");
- break;
- case grfx::ErrorLoading:
- msg = _("Error loading file into memory");
- break;
- case grfx::ErrorGeneratingPixmap:
- msg = _("Error generating the pixmap");
- break;
- case grfx::ErrorUnknown:
- msg = _("No image");
- break;
+ case WaitingToLoad:
+ return _("Not shown.");
+ case Loading:
+ return _("Loading...");
+ case Converting:
+ return _("Converting to loadable format...");
+ case Loaded:
+ return _("Loaded into memory. Must now generate pixmap.");
+ case ScalingEtc:
+ return _("Scaling etc...");
+ case Ready:
+ return _("Ready to display");
+ case ErrorNoFile:
+ return _("No file found!");
+ case ErrorConverting:
+ return _("Error converting to loadable format");
+ case ErrorLoading:
+ return _("Error loading file into memory");
+ case ErrorGeneratingPixmap:
+ return _("Error generating the pixmap");
+ case ErrorUnknown:
+ return _("No image");
}
-
- return msg;
+ return string();
}
}
-int InsetGraphics::ascent(BufferView *, LyXFont const &) const
+void InsetGraphics::dimension(BufferView *, LyXFont const & font,
+ Dimension & dim) const
{
cache_->old_ascent = 50;
if (imageIsDrawable())
cache_->old_ascent = cache_->loader.image()->getHeight();
- return cache_->old_ascent;
-}
-
-
-int InsetGraphics::descent(BufferView *, LyXFont const &) const
-{
- return 0;
-}
-
-
-int InsetGraphics::width(BufferView *, LyXFont const & font) const
-{
+ dim.a = cache_->old_ascent;
+ dim.d = 0;
if (imageIsDrawable())
- return cache_->loader.image()->getWidth();
+ dim.w = cache_->loader.image()->getWidth() + 2 * TEXT_TO_INSET_OFFSET;
else {
int font_width = 0;
LyXFont msgFont(font);
msgFont.setFamily(LyXFont::SANS_FAMILY);
- string const justname = OnlyFilename (params().filename);
+ string const justname = OnlyFilename(params().filename);
if (!justname.empty()) {
msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
font_width = font_metrics::width(justname, msgFont);
string const msg = statusMessage();
if (!msg.empty()) {
msgFont.setSize(LyXFont::SIZE_TINY);
- int const msg_width = font_metrics::width(msg, msgFont);
- font_width = std::max(font_width, msg_width);
+ font_width = std::max(font_width, font_metrics::width(msg, msgFont));
}
- return std::max(50, font_width + 15);
+ dim.w = std::max(50, font_width + 15);
}
}
+BufferView * InsetGraphics::view() const
+{
+ return cache_->view.lock().get();
+}
+
+
void InsetGraphics::draw(BufferView * bv, LyXFont const & font,
- int baseline, float & x, bool) const
+ int baseline, float & x) const
{
// MakeAbsPath returns params().filename unchanged if it absolute
// already.
// This is not a nice thing to do and should be fixed properly somehow.
// But I still don't know the best way to go. So let's do this like this
// for now (Jug 20020311)
- if (lascent != oasc) {
+ if (lascent != oasc)
return;
- }
// Make sure now that x is updated upon exit from this routine
int old_x = int(x);
x += lwidth;
- if (cache_->loader.status() == grfx::WaitingToLoad)
- cache_->loader.startLoading(*this, *bv);
+ grfx::Params const & gparams = params().as_grfxParams();
+
+ if (gparams.display != grfx::NoDisplay &&
+ cache_->loader.status() == grfx::WaitingToLoad)
+ cache_->loader.startLoading();
if (!cache_->loader.monitoring())
cache_->loader.startMonitoring();
Painter & paint = bv->painter();
if (imageIsDrawable()) {
- paint.image(old_x + 2, baseline - lascent,
- lwidth - 4, lascent + ldescent,
+ paint.image(old_x + TEXT_TO_INSET_OFFSET, baseline - lascent,
+ lwidth - 2 * TEXT_TO_INSET_OFFSET, lascent + ldescent,
*cache_->loader.image());
} else {
- paint.rectangle(old_x + 2, baseline - lascent,
- lwidth - 4,
- lascent + ldescent);
+ paint.rectangle(old_x + TEXT_TO_INSET_OFFSET, baseline - lascent,
+ lwidth - 2 * TEXT_TO_INSET_OFFSET, lascent + ldescent);
// Print the file name.
LyXFont msgFont(font);
string const justname = OnlyFilename (params().filename);
if (!justname.empty()) {
msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
- paint.text(old_x + 8,
+ paint.text(old_x + TEXT_TO_INSET_OFFSET + 6,
baseline - font_metrics::maxAscent(msgFont) - 4,
justname, msgFont);
}
string const msg = statusMessage();
if (!msg.empty()) {
msgFont.setSize(LyXFont::SIZE_TINY);
- paint.text(old_x + 8, baseline - 4, msg, msgFont);
+ paint.text(old_x + TEXT_TO_INSET_OFFSET + 6, baseline - 4, msg, msgFont);
}
}
-
- // the status message may mean we changed size, so indicate
- // we need a row redraw
-#if 0
- if (old_status_ != grfx::ErrorUnknown && old_status_ != cached_status_) {
- bv->getLyXText()->status(bv, LyXText::CHANGED_IN_DRAW);
- }
-#endif
-
- // Reset the cache, ready for the next draw request
-#if 0
- cached_status_ = grfx::ErrorUnknown;
- cached_image_.reset();
- cache_filled_ = false;
-#endif
-}
-
-
-void InsetGraphics::edit(BufferView *bv, int, int, mouse_button::state)
-{
- bv->owner()->getDialogs().showGraphics(this);
-}
-
-
-void InsetGraphics::edit(BufferView * bv, bool)
-{
- edit(bv, 0, 0, mouse_button::none);
}
}
-string const InsetGraphics::prepareFile(Buffer const * buf) const
+string const InsetGraphics::prepareFile(Buffer const * buf,
+ LatexRunParams const & runparams) const
{
// LaTeX can cope if the graphics file doesn't exist, so just return the
// filename.
// temp_file will contain the file for LaTeX to act on if, for example,
// we move it to a temp dir or uncompress it.
- string temp_file(orig_file);
+ string temp_file = orig_file;
if (zipped) {
// Uncompress the file if necessary.
}
string const from = getExtFromContents(orig_file_with_path);
- string const to = findTargetFormat(from);
+ string const to = findTargetFormat(from, runparams);
lyxerr[Debug::GRAPHICS]
<< "\t we have: from " << from << " to " << to << '\n';
- if (from == to && !lyxrc.use_tempdir)
+ if (from == to && !lyxrc.use_tempdir) {
// No conversion is needed. LaTeX can handle the
// graphic file as is.
// This is true even if the orig_file is compressed.
- return RemoveExtension(orig_file_with_path);
+ if (formats.getFormat(to)->extension() == GetExtension(orig_file))
+ return RemoveExtension(orig_file_with_path);
+ return orig_file_with_path;
+ }
// We're going to be running the exported buffer through the LaTeX
// compiler, so must ensure that LaTeX can cope with the graphics
<< temp_file
<< (success ? " succeeded\n" : " failed\n");
if (!success) {
- Alert::alert(_("Cannot copy file"), orig_file_with_path,
- _("into tempdir"));
+ string str = bformat(_("Could not copy the file\n%1$s\n"
+ "into the temporary directory."), orig_file_with_path);
+ Alert::error(_("Graphics display failed"), str);
return orig_file;
}
}
- if (from == to)
+ if (from == to) {
// No conversion is needed. LaTeX can handle the
// graphic file as is.
- return RemoveExtension(temp_file);
+ if (formats.getFormat(to)->extension() == GetExtension(orig_file))
+ return RemoveExtension(temp_file);
+ return temp_file;
+ }
}
string const outfile_base = RemoveExtension(temp_file);
<< command << endl;
Systemcall one;
one.startscript(Systemcall::Wait, command);
- if (!IsFileReadable(ChangeExtension(outfile_base, to)))
- Alert::alert(_("Cannot convert Image (not existing file?)"),
- boost::io::str(boost::format(_("No information for converting from %1$s to %2$s"))
- % from % to));
+ if (!IsFileReadable(ChangeExtension(outfile_base, to))) {
+ string str = bformat(_("No information for converting %1$s "
+ "format files to %1$s.\n"
+ "Try defining a convertor in the preferences."), from, to);
+ Alert::error(_("Could not convert image"), str);
+ }
}
return RemoveExtension(temp_file);
}
-int InsetGraphics::latex(Buffer const *buf, ostream & os,
- bool /*fragile*/, bool/*fs*/) const
+int InsetGraphics::latex(Buffer const * buf, ostream & os,
+ LatexRunParams const & runparams) const
{
// If there is no file specified or not existing,
// just output a message about it in the latex output.
// A missing (e)ps-extension is no problem for LaTeX, so
// we have to test three different cases
- string const file_(MakeAbsPath(params().filename, buf->filePath()));
+ string const file_ = MakeAbsPath(params().filename, buf->filePath());
bool const file_exists =
!file_.empty() &&
(IsFileReadable(file_) || // original
// "nice" means that the buffer is exported to LaTeX format but not
// run through the LaTeX compiler.
- if (buf->niceFile) {
+ if (runparams.nice) {
os << before <<'{' << params().filename << '}' << after;
return 1;
}
// and remove the extension so the LaTeX will use whatever is
// appropriate (when there are several versions in different formats)
string const latex_str = message.empty() ?
- (before + '{' + os::external_path(prepareFile(buf)) + '}' + after) :
+ (before + '{' + os::external_path(prepareFile(buf, runparams)) + '}' + after) :
(before + '{' + params().filename + " not found!}" + after);
os << latex_str;
// Return how many newlines we issued.
- int const newlines =
- int(lyx::count(latex_str.begin(), latex_str.end(),'\n') + 1);
-
- return newlines;
+ return int(lyx::count(latex_str.begin(), latex_str.end(),'\n') + 1);
}
// 1. Convert file to ascii using gifscii
// 2. Read ascii output file and add it to the output stream.
// at least we send the filename
- os << '<'
- << boost::format(_("Graphic file: %1$s")) % params().filename
- << ">\n";
+ os << '<' << bformat(_("Graphics file: %1$s"), params().filename) << ">\n";
return 0;
}
{
// If we have no image, we should not require anything.
if (params().filename.empty())
- return ;
+ return;
features.includeFile(graphic_label, RemoveExtension(params().filename));
void InsetGraphics::statusChanged()
{
- if (cache_->view.get())
- cache_->view.get()->updateInset(this, false);
+ if (!cache_->view.expired())
+ cache_->view.lock()->updateInset(this);
}
string const & filepath)
{
// If nothing is changed, just return and say so.
- if (params() == p && !p.filename.empty()) {
+ if (params() == p && !p.filename.empty())
return false;
- }
// Copy the new parameters.
params_ = p;
}
-Inset * InsetGraphics::clone(Buffer const & buffer, bool same_id) const
+string const InsetGraphicsMailer::name_("graphics");
+
+InsetGraphicsMailer::InsetGraphicsMailer(InsetGraphics & inset)
+ : inset_(inset)
+{}
+
+
+string const InsetGraphicsMailer::inset2string() const
{
- return new InsetGraphics(*this, buffer.filePath(), same_id);
+ return params2string(inset_.params());
+}
+
+
+void InsetGraphicsMailer::string2params(string const & in,
+ InsetGraphicsParams & params)
+{
+ params = InsetGraphicsParams();
+
+ if (in.empty())
+ return;
+
+ istringstream data(STRCONV(in));
+ LyXLex lex(0,0);
+ lex.setStream(data);
+
+ if (lex.isOK()) {
+ lex.next();
+ string const token = lex.getString();
+ if (token != name_)
+ return;
+ }
+
+ if (lex.isOK()) {
+ InsetGraphics inset;
+ inset.readInsetGraphics(lex);
+ params = inset.params();
+ }
+}
+
+
+string const
+InsetGraphicsMailer::params2string(InsetGraphicsParams const & params)
+{
+ ostringstream data;
+ data << name_ << ' ';
+ params.Write(data);
+ data << "\\end_inset\n";
+ return STRCONV(data.str());
}