lyx_mirror/src/insets/RenderGraphic.cpp
Christian Ridderström e30f3d76d2 Bulk cleanup/fix incorrect annotation at the end of namespaces.
This commit does a bulk fix of incorrect annotations (comments) at the
end of namespaces.

The commit was generated by initially running clang-format, and then
from the diff of the result extracting the hunks corresponding to
fixes of namespace comments. The changes being applied and all the
results have been manually reviewed. The source code successfully
builds on macOS.

Further details on the steps below, in case they're of interest to
someone else in the future.

1. Checkout a fresh and up to date version of src/

    git pull && git checkout -- src && git status src

2. Ensure there's a suitable .clang-format in place, i.e. with options
   to fix the comment at the end of namespaces, including:

    FixNamespaceComments:                           true
    SpacesBeforeTrailingComments:                   1

and that clang-format is >= 5.0.0, by doing e.g.:

    clang-format -dump-config | grep Comments:
    clang-format --version

3. Apply clang-format to the source:

    clang-format -i $(find src -name "*.cpp" -or -name "*.h")

4. Create and filter out hunks related to fixing the namespace

    git diff -U0 src > tmp.patch
    grepdiff '^} // namespace' --output-matching=hunk tmp.patch  > fix_namespace.patch

5. Filter out hunks corresponding to simple fixes into to a separate patch:

    pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n'  \
        -e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n'         \
        fix_namespace.patch > fix_namespace_simple.patch

6. Manually review the simple patch and then apply it, after first
   restoring the source.

    git checkout -- src
    patch -p1 < fix_namespace_simple.path

7. Manually review the (simple) changes and then stage the changes

    git diff src
    git add src

8. Again apply clang-format and filter out hunks related to any
   remaining fixes to the namespace, this time filter with more
   context. There will be fewer hunks as all the simple cases have
   already been handled:

    clang-format -i $(find src -name "*.cpp" -or -name "*.h")
    git diff src > tmp.patch
    grepdiff '^} // namespace' --output-matching=hunk tmp.patch  > fix_namespace2.patch

9. Manually review/edit the resulting patch file to remove hunks for files
   which need to be dealt with manually, noting the file names and
   line numbers. Then restore files to as before applying clang-format
   and apply the patch:

    git checkout src
    patch -p1 < fix_namespace2.patch

10. Manually fix the files noted in the previous step. Stage files,
    review changes and commit.
2017-07-23 13:11:54 +02:00

224 lines
4.9 KiB
C++

/**
* \file RenderGraphic.cpp
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Angus Leeming
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "RenderGraphic.h"
#include "insets/Inset.h"
#include "Buffer.h"
#include "LyX.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
#include "graphics/GraphicsImage.h"
#include "support/FileName.h"
#include "support/filetools.h"
#include "support/gettext.h"
#include "support/bind.h"
using namespace std;
namespace lyx {
RenderGraphic::RenderGraphic(Inset const * inset)
: loader_(inset->buffer().fileName())
{
loader_.connect(bind(&Inset::updateFrontend, inset));
}
RenderGraphic::RenderGraphic(RenderGraphic const & other, Inset const * inset)
: RenderBase(other), loader_(other.loader_), params_(other.params_)
{
loader_.connect(bind(&Inset::updateFrontend, inset));
}
RenderBase * RenderGraphic::clone(Inset const * inset) const
{
return new RenderGraphic(*this, inset);
}
void RenderGraphic::reload() const
{
loader_.reload();
}
void RenderGraphic::update(graphics::Params const & params)
{
params_ = params;
if (!params_.filename.empty())
loader_.reset(params_.filename, params_);
}
namespace {
bool displayGraphic(graphics::Params const & params)
{
return params.display && lyxrc.display_graphics;
}
docstring const statusMessage(graphics::Params const & params,
graphics::ImageStatus status)
{
docstring ret;
if (!displayGraphic(params))
ret = _("Not shown.");
else {
switch (status) {
case graphics::WaitingToLoad:
ret = _("Not shown.");
break;
case graphics::Loading:
ret = _("Loading...");
break;
case graphics::Converting:
ret = _("Converting to loadable format...");
break;
case graphics::Loaded:
ret = _("Loaded into memory. Generating pixmap...");
break;
case graphics::ScalingEtc:
ret = _("Scaling etc...");
break;
case graphics::Ready:
ret = _("Ready to display");
break;
case graphics::ErrorNoFile:
ret = _("No file found!");
break;
case graphics::ErrorConverting:
ret = _("Error converting to loadable format");
break;
case graphics::ErrorLoading:
ret = _("Error loading file into memory");
break;
case graphics::ErrorGeneratingPixmap:
ret = _("Error generating the pixmap");
break;
case graphics::ErrorUnknown:
ret = _("No image");
break;
}
}
return ret;
}
bool readyToDisplay(graphics::Loader const & loader)
{
if (!loader.image() || loader.status() != graphics::Ready)
return false;
return loader.image()->isDrawable();
}
} // namespace
void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
{
if (displayGraphic(params_)) {
if (loader_.status() == graphics::WaitingToLoad)
loader_.startLoading();
if (!loader_.monitoring())
loader_.startMonitoring();
loader_.checkModifiedAsync();
}
bool const image_ready = displayGraphic(params_) && readyToDisplay(loader_);
if (image_ready) {
dim.wid = loader_.image()->width() + 2 * Inset::TEXT_TO_INSET_OFFSET;
dim.asc = loader_.image()->height();
dim_ = dim;
return;
}
dim.asc = 50;
dim.des = 0;
int font_width = 0;
FontInfo msgFont(mi.base.font);
msgFont.setFamily(SANS_FAMILY);
// FIXME UNICODE
docstring const justname = from_utf8(params_.filename.onlyFileName());
if (!justname.empty()) {
msgFont.setSize(FONT_SIZE_FOOTNOTE);
font_width = theFontMetrics(msgFont).width(justname);
}
docstring const msg = statusMessage(params_, loader_.status());
if (!msg.empty()) {
msgFont.setSize(FONT_SIZE_TINY);
font_width = max(font_width,
theFontMetrics(msgFont).width(msg));
}
dim.wid = max(50, font_width + 15);
dim_ = dim;
}
void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
{
// This will draw the graphics. If the graphics has not been
// loaded yet, we draw just a rectangle.
int const x1 = x + Inset::TEXT_TO_INSET_OFFSET;
int const y1 = y - dim_.asc;
int const w = dim_.wid - 2 * Inset::TEXT_TO_INSET_OFFSET;
int const h = dim_.height();
if (displayGraphic(params_) && readyToDisplay(loader_))
pi.pain.image(x1, y1, w, h, *loader_.image());
else {
Color c = pi.change_.changed() ? pi.change_.color() : Color_foreground;
pi.pain.rectangle(x1, y1, w, h, c);
// Print the file name.
FontInfo msgFont = pi.base.font;
msgFont.setPaintColor(c);
msgFont.setFamily(SANS_FAMILY);
string const justname = params_.filename.onlyFileName();
if (!justname.empty()) {
msgFont.setSize(FONT_SIZE_FOOTNOTE);
pi.pain.text(x1 + 6, y - theFontMetrics(msgFont).maxAscent() - 4,
from_utf8(justname), msgFont);
}
// Print the message.
docstring const msg = statusMessage(params_, loader_.status());
if (!msg.empty()) {
msgFont.setSize(FONT_SIZE_TINY);
pi.pain.text(x1 + 6, y - 4, msg, msgFont);
}
}
pi.change_.paintCue(pi, x1, y1, x1 + w, y1 + h);
}
} // namespace lyx