*
* LyX, The Document Processor
*
- * Copyright 1995 Matthias Ettrich
* Copyright 1995-2000 the LyX Team.
- *
+ *
+ * This file Copyright 2000 Baruch Even.
* ====================================================== */
+/*
+How to use it for now:
+ * The lyxfunc 'graphics-insert' will insert this inset into the document.
+*/
+
+/*
+Immediate tasks:
+ * Make the inline viewing work, there is a preliminary work going on,
+ need to finish it up.
+
+ * Polishing tasks:
+ * Add messages in the empty rectangle to say how are we doing.
+ - Implemented, needs testing.
+ * Clean up GraphicsCacheItem(_pimpl)
+ * Pop up a dialog if the widget version is higher than what we accept.
+ * Prepare code to read FigInset insets to upgrade upwards
+ * Provide sed/awk/C code to downgrade from InsetGraphics to FigInset.
+
+*/
+
+/*
+Known BUGS:
+
+ * If the image is from the clipart, and the document is moved to another
+ directory, the user is screwed. Need a way to handle it.
+ This amounts to a problem of when to use relative or absolute file paths
+ We should probably use what the user asks to use... but when he chooses
+ by the file dialog we normally get an absolute path and this may not be
+ what the user meant.
+ * Bug in FileDlg class (src/filedlg.[hC]) when selecting a file and then
+ pressing ok, it counts as if no real selection done. Apparently
+ when choosing a file it doesn't update the select file input line.
+ * Inline viewing is still not completely operational, in fact it is no
+ disabled. To enable it enable the define:
+ INSETGRAPHICS_INLINE_VIEW
+
+Current PROBLEMS:
+
+ * How to support both PDF and PS output, should we do the conversion
+ or should we just give the bounding box and tell latex how to do the
+ conversion itself?
+ I (Baruch Even) tend towards doing the conversion ourselves, otherwise
+ we need to give latex quite a few translation commands and from the
+ graphicx package docs it appears that it takes quite a bit of memory
+ on the side of TeXing.
+
+TODO Basics:
+
+ * Add support for more features so that it will be better than insetfig.
+ * Keep aspect ratio radio button
+
+ * Work on inline viewing of image.
+
+TODO Before initial production release:
+ * Replace insetfig everywhere
+ * Read it's file format
+ * Get created by all commands used to create figinset currently.
+ * Search for comments of the form
+ // INSET_GRAPHICS: remove this when InsetFig is thrown.
+ And act upon them.
+
+ * Finish the basic To-do list.
+ * Extract the general logic of the dialog in order to allow easier porting
+ to Gnome/KDE, and put the general logic in frontends and the inherited
+ platform dependent code in the appropriate dirs.
+
+TODO Extended features:
+
+ * Advanced Latex tab folder.
+ * Add even more options to make it better than insetfig.
+ * Support for complete control over the latex parameters for TeXperts
+ * What advanced features the users want to do?
+ Implement them in a non latex dependent way, but a logical way.
+ LyX should translate it to latex or any other fitting format.
+ * Add a way to roll the image file into the file format.
+ * When loading if the image is not found in the expected place, try
+ to find it in the clipart, or in the same directory with the image.
+ * Keep a tab on the image file, if it changes, update the lyx view.
+ * The image choosing dialog could show thumbnails of the image formats
+ it knows of, thus selection based on the image instead of based on
+ filename.
+ * Add support for the 'picins' package.
+ * Add support for the 'picinpar' package.
+ * Improve support for 'subfigure' - Allow to set the various options
+ that are possible.
+ */
+
+/* NOTES:
+ *
+ * Intentions:
+ * This is currently a moving target, I'm trying stuff and learning what
+ * is needed and how to accomplish it, since there is no predefined goal or
+ * way to go I invent it as I go.
+ *
+ * My current intention is for seperation from LaTeX, the basic needs are
+ * resizing and rotating, displaying on screen in various depths and printing
+ * conversion of depths (independent of the display depth). For this I'll
+ * provide a simple interface.
+ *
+ * The medium level includes clipping of the image, but in a limited way.
+ *
+ * For the LaTeX gurus I'll provide a complete control over the output, but
+ * this is latex dependent and guru dependent so I'd rather avoid doing this
+ * for the normal user. This stuff includes clipping, special image size
+ * specifications (\textwidth\minus 2in) which I see no way to generalize
+ * to non-latex specific way.
+ *
+ * Used packages:
+ * 'graphicx' for the graphics inclusion.
+ * 'subfigure' for the subfigures.
+ *
+ * Fileformat:
+ *
+ * Current version is 1 (inset file format version), when changing it
+ * it should be changed in the Write() function when writing in one place
+ * and when reading one should change the version check and the error message.
+ *
+ * The filename is kept in the lyx file in a relative way, so as to allow
+ * moving the document file and its images with no problem.
+ *
+ * Conversions:
+ *
+ * Apparently the PNG output is preferred over PDF images when doing PDF
+ * documents (i.e. prefer imagemagick eps2png over eps2pdf)
+ */
+
+/* Current Stage:
+ * Embryonic.
+ *
+ * PLAN:
+ * Finish basic support:
+ * Inline image viewing
+ *
+ * Do Release quality support:
+ * Allow to change display depth
+ * Make default figure instead of InsetFig
+ * Add to LyX (probably after 1.1.6 is released)
+ *
+ * Extended features:
+ * Output format conversion
+ * Print depth changes
+ * Image file tracking of changes.
+ *
+ * Extended^2:
+ * Image roll-in (how? when? why?)
+ * This means to add the image inside the LyX file, usefull when
+ * transferring the file around.
+ */
+
+
+#include <config.h>
+
#ifdef __GNUG__
#pragma implementation
-#endif
-
-#include <config.h>
+#endif
#include "insets/insetgraphics.h"
+#include "insets/insetgraphicsParams.h"
+#include "graphics/GraphicsCache.h"
+#include "graphics/GraphicsCacheItem.h"
+
+#include "frontends/Dialogs.h"
+#include "LyXView.h"
+#include "buffer.h"
+#include "BufferView.h"
+#include "converter.h"
+#include "frontends/support/LyXImage.h"
#include "Painter.h"
-#include "form_graphics.h"
#include "lyx_gui_misc.h"
#include "filedlg.h"
#include "support/FileInfo.h"
#include "support/filetools.h"
+#include "lyxtext.h"
+#include "font.h" // For the lyxfont class.
+#include <algorithm> // For the std::max
+#include "lyxrc.h"
+
+#include "debug.h"
+
using std::ostream;
using std::endl;
+using std::max;
-extern string system_lyxdir;
-extern string user_lyxdir;
-extern string system_tempdir;
+// Initialize only those variables that do not have a constructor.
+InsetGraphics::InsetGraphics()
+#ifdef IG_OLDPARAMS
+ : use_bb(false), hiresbb(false), angle(0.0), origin(DEFAULT)
+ , keepaspectratio(false), scale(0.0), clip(false), draft(false)
+ , cacheHandle(0)
+#endif
+ : cacheHandle(0), pixmap(0), pixmapInitialized(false)
+{}
-string browseFile();
+InsetGraphics::~InsetGraphics()
+{
+ // Emits the hide signal to the dialog connected (if any)
+ hide();
+}
-extern "C" void GraphicxCB(FL_OBJECT * obj, long arg)
+char const *
+InsetGraphics::statusMessage() const
{
- lyxerr << "GraphicxCB: obj = " << obj << " arg = " << arg << endl;
- switch (arg) {
- case 0: // The graphics file
- lyxerr << "Set the graphics file in InsetGraphics" << endl;
- break;
- case 1: // The file browser
- browseFile();
- break;
- case 2: // The Apply button
- lyxerr << "Scan the form and set the "
- "InsetGraphics accordingly." << endl;
+ char const * msg = 0;
+
+#ifdef INSETGRAPHICS_INLINE_VIEW
+ switch (status) {
+ case GraphicsCacheItem::UnknownError:
+ msg = _("Unknown Error");
break;
- case 3: // The OK button
- GraphicxCB(obj, 2); // do the apply
- GraphicxCB(obj, 4); // do the cancel
+
+ case GraphicsCacheItem::Loading:
+ msg = _("Loading...");
break;
- case 4: // The Cancel button
- lyxerr << "Just hide the form and do nothing else!" << endl;
+
+ case GraphicsCacheItem::ErrorReading:
+ msg = _("Error reading");
break;
- case 99:
- lyxerr << "Not implemented yet..." << endl;
+
+ case GraphicsCacheItem::ErrorConverting:
+ msg = _("Error converting");
break;
- default:
- lyxerr << "Unknown callback value!" << endl;
+
+ case GraphicsCacheItem::Loaded:
+ // No message to write.
break;
}
+#else
+ msg = _("Inline view disabled");
+#endif
+
+ return msg;
}
+int InsetGraphics::ascent(BufferView *, LyXFont const &) const
+{
+ if (pixmapInitialized)
+ return cacheHandle->getHeight();
+ else
+ return 50;
+}
-string browseFile()
+
+int InsetGraphics::descent(BufferView *, LyXFont const &) const
{
- // This function is probably not good enough yet, and does need some
- // arguemnts to tell what dir to start looking in.
-
- static string current_figure_path = ".";
+ // this is not true if viewport is used and clip is not.
+ return 0;
+}
- LyXFileDlg fileDlg;
- // Does user clipart directory exist?
- string bufclip = AddName (user_lyxdir, "clipart");
- FileInfo fileInfo(bufclip);
- if (!(fileInfo.isOK() && fileInfo.isDir()))
- // No - bail out to system clipart directory
- bufclip = AddName (system_lyxdir, "clipart");
+int InsetGraphics::width(BufferView *, LyXFont const & font) const
+{
+ if (pixmapInitialized)
+ return cacheHandle->getWidth();
+ else {
+ char const * msg = statusMessage();
+ int font_width = lyxfont::width(msg, font);
+
+ return max(50, font_width + 15);
+ }
+}
- fileDlg.SetButton(0, _("Clipart"), bufclip);
+void InsetGraphics::draw(BufferView * bv, LyXFont const & font,
+ int baseline, float & x, bool) const
+{
+ Painter & paint = bv->painter();
- bool error = false;
- string buf;
- do {
- string p = fileDlg.Select(_("Graphics"),
- current_figure_path,
- "*ps", string());
+ int lwidth = width(bv, font);
+ int ldescent = descent(bv, font);
+ int lascent = ascent(bv, font);
- if (p.empty()) return p;
+ // This will draw the graphics. If the graphics has not been loaded yet,
+ // we draw just a rectangle.
+ if (pixmapInitialized) {
- current_figure_path = OnlyPath(p);
+ paint.image(int(x) + 2, baseline - lascent,
+ lwidth - 4, lascent + ldescent,
+ pixmap);
+ } else {
+#ifdef INSETGRAPHICS_INLINE_VIEW
+ // Get the image status, default to unknown error.
+ GraphicsCacheItem::ImageStatus status = GraphicsCacheItem::UnknownError;
+ if (cacheHandle)
+ status = cacheHandle->getImageStatus();
+
+ // Check if the image is now ready.
+ if (status == GraphicsCacheItem::Loaded) {
+ // It is, get it and inform the world.
+ pixmap = cacheHandle->getImage();
+ pixmapInitialized = true;
+
+ // Tell BufferView we need to be updated!
+ bv->text->status = LyXText::CHANGED_IN_DRAW;
+ return;
+ }
+#endif
- if (p.find_first_of("#~$% ") != string::npos) {
- WriteAlert(_("Filename can't contain any "
- "of these characters:"),
- // xgettext:no-c-format
- _("space, '#', '~', '$' or '%'."));
- error = true;
+ char const * msg = statusMessage();
+
+ paint.rectangle(int(x) + 2, baseline - lascent,
+ lwidth - 4,
+ lascent + ldescent);
+
+ if (msg) {
+ // Print the message.
+ LyXFont msgFont(font);
+ msgFont.setFamily(LyXFont::SANS_FAMILY);
+ msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
+ string const justname = OnlyFilename (params.filename);
+ paint.text(int(x + 8), baseline - lyxfont::maxAscent(msgFont) - 4,
+ justname, msgFont);
+
+ msgFont.setSize(LyXFont::SIZE_TINY);
+ paint.text(int(x + 8), baseline - 4, msg, strlen(msg), msgFont);
}
- } while (error);
+ }
- return buf;
+ // Add the image width to the row width.
+ x += lwidth;
}
-InsetGraphics::InsetGraphics()
- : form(0)
-{}
-
-
-int InsetGraphics::ascent(Painter &, LyXFont const &) const
+void InsetGraphics::Edit(BufferView *bv, int, int, unsigned int)
{
-
- return 100;
+ bv->owner()->getDialogs() -> showGraphics(this);
}
-int InsetGraphics::descent(Painter &, LyXFont const &) const
+Inset::EDITABLE InsetGraphics::Editable() const
{
- // this is not true if viewport is used and clip is not.
- return 1;
+ return IS_EDITABLE;
}
-int InsetGraphics::width(Painter &, LyXFont const &) const
+void InsetGraphics::Write(Buffer const * buf, ostream & os) const
{
- if (bb.isSet()) {
- return bb.urx - bb.llx;
- }
- return 100;
-}
+ os << "GRAPHICS FormatVersion 1" << endl;
+ params.Write(buf, os);
+}
-void InsetGraphics::draw(Painter & pain, LyXFont const & font,
- int baseline, float & x) const
+#if 0
+// Baruch Even 2000-07-08
+
+// A Thought for another way to read the file...
+// The map should be a static part of the object or a static part of this
+// file and should be filled during program start.
+// The questions are:
+// 1. Is this cleaner?
+// 2. Is there no hidden performance costs?
+//
+// Regarding 2 I can already see that we will have two copies of the strings
+// one in the data part of the program and one in the map, but that won't be
+// more than say 2K (overestimation here), there is no real benefit to put
+// it in the map since there aren't that many configuration items that will
+// make it a faster solution, it might just be a bit cleaner.
+// (a map stores either in a hash or a kind of a balanced tree).
+
+void InsetGraphics::Read(Buffer const * buf, LyXLex & lex)
{
- // This will draw the graphics. As for now we only draw a
- // placeholder rectangele.
- pain.rectangle(int(x), baseline - ascent(pain, font),
- width(pain, font),
- ascent(pain, font) + descent(pain, font));
-}
+ typedef map < string, enum TOKENS > ReadActionMap;
+ static ReadActionMap const readMap;
+ bool finished = false;
+
+ while (lex.IsOK() && !finished) {
+ lex.next();
+
+ string const token = lex.GetString();
+ lyxerr.debug() << "Token: '" << token << '\'' << endl;
+
+ if (token.empty())
+ continue;
+
+ ReadActionMap::const_iterator it =
+ readMap.find(token);
+
+ if (it == readMap.end()) {
+ lyxerr << "Unknown keyword, skipping." << endl;
+ continue;
+ }
+
+ switch (it.second) {
+ case FILENAME_TOKEN:
+ break;
+ case VERSION_TOKEN:
+ break;
+ default:
+ break;
+ }
-void InsetGraphics::Edit(BufferView *, int, int, unsigned int)
-{
- lyxerr.debug() << "InsetGraphics::Edit" << endl;
-
- if (!form) {
- form = create_form_Graphics();
- fl_set_form_atclose(form->Graphics, CancelCloseBoxCB, 0);
- fl_set_object_return(form->Angle, FL_RETURN_ALWAYS);
- fl_set_object_return(form->Width, FL_RETURN_ALWAYS);
- fl_set_object_return(form->Height, FL_RETURN_ALWAYS);
- }
- if (form->Graphics->visible) {
- fl_raise_form(form->Graphics);
- } else {
- fl_show_form(form->Graphics, FL_PLACE_MOUSE | FL_PLACE_SIZE,
- FL_FULLBORDER, _("Graphics"));
}
}
+#endif
-
-Inset::EDITABLE InsetGraphics::Editable() const
+void InsetGraphics::Read(Buffer const * buf, LyXLex & lex)
{
- return IS_EDITABLE;
-}
+ bool finished = false;
+
+ while (lex.IsOK() && !finished) {
+ lex.next();
+
+ string const token = lex.GetString();
+ lyxerr.debug() << "Token: '" << token << '\'' << endl;
+
+ if (token.empty()) {
+ continue;
+ } else if (token == "\\end_inset") {
+ finished = true;
+ } else if (token == "FormatVersion") {
+ lex.next();
+ int version = lex.GetInteger();
+ if (version > 1)
+ lyxerr
+ << "This document was created with a newer Graphics widget"
+ ", You should use a newer version of LyX to read this"
+ " file."
+ << endl;
+ // TODO: Possibly open up a dialog?
+ }
+ else {
+ if (! params.Read(buf, lex, token))
+ lyxerr << "Unknown token, " << token << ",skipping." << endl;
+ }
+ }
+ updateInset();
+}
-void InsetGraphics::Write(ostream & os) const
+static
+void formatResize(ostream & os, string const & key,
+ InsetGraphicsParams::Resize resizeType, double size)
{
- // The question on the file format is still open.
- // Suggestions?
- // perhaps a format that is xml-parsable
- //<graphics name="test.eps"/>
- os << "GRAPHICS\n";
-}
+ switch (resizeType) {
+ case InsetGraphicsParams::DEFAULT_SIZE:
+ break;
+ case InsetGraphicsParams::CM:
+ os << key << '=' << size << "cm,";
+ break;
-void InsetGraphics::Read(LyXLex & /*lex*/)
-{
- // For now we only use a static file...
- graphicsfile = "testfile.xpm";
- //graphicscache.addFile(graphicsfile);
- //bb = graphicscache.getBB(graphicsfile);
- //pixmap = graphicscache.getPixmap(graphicsfile);
-}
+ case InsetGraphicsParams::INCH:
+ os << key << '=' << size << "in,";
+ break;
+
+ case InsetGraphicsParams::PERCENT_PAGE:
+ os << key << '=' << size / 100 << "\\text" << key << ',';
+ break;
+
+ case InsetGraphicsParams::PERCENT_COLUMN:
+ os << key << '=' << size / 100 << "\\column" << key << ',';
+ break;
+ }
+}
-int InsetGraphics::Latex(ostream & os,
- bool /*fragile*/, bool/*fs*/) const
+int InsetGraphics::Latex(Buffer const *buf, ostream & os,
+ bool /*fragile*/, bool/*fs*/) const
{
// MISSING: We have to decide how to do the order of the options
- // that is depentant of order, like witdth, height, andlge. Should
+ // that is dependent of order, like witdth, height, angle. Should
// we rotate before scale? Should we let the user decide?
// bool rot_before_scale; ?
- // Nothing to do if we don't have a graphics file
- if (graphicsfile.empty()) return 0;
- // We never used the starred form, we use the "clip" option instead.
- string command("\\insetgraphics");
-
-#ifdef HAVE_SSTREAM
+ // (BE) As a first step we should do a scale before rotate since this is
+ // more like the natural thought of how to do it.
+ // (BE) I believe that a priority list presented to the user with
+ // a default order would be the best, though it would be better to
+ // hide such a thing in an "Advanced options" dialog.
+ // (BE) This should go an advanced LaTeX options dialog.
+
+ // If there is no file specified, just output a message about it in
+ // the latex output.
+ if (params.filename.empty()) {
+ os << "\\fbox{\\rule[-0.5in]{0pt}{1in}"
+ << _("empty figure path")
+ << '}'
+ << endl;
+
+ return 1;
+ }
+
+ // Calculate the options part of the command, we must do it to a string
+ // stream since we might have a trailing comma that we would like to remove
+ // before writing it to the output stream.
std::ostringstream options;
-#else
- ostrstream options;
-#endif
+
+ formatResize(options, "width", params.widthResize, params.widthSize);
+ formatResize(options, "height", params.heightResize, params.heightSize);
+
+ if (params.rotateAngle != 0) {
+ options << "angle="
+ << params.rotateAngle << ',';
+ }
+
+#ifdef IG_OLDPARAMS
if (bb.isSet() && use_bb) {
options << "bb="
- << bb.llx << " " << bb.lly << " "
- << bb.urx << " " << bb.ury << ",";
+ << bb.llx << ' ' << bb.lly << ' '
+ << bb.urx << ' ' << bb.ury << ',';
}
if (hiresbb) {
options << "hiresbb,";
}
if (viewport.isSet()) {
options << "viewport="
- << viewport.llx << " " << viewport.lly << " "
- << viewport.urx << " " << viewport.ury << ",";
+ << viewport.llx << ' ' << viewport.lly << ' '
+ << viewport.urx << ' ' << viewport.ury << ',';
}
if (trim.isSet()) {
options << "trim="
- << trim.llx << " " << trim.lly << " "
- << trim.urx << " " << trim.ury << ",";
+ << trim.llx << ' ' << trim.lly << ' '
+ << trim.urx << ' ' << trim.ury << ',';
}
- if (natheight.value() == 0) {
- options << "natheight=" << natheight.asString() << ",";
+ if (natheight.value() != 0) {
+ options << "natheight=" << natheight.asString() << ',';
}
- if (natwidth.value() == 0) {
- options << "natwidth=" << natwidth.asString() << ",";
+ if (natwidth.value() != 0) {
+ options << "natwidth=" << natwidth.asString() << ',';
}
if (angle != 0.0) {
- options << "angle=" << angle << ",";
+ options << "angle=" << angle << ',';
}
if (origin != DEFAULT) {
- switch(origin) {
+ switch (origin) {
case DEFAULT: break;
case LEFTTOP:
options << "origin=lt,";
}
}
if (g_width.value() != 0) {
- options << "width=" << g_width.asString() << ",";
+ options << "width=" << g_width.asString() << ',';
}
if (g_height.value() != 0) {
- options << "height=" << g_height.asString() << ",";
+ options << "height=" << g_height.asString() << ',';
}
if (totalheight.value() != 0) {
- options << "totalheight=" << totalheight.asString() << ",";
+ options << "totalheight=" << totalheight.asString() << ',';
}
if (keepaspectratio) {
options << "keepaspectratio,";
}
if (scale != 0.0) {
- options << "scale=" << scale << ",";
+ options << "scale=" << scale << ',';
}
if (clip) {
options << "clip,";
options << "draft,";
}
if (!type.empty()) {
- options << "type=" << type << ",";
- }
- if (!ext.empty()) {
- options << "ext=" << type << ",";
- }
- if (!read.empty()) {
- options << "read=" << type << ",";
- }
- if (!command.empty()) {
- options << "command=" << type << ",";
+ options << "type=" << type << ',';
+
+ // These should be present only when type is used.
+ if (!ext.empty()) {
+ options << "ext=" << type << ',';
+ }
+ if (!read.empty()) {
+ options << "read=" << type << ',';
+ }
+ if (!command.empty()) {
+ options << "command=" << type << ',';
+ }
}
-#ifdef HAVE_SSTREAM
+#endif
+
string opts(options.str().c_str());
-#else
- options << '\0';
- char * tmp = options.str();
- string opts(tmp);
- delete [] tmp;
-#endif
opts = strip(opts, ',');
+
+
+ // If it's not an inline image, surround it with the centering paragraph.
+ if (! params.inlineFigure) {
+ os << endl
+ << "\\vspace{0.3cm}" << endl
+ << "{\\par\\centering ";
+ }
+
+ // Do we want subcaptions?
+ if (params.subcaption) {
+ os << "\\subfigure[" << params.subcaptionText << "]{";
+ }
+
+ // We never used the starred form, we use the "clip" option instead.
+ os << "\\includegraphics";
+
if (!opts.empty()) {
- command += "[";
- command += opts;
- command += "]";
+ os << '[' << opts << ']';
}
- command += "{";
- command += graphicsfile;
- command += "}";
- os << command << '\n';
-
+ // Make the filename relative to the lyx file
+ string filename = MakeRelPath(params.filename, OnlyPath(buf->fileName()));
+
+ // and remove the extension so the LaTeX will use whatever is
+ // appropriate (when there are several versions in different formats)
+ filename = ChangeExtension(filename, string());
+
+ os << '{' << filename << '}';
+
+ // Do we want a subcaption?
+ if (params.subcaption) {
+ // Close the subcaption command
+ os << '}';
+ }
+
+ // Is this an inline graphics?
+ if (!params.inlineFigure) {
+ os << " \\par}" << endl
+ << "\\vspace{0.3cm}" << endl;
+ }
+
+ // How do we decide to what format should we export?
+ string extension = GetExtension(params.filename);
+ if (lyxrc.pdf_mode) {
+ if (extension != "jpg")
+ converters.Convert(buf,
+ params.filename, params.filename,
+ extension, "png");
+ } else
+ converters.Convert(buf, params.filename, params.filename,
+ extension, "eps");
+
return 1;
}
-int InsetGraphics::Ascii(ostream &) const
+int InsetGraphics::Ascii(Buffer const *, ostream &, int) const
{
+ // No graphics in ascii output.
return 0;
}
-int InsetGraphics::Linuxdoc(ostream &) const
+int InsetGraphics::Linuxdoc(Buffer const *, ostream &) const
{
+ // No graphics in LinuxDoc output. Should check how/what to add.
return 0;
}
-int InsetGraphics::DocBook(ostream &) const
+int InsetGraphics::DocBook(Buffer const *, ostream &) const
{
+ // No graphics in DocBook output. Should check how/what to add.
return 0;
}
-void InsetGraphics::Validate(LaTeXFeatures & /*features*/) const
+void InsetGraphics::Validate(LaTeXFeatures & features) const
+{
+ // If we have no image, we should not require anything.
+ if (params.filename.empty())
+ return ;
+
+ features.graphicx = true;
+
+ if (params.subcaption)
+ features.subfigure = true;
+}
+
+// Update the inset after parameters changed (read from file or changed in
+// dialog.
+void InsetGraphics::updateInset() const
{
- //features.graphicx = true;
+ // If file changed...
+
+#ifdef INSETGRAPHICS_INLINE_VIEW
+ GraphicsCache * gc = GraphicsCache::getInstance();
+ GraphicsCacheItem * temp = 0;
+
+ if (!params.filename.empty()) {
+ temp = gc->addFile(params.filename);
+ }
+
+ delete cacheHandle;
+ cacheHandle = temp;
+#else
+ cacheHandle = 0;
+#endif
}
+bool InsetGraphics::setParams(InsetGraphicsParams const & params)
+{
+ // If nothing is changed, just return and say so.
+ if (this->params == params)
+ return false;
+
+ // Copy the new parameters.
+ this->params = params;
+
+ // Update the inset with the new parameters.
+ updateInset();
+
+ // We have changed data, report it.
+ return true;
+}
-Inset * InsetGraphics::Clone() const
+InsetGraphicsParams InsetGraphics::getParams() const
{
- return new InsetGraphics;
+ return params;
}
+Inset * InsetGraphics::Clone(Buffer const &) const
+{
+ InsetGraphics * newInset = new InsetGraphics;
+
+ if (cacheHandle)
+ newInset->cacheHandle = cacheHandle->Clone();
+ else
+ newInset->cacheHandle = 0;
+ newInset->pixmap = pixmap;
+ newInset->pixmapInitialized = pixmapInitialized;
+ newInset->setParams(getParams());
+
+ return newInset;
+}
projects / lyx.git / blobdiff