1642 lines
56 KiB
C++
1642 lines
56 KiB
C++
|
|
|||
|
|
|
|||
|
|
// TnzTools includes
|
|||
|
|
#include "tools/toolutils.h"
|
|||
|
|
#include "tools/cursors.h"
|
|||
|
|
#include "tools/tool.h"
|
|||
|
|
#include "tools/toolutils.h"
|
|||
|
|
#include "tools/toolhandle.h"
|
|||
|
|
|
|||
|
|
#include "bluredbrush.h"
|
|||
|
|
|
|||
|
|
// TnzQt includes
|
|||
|
|
#include "toonzqt/icongenerator.h"
|
|||
|
|
|
|||
|
|
// TnzLib includes
|
|||
|
|
#include "toonz/strokegenerator.h"
|
|||
|
|
#include "toonz/ttilesaver.h"
|
|||
|
|
#include "toonz/txshsimplelevel.h"
|
|||
|
|
#include "toonz/observer.h"
|
|||
|
|
#include "toonz/toonzimageutils.h"
|
|||
|
|
#include "toonz/levelproperties.h"
|
|||
|
|
#include "toonz/stage2.h"
|
|||
|
|
#include "toonz/ttileset.h"
|
|||
|
|
#include "toonz/rasterstrokegenerator.h"
|
|||
|
|
#include "toonz/txsheethandle.h"
|
|||
|
|
#include "toonz/tframehandle.h"
|
|||
|
|
#include "toonz/txshlevelhandle.h"
|
|||
|
|
#include "toonz/tpalettehandle.h"
|
|||
|
|
#include "toonz/tobjecthandle.h"
|
|||
|
|
#include "toonz/tcolumnhandle.h"
|
|||
|
|
|
|||
|
|
// TnzBase includes
|
|||
|
|
#include "tenv.h"
|
|||
|
|
|
|||
|
|
// TnzCore includes
|
|||
|
|
#include "tstroke.h"
|
|||
|
|
#include "tmathutil.h"
|
|||
|
|
#include "drawutil.h"
|
|||
|
|
#include "tcolorstyles.h"
|
|||
|
|
#include "tundo.h"
|
|||
|
|
#include "tvectorimage.h"
|
|||
|
|
#include "ttoonzimage.h"
|
|||
|
|
#include "tproperty.h"
|
|||
|
|
#include "tgl.h"
|
|||
|
|
#include "trop.h"
|
|||
|
|
#include "tinbetween.h"
|
|||
|
|
#include "ttile.h"
|
|||
|
|
#include "tropcm.h"
|
|||
|
|
#include "timage_io.h"
|
|||
|
|
|
|||
|
|
// Qt includes
|
|||
|
|
#include <QCoreApplication> // For Qt translation support
|
|||
|
|
#include <QPainter>
|
|||
|
|
|
|||
|
|
using namespace ToolUtils;
|
|||
|
|
|
|||
|
|
#define LINES L"Lines"
|
|||
|
|
#define AREAS L"Areas"
|
|||
|
|
#define ALL L"Lines & Areas"
|
|||
|
|
|
|||
|
|
#define NORMALERASE L"Normal"
|
|||
|
|
#define RECTERASE L"Rectangular"
|
|||
|
|
#define FREEHANDERASE L"Freehand"
|
|||
|
|
#define POLYLINEERASE L"Polyline"
|
|||
|
|
|
|||
|
|
TEnv::DoubleVar EraseSize("InknpaintEraseSize", 10);
|
|||
|
|
TEnv::StringVar EraseType("InknpaintEraseType", "Normal");
|
|||
|
|
TEnv::IntVar EraseSelective("InknpaintEraseSelective", 0);
|
|||
|
|
TEnv::IntVar EraseInvert("InknpaintEraseInvert", 0);
|
|||
|
|
TEnv::IntVar EraseRange("InknpaintEraseRange", 0);
|
|||
|
|
TEnv::StringVar EraseColorType("InknpaintEraseColorType", "Lines");
|
|||
|
|
TEnv::DoubleVar EraseHardness("EraseHardness", 100);
|
|||
|
|
TEnv::IntVar ErasePencil("InknpaintErasePencil", 0);
|
|||
|
|
|
|||
|
|
namespace
|
|||
|
|
{
|
|||
|
|
|
|||
|
|
//==============================================================================
|
|||
|
|
// Undo dei Tools
|
|||
|
|
//==============================================================================
|
|||
|
|
|
|||
|
|
/*!
|
|||
|
|
Viene realizzata la funzione di "UNDO" per il cancellino nell'opzione RECTERASE
|
|||
|
|
*/
|
|||
|
|
|
|||
|
|
class RectRasterUndo : public TRasterUndo
|
|||
|
|
{
|
|||
|
|
TRectD m_modifyArea;
|
|||
|
|
TStroke *m_stroke;
|
|||
|
|
int m_styleId;
|
|||
|
|
wstring m_colorType;
|
|||
|
|
wstring m_eraseType;
|
|||
|
|
bool m_selective;
|
|||
|
|
bool m_invert;
|
|||
|
|
|
|||
|
|
public:
|
|||
|
|
RectRasterUndo(TTileSetCM32 *tileSet, const TRectD &modifyArea, TStroke stroke,
|
|||
|
|
int styleId, wstring eraseType, wstring colorType,
|
|||
|
|
TXshSimpleLevel *level, bool selective, bool invert,
|
|||
|
|
const TFrameId &frameId)
|
|||
|
|
: TRasterUndo(tileSet, level, frameId, false, false, 0), m_modifyArea(modifyArea), m_styleId(styleId), m_eraseType(eraseType), m_colorType(colorType), m_selective(selective), m_invert(invert)
|
|||
|
|
{
|
|||
|
|
m_stroke = new TStroke(stroke);
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
void redo() const
|
|||
|
|
{
|
|||
|
|
TToonzImageP ti = getImage();
|
|||
|
|
if (!ti)
|
|||
|
|
return;
|
|||
|
|
bool eraseInk = m_colorType == LINES || m_colorType == ALL;
|
|||
|
|
bool erasePaint = m_colorType == AREAS || m_colorType == ALL;
|
|||
|
|
if (m_eraseType == RECTERASE) {
|
|||
|
|
TRect rect = ToonzImageUtils::eraseRect(ti, m_modifyArea, m_styleId, eraseInk, erasePaint);
|
|||
|
|
if (!rect.isEmpty())
|
|||
|
|
ToolUtils::updateSaveBox(m_level, m_frameId);
|
|||
|
|
|
|||
|
|
} else if (m_eraseType == FREEHANDERASE || m_eraseType == POLYLINEERASE) {
|
|||
|
|
if (m_level) {
|
|||
|
|
TPoint pos;
|
|||
|
|
TRaster32P ras = convertStrokeToImage(m_stroke, ti->getRaster()->getBounds(), pos);
|
|||
|
|
if (!ras)
|
|||
|
|
return;
|
|||
|
|
ToonzImageUtils::eraseImage(ti, ras, pos, m_invert, eraseInk, erasePaint, m_selective, m_styleId);
|
|||
|
|
ToolUtils::updateSaveBox(m_level, m_frameId);
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
TTool::getApplication()->getCurrentXsheet()->notifyXsheetChanged();
|
|||
|
|
notifyImageChanged();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
int getSize() const
|
|||
|
|
{
|
|||
|
|
return TRasterUndo::getSize() +
|
|||
|
|
sizeof(this) +
|
|||
|
|
m_stroke->getControlPointCount() * sizeof(TThickPoint) +
|
|||
|
|
100;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
~RectRasterUndo()
|
|||
|
|
{
|
|||
|
|
if (m_stroke)
|
|||
|
|
delete m_stroke;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
QString getToolName()
|
|||
|
|
{
|
|||
|
|
return QString("Eraser Tool (Rect)");
|
|||
|
|
}
|
|||
|
|
int getHistoryType()
|
|||
|
|
{
|
|||
|
|
return HistoryType::EraserTool;
|
|||
|
|
}
|
|||
|
|
};
|
|||
|
|
|
|||
|
|
//=====================================================================
|
|||
|
|
/*!
|
|||
|
|
Viene realizzata la funzione di "UNDO" per il cancellino nell'opzione NORMALERAS
|
|||
|
|
*/
|
|||
|
|
class RasterEraserUndo : public TRasterUndo
|
|||
|
|
{
|
|||
|
|
vector<TThickPoint> m_points;
|
|||
|
|
int m_styleId;
|
|||
|
|
bool m_selective;
|
|||
|
|
bool m_isPencil;
|
|||
|
|
ColorType m_colorType;
|
|||
|
|
int m_colorSelected;
|
|||
|
|
|
|||
|
|
public:
|
|||
|
|
RasterEraserUndo(TTileSetCM32 *tileSet, const vector<TThickPoint> &points,
|
|||
|
|
ColorType colorType, int styleId, bool selective,
|
|||
|
|
int colorSelected, TXshSimpleLevel *level,
|
|||
|
|
const TFrameId &frameId, bool isPencil)
|
|||
|
|
: TRasterUndo(tileSet, level, frameId, false, false, 0), m_points(points), m_styleId(styleId), m_selective(selective), m_colorType(colorType), m_colorSelected(colorSelected), m_isPencil(isPencil)
|
|||
|
|
{
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
void redo() const
|
|||
|
|
{
|
|||
|
|
TToonzImageP image = m_level->getFrame(m_frameId, true);
|
|||
|
|
TRasterCM32P ras = image->getRaster();
|
|||
|
|
RasterStrokeGenerator m_rasterTrack(ras, ERASE, m_colorType, 0, m_points[0], m_selective, m_colorSelected, !m_isPencil);
|
|||
|
|
m_rasterTrack.setPointsSequence(m_points);
|
|||
|
|
m_rasterTrack.generateStroke(m_isPencil);
|
|||
|
|
image->setSavebox(image->getSavebox() + m_rasterTrack.getBBox(m_rasterTrack.getPointsSequence()));
|
|||
|
|
ToolUtils::updateSaveBox();
|
|||
|
|
TTool::getApplication()->getCurrentXsheet()->notifyXsheetChanged();
|
|||
|
|
notifyImageChanged();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
int getSize() const
|
|||
|
|
{
|
|||
|
|
return sizeof(*this) + TRasterUndo::getSize();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
QString getToolName()
|
|||
|
|
{
|
|||
|
|
return QString("Eraser Tool");
|
|||
|
|
}
|
|||
|
|
int getHistoryType()
|
|||
|
|
{
|
|||
|
|
return HistoryType::EraserTool;
|
|||
|
|
}
|
|||
|
|
};
|
|||
|
|
|
|||
|
|
//=====================================================================
|
|||
|
|
|
|||
|
|
class RasterBluredEraserUndo : public TRasterUndo
|
|||
|
|
{
|
|||
|
|
vector<TThickPoint> m_points;
|
|||
|
|
int m_styleId;
|
|||
|
|
bool m_selective;
|
|||
|
|
int m_size;
|
|||
|
|
double m_hardness;
|
|||
|
|
wstring m_mode;
|
|||
|
|
|
|||
|
|
public:
|
|||
|
|
RasterBluredEraserUndo(TTileSetCM32 *tileSet,
|
|||
|
|
const vector<TThickPoint> &points,
|
|||
|
|
int styleId, bool selective,
|
|||
|
|
TXshSimpleLevel *level, const TFrameId &frameId,
|
|||
|
|
int size, double hardness, const wstring &mode)
|
|||
|
|
: TRasterUndo(tileSet, level, frameId, false, false, 0), m_points(points), m_styleId(styleId), m_selective(selective), m_size(size), m_hardness(hardness), m_mode(mode)
|
|||
|
|
{
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
void redo() const
|
|||
|
|
{
|
|||
|
|
if (m_points.size() == 0)
|
|||
|
|
return;
|
|||
|
|
TToonzImageP image = getImage();
|
|||
|
|
TRasterCM32P ras = image->getRaster();
|
|||
|
|
TRasterCM32P backupRas = ras->clone();
|
|||
|
|
TRaster32P workRaster(ras->getSize());
|
|||
|
|
QRadialGradient brushPad = ToolUtils::getBrushPad(m_size, m_hardness);
|
|||
|
|
workRaster->clear();
|
|||
|
|
BluredBrush brush(workRaster, m_size, brushPad, false);
|
|||
|
|
vector<TThickPoint> points;
|
|||
|
|
points.push_back(m_points[0]);
|
|||
|
|
TRect bbox = brush.getBoundFromPoints(points);
|
|||
|
|
brush.addPoint(m_points[0], 1);
|
|||
|
|
brush.eraseDrawing(ras, ras, bbox, m_selective, m_styleId, m_mode);
|
|||
|
|
if (m_points.size() > 1) {
|
|||
|
|
points.clear();
|
|||
|
|
points.push_back(m_points[0]);
|
|||
|
|
points.push_back(m_points[1]);
|
|||
|
|
bbox = brush.getBoundFromPoints(points);
|
|||
|
|
brush.addArc(m_points[0], (m_points[0] + m_points[1]) * 0.5, m_points[1], 1, 1);
|
|||
|
|
brush.eraseDrawing(ras, backupRas, bbox, m_selective, m_styleId, m_mode);
|
|||
|
|
int i;
|
|||
|
|
for (i = 1; i + 2 < (int)m_points.size(); i = i + 2) {
|
|||
|
|
points.clear();
|
|||
|
|
points.push_back(m_points[i]);
|
|||
|
|
points.push_back(m_points[i + 1]);
|
|||
|
|
points.push_back(m_points[i + 2]);
|
|||
|
|
bbox = brush.getBoundFromPoints(points);
|
|||
|
|
brush.addArc(m_points[i], m_points[i + 1], m_points[i + 2], 1, 1);
|
|||
|
|
brush.eraseDrawing(ras, backupRas, bbox, m_selective, m_styleId, m_mode);
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
ToolUtils::updateSaveBox();
|
|||
|
|
TTool::getApplication()->getCurrentXsheet()->notifyXsheetChanged();
|
|||
|
|
notifyImageChanged();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
int getSize() const
|
|||
|
|
{
|
|||
|
|
return sizeof(*this) + TRasterUndo::getSize();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
QString getToolName()
|
|||
|
|
{
|
|||
|
|
return QString("Eraser Tool");
|
|||
|
|
}
|
|||
|
|
int getHistoryType()
|
|||
|
|
{
|
|||
|
|
return HistoryType::EraserTool;
|
|||
|
|
}
|
|||
|
|
};
|
|||
|
|
|
|||
|
|
void eraseStroke(const TToonzImageP &ti, TStroke *stroke, wstring eraseType,
|
|||
|
|
wstring colorType, bool invert, bool selective,
|
|||
|
|
int styleId, const TXshSimpleLevelP &level, const TFrameId &frameId)
|
|||
|
|
{
|
|||
|
|
assert(stroke);
|
|||
|
|
TPoint pos;
|
|||
|
|
TRasterCM32P ras = ti->getRaster();
|
|||
|
|
TRaster32P image = convertStrokeToImage(stroke, ras->getBounds(), pos);
|
|||
|
|
if (!image)
|
|||
|
|
return;
|
|||
|
|
|
|||
|
|
TRect rasterErasedArea = image->getBounds() + pos;
|
|||
|
|
TRect area;
|
|||
|
|
if (!invert)
|
|||
|
|
area = rasterErasedArea.enlarge(2);
|
|||
|
|
else
|
|||
|
|
area = ras->getBounds();
|
|||
|
|
TTileSetCM32 *tileSet = new TTileSetCM32(ras->getSize());
|
|||
|
|
tileSet->add(ras, area);
|
|||
|
|
TUndoManager::manager()->add(new RectRasterUndo(tileSet, convert(area), *stroke,
|
|||
|
|
selective ? styleId : -1, eraseType, colorType, level.getPointer(),
|
|||
|
|
selective, invert, frameId));
|
|||
|
|
bool eraseInk = colorType == LINES || colorType == ALL;
|
|||
|
|
bool erasePaint = colorType == AREAS || colorType == ALL;
|
|||
|
|
ToonzImageUtils::eraseImage(ti, image, pos, invert, eraseInk, erasePaint, selective, styleId);
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//-----------------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void drawLine(const TPointD &point, const TPointD ¢re, bool horizontal, bool isDecimal)
|
|||
|
|
{
|
|||
|
|
if (!isDecimal) {
|
|||
|
|
if (horizontal) {
|
|||
|
|
tglDrawSegment(TPointD(point.x - 1.5, point.y + 0.5) + centre, TPointD(point.x - 0.5, point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.y - 0.5, -point.x + 1.5) + centre, TPointD(point.y - 0.5, -point.x + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.x + 0.5, -point.y + 0.5) + centre, TPointD(-point.x - 0.5, -point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.y - 0.5, point.x - 0.5) + centre, TPointD(-point.y - 0.5, point.x + 0.5) + centre);
|
|||
|
|
|
|||
|
|
tglDrawSegment(TPointD(point.y - 0.5, point.x + 0.5) + centre, TPointD(point.y - 0.5, point.x - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.x - 0.5, -point.y + 0.5) + centre, TPointD(point.x - 1.5, -point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.y - 0.5, -point.x + 0.5) + centre, TPointD(-point.y - 0.5, -point.x + 1.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.x - 0.5, point.y + 0.5) + centre, TPointD(-point.x + 0.5, point.y + 0.5) + centre);
|
|||
|
|
} else {
|
|||
|
|
tglDrawSegment(TPointD(point.x - 1.5, point.y + 1.5) + centre, TPointD(point.x - 1.5, point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.x - 1.5, point.y + 0.5) + centre, TPointD(point.x - 0.5, point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.y + 0.5, -point.x + 1.5) + centre, TPointD(point.y - 0.5, -point.x + 1.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.y - 0.5, -point.x + 1.5) + centre, TPointD(point.y - 0.5, -point.x + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.x + 0.5, -point.y - 0.5) + centre, TPointD(-point.x + 0.5, -point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.x + 0.5, -point.y + 0.5) + centre, TPointD(-point.x - 0.5, -point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.y - 1.5, point.x - 0.5) + centre, TPointD(-point.y - 0.5, point.x - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.y - 0.5, point.x - 0.5) + centre, TPointD(-point.y - 0.5, point.x + 0.5) + centre);
|
|||
|
|
|
|||
|
|
tglDrawSegment(TPointD(point.y + 0.5, point.x - 0.5) + centre, TPointD(point.y - 0.5, point.x - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.y - 0.5, point.x - 0.5) + centre, TPointD(point.y - 0.5, point.x + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.x - 1.5, -point.y - 0.5) + centre, TPointD(point.x - 1.5, -point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.x - 1.5, -point.y + 0.5) + centre, TPointD(point.x - 0.5, -point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.y - 1.5, -point.x + 1.5) + centre, TPointD(-point.y - 0.5, -point.x + 1.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.y - 0.5, -point.x + 1.5) + centre, TPointD(-point.y - 0.5, -point.x + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.x + 0.5, point.y + 1.5) + centre, TPointD(-point.x + 0.5, point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.x + 0.5, point.y + 0.5) + centre, TPointD(-point.x - 0.5, point.y + 0.5) + centre);
|
|||
|
|
}
|
|||
|
|
} else {
|
|||
|
|
if (horizontal) {
|
|||
|
|
tglDrawSegment(TPointD(point.x - 0.5, point.y + 0.5) + centre, TPointD(point.x + 0.5, point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.y + 0.5, point.x - 0.5) + centre, TPointD(point.y + 0.5, point.x + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.y + 0.5, -point.x + 0.5) + centre, TPointD(point.y + 0.5, -point.x - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.x + 0.5, -point.y - 0.5) + centre, TPointD(point.x - 0.5, -point.y - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.x - 0.5, -point.y - 0.5) + centre, TPointD(-point.x + 0.5, -point.y - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.y - 0.5, -point.x + 0.5) + centre, TPointD(-point.y - 0.5, -point.x - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.y - 0.5, point.x - 0.5) + centre, TPointD(-point.y - 0.5, point.x + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.x + 0.5, point.y + 0.5) + centre, TPointD(-point.x - 0.5, point.y + 0.5) + centre);
|
|||
|
|
} else {
|
|||
|
|
tglDrawSegment(TPointD(point.x - 0.5, point.y + 1.5) + centre, TPointD(point.x - 0.5, point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.x - 0.5, point.y + 0.5) + centre, TPointD(point.x + 0.5, point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.y + 1.5, point.x - 0.5) + centre, TPointD(point.y + 0.5, point.x - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.y + 0.5, point.x - 0.5) + centre, TPointD(point.y + 0.5, point.x + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.y + 1.5, -point.x + 0.5) + centre, TPointD(point.y + 0.5, -point.x + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.y + 0.5, -point.x + 0.5) + centre, TPointD(point.y + 0.5, -point.x - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.x - 0.5, -point.y - 1.5) + centre, TPointD(point.x - 0.5, -point.y - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(point.x - 0.5, -point.y - 0.5) + centre, TPointD(point.x + 0.5, -point.y - 0.5) + centre);
|
|||
|
|
|
|||
|
|
tglDrawSegment(TPointD(-point.x + 0.5, -point.y - 1.5) + centre, TPointD(-point.x + 0.5, -point.y - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.x + 0.5, -point.y - 0.5) + centre, TPointD(-point.x - 0.5, -point.y - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.y - 1.5, -point.x + 0.5) + centre, TPointD(-point.y - 0.5, -point.x + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.y - 0.5, -point.x + 0.5) + centre, TPointD(-point.y - 0.5, -point.x - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.y - 1.5, point.x - 0.5) + centre, TPointD(-point.y - 0.5, point.x - 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.y - 0.5, point.x - 0.5) + centre, TPointD(-point.y - 0.5, point.x + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.x + 0.5, point.y + 1.5) + centre, TPointD(-point.x + 0.5, point.y + 0.5) + centre);
|
|||
|
|
tglDrawSegment(TPointD(-point.x + 0.5, point.y + 0.5) + centre, TPointD(-point.x - 0.5, point.y + 0.5) + centre);
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//-------------------------------------------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void drawEmptyCircle(int thick, const TPointD &mousePos, bool isPencil, bool isLxEven, bool isLyEven)
|
|||
|
|
{
|
|||
|
|
TPointD pos = mousePos;
|
|||
|
|
if (isLxEven)
|
|||
|
|
pos.x += 0.5;
|
|||
|
|
if (isLyEven)
|
|||
|
|
pos.y += 0.5;
|
|||
|
|
if (!isPencil)
|
|||
|
|
tglDrawCircle(pos, (thick)*0.5);
|
|||
|
|
else {
|
|||
|
|
int x = 0, y = tround((thick * 0.5) - 0.5);
|
|||
|
|
int d = 3 - 2 * (int)(thick * 0.5);
|
|||
|
|
bool horizontal = true, isDecimal = thick % 2 != 0;
|
|||
|
|
drawLine(TPointD(x, y), pos, horizontal, isDecimal);
|
|||
|
|
while (y > x) {
|
|||
|
|
if (d < 0) {
|
|||
|
|
d = d + 4 * x + 6;
|
|||
|
|
horizontal = true;
|
|||
|
|
} else {
|
|||
|
|
d = d + 4 * (x - y) + 10;
|
|||
|
|
horizontal = false;
|
|||
|
|
y--;
|
|||
|
|
}
|
|||
|
|
x++;
|
|||
|
|
drawLine(TPointD(x, y), pos, horizontal, isDecimal);
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//==================================================================================================
|
|||
|
|
//
|
|||
|
|
// InkPaintTool class declaration
|
|||
|
|
//
|
|||
|
|
//------------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
class EraserTool : public TTool
|
|||
|
|
{
|
|||
|
|
Q_DECLARE_TR_FUNCTIONS(EraserTool)
|
|||
|
|
|
|||
|
|
public:
|
|||
|
|
EraserTool(string name);
|
|||
|
|
~EraserTool()
|
|||
|
|
{
|
|||
|
|
if (m_firstStroke)
|
|||
|
|
delete m_firstStroke;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
ToolType getToolType() const { return TTool::LevelWriteTool; }
|
|||
|
|
|
|||
|
|
void updateTranslation();
|
|||
|
|
|
|||
|
|
void draw();
|
|||
|
|
|
|||
|
|
void update(const TToonzImageP &ti, const TPointD &pos);
|
|||
|
|
void saveUndo();
|
|||
|
|
void update(const TToonzImageP &ti, TRectD selArea, const TXshSimpleLevelP &level, bool multi = false,
|
|||
|
|
const TFrameId &frameId = -1);
|
|||
|
|
|
|||
|
|
void leftButtonDown(const TPointD &pos, const TMouseEvent &e);
|
|||
|
|
void leftButtonDrag(const TPointD &pos, const TMouseEvent &e);
|
|||
|
|
void leftButtonUp(const TPointD &pos, const TMouseEvent &);
|
|||
|
|
void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e);
|
|||
|
|
|
|||
|
|
void multiAreaEraser(const TXshSimpleLevelP &sl, TFrameId &firstFid, TFrameId &lastFid,
|
|||
|
|
TStroke *firstStroke, TStroke *lastStroke);
|
|||
|
|
void doMultiEraser(const TImageP &img, double t,
|
|||
|
|
const TXshSimpleLevelP &sl, const TFrameId &fid,
|
|||
|
|
const TVectorImageP &firstImage, const TVectorImageP &lastImage);
|
|||
|
|
|
|||
|
|
void mouseMove(const TPointD &pos, const TMouseEvent &e);
|
|||
|
|
void onEnter();
|
|||
|
|
void onLeave();
|
|||
|
|
void onActivate();
|
|||
|
|
bool onPropertyChanged(string propertyName);
|
|||
|
|
void onImageChanged();
|
|||
|
|
|
|||
|
|
void multiUpdate(const TXshSimpleLevelP &level, TFrameId firstFrameId, TFrameId lastFrameId, TRectD firstRect, TRectD lastRect);
|
|||
|
|
|
|||
|
|
TPropertyGroup *getProperties(int targetType) { return &m_prop; }
|
|||
|
|
|
|||
|
|
int getCursorId() const;
|
|||
|
|
void resetMulti();
|
|||
|
|
|
|||
|
|
/*-- ドラッグ中にツールが切り替わった場合、処理を終了させる--*/
|
|||
|
|
void onDeactivate();
|
|||
|
|
/*-- Brush、PaintBrush、EraserToolがPencilModeのときにTrueを返す --*/
|
|||
|
|
bool isPencilModeActive();
|
|||
|
|
|
|||
|
|
private:
|
|||
|
|
/*-- 終了処理 --*/
|
|||
|
|
void storeUndoAndRefresh();
|
|||
|
|
|
|||
|
|
enum Type {
|
|||
|
|
NONE = 0,
|
|||
|
|
BRUSH,
|
|||
|
|
INKCHANGE,
|
|||
|
|
ERASER
|
|||
|
|
};
|
|||
|
|
|
|||
|
|
private:
|
|||
|
|
TPropertyGroup m_prop;
|
|||
|
|
|
|||
|
|
TEnumProperty m_eraseType;
|
|||
|
|
TIntProperty m_toolSize;
|
|||
|
|
TDoubleProperty m_hardness;
|
|||
|
|
TBoolProperty m_invertOption;
|
|||
|
|
TBoolProperty m_currentStyle;
|
|||
|
|
TBoolProperty m_multi;
|
|||
|
|
TBoolProperty m_pencil;
|
|||
|
|
TEnumProperty m_colorType;
|
|||
|
|
|
|||
|
|
Type m_type;
|
|||
|
|
|
|||
|
|
TXshSimpleLevelP m_level;
|
|||
|
|
std::pair<int, int> m_currCell;
|
|||
|
|
|
|||
|
|
TFrameId m_firstFrameId,
|
|||
|
|
m_veryFirstFrameId;
|
|||
|
|
|
|||
|
|
StrokeGenerator m_track;
|
|||
|
|
|
|||
|
|
TStroke *m_firstStroke;
|
|||
|
|
|
|||
|
|
TTileSaverCM32 *m_tileSaver;
|
|||
|
|
TTileSetCM32 *m_tileSet;
|
|||
|
|
|
|||
|
|
RasterStrokeGenerator *m_normalEraser;
|
|||
|
|
|
|||
|
|
TRectD m_selectingRect,
|
|||
|
|
m_firstRect;
|
|||
|
|
|
|||
|
|
ColorType m_colorTypeEraser;
|
|||
|
|
|
|||
|
|
TPointD m_mousePos,
|
|||
|
|
m_brushPos,
|
|||
|
|
m_firstPos;
|
|||
|
|
|
|||
|
|
vector<TPointD> m_polyline;
|
|||
|
|
|
|||
|
|
//gestione cancellino blurato
|
|||
|
|
TRasterCM32P m_backupRas;
|
|||
|
|
TRaster32P m_workRas;
|
|||
|
|
QRadialGradient m_brushPad;
|
|||
|
|
vector<TThickPoint> m_points;
|
|||
|
|
BluredBrush *m_bluredBrush;
|
|||
|
|
|
|||
|
|
double m_pointSize,
|
|||
|
|
m_distance2,
|
|||
|
|
m_cleanerSize,
|
|||
|
|
m_thick;
|
|||
|
|
|
|||
|
|
bool m_isXsheetCell,
|
|||
|
|
m_active,
|
|||
|
|
m_enabled,
|
|||
|
|
m_selecting,
|
|||
|
|
m_firstFrameSelected,
|
|||
|
|
m_firstTime;
|
|||
|
|
|
|||
|
|
/*--- 消しゴム開始時のFrameIdを保存し、マウスリリース時（Undoの登録時）に
|
|||
|
|
別のフレームに移動していた場合に備える
|
|||
|
|
---*/
|
|||
|
|
TFrameId m_workingFrameId;
|
|||
|
|
/*--- マウスボタンDown→プロパティ変更→マウスボタンUpのように、
|
|||
|
|
ボタンDownからUpまでストレートに来なかった場合は処理を行わないようにする。
|
|||
|
|
---*/
|
|||
|
|
bool m_isLeftButtonPressed;
|
|||
|
|
};
|
|||
|
|
|
|||
|
|
EraserTool inkPaintEraserTool("T_Eraser");
|
|||
|
|
|
|||
|
|
//==================================================================================================
|
|||
|
|
//
|
|||
|
|
// InkPaintTool implemention
|
|||
|
|
//
|
|||
|
|
//------------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
EraserTool::EraserTool(string name)
|
|||
|
|
: TTool(name), m_toolSize("Size:", 1, 100, 10, false) //W_ToolOptions_EraserToolSize
|
|||
|
|
,
|
|||
|
|
m_hardness("Hardness:", 0, 100, 100), m_eraseType("Type:") //W_ToolOptions_Erasetype
|
|||
|
|
,
|
|||
|
|
m_colorType("Mode:") //W_ToolOptions_InkOrPaint
|
|||
|
|
,
|
|||
|
|
m_currentStyle("Selective", false) //W_ToolOptions_Selective
|
|||
|
|
,
|
|||
|
|
m_invertOption("Invert", false) //W_ToolOptions_Invert
|
|||
|
|
,
|
|||
|
|
m_multi("Frame Range", false) //W_ToolOptions_FrameRange
|
|||
|
|
,
|
|||
|
|
m_pencil("Pencil Mode", false), m_currCell(-1, -1), m_tileSaver(0), m_bluredBrush(0), m_pointSize(-1), m_thick(0.5), m_firstFrameSelected(false), m_selecting(false), m_active(false), m_enabled(false), m_isXsheetCell(false), m_firstTime(true), m_workingFrameId(TFrameId()), m_isLeftButtonPressed(false)
|
|||
|
|
{
|
|||
|
|
bind(TTool::ToonzImage);
|
|||
|
|
|
|||
|
|
m_prop.bind(m_toolSize);
|
|||
|
|
m_prop.bind(m_hardness);
|
|||
|
|
m_prop.bind(m_eraseType);
|
|||
|
|
m_eraseType.addValue(NORMALERASE);
|
|||
|
|
m_eraseType.addValue(RECTERASE);
|
|||
|
|
m_eraseType.addValue(FREEHANDERASE);
|
|||
|
|
m_eraseType.addValue(POLYLINEERASE);
|
|||
|
|
|
|||
|
|
m_colorType.addValue(LINES);
|
|||
|
|
m_colorType.addValue(AREAS);
|
|||
|
|
m_colorType.addValue(ALL);
|
|||
|
|
m_prop.bind(m_colorType);
|
|||
|
|
|
|||
|
|
m_prop.bind(m_currentStyle);
|
|||
|
|
m_prop.bind(m_invertOption);
|
|||
|
|
m_prop.bind(m_multi);
|
|||
|
|
m_prop.bind(m_pencil);
|
|||
|
|
|
|||
|
|
m_currentStyle.setId("Selective");
|
|||
|
|
m_invertOption.setId("Invert");
|
|||
|
|
m_multi.setId("FrameRange");
|
|||
|
|
m_pencil.setId("PencilMode");
|
|||
|
|
m_colorType.setId("Mode");
|
|||
|
|
m_eraseType.setId("Type");
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//------------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::updateTranslation()
|
|||
|
|
{
|
|||
|
|
m_toolSize.setQStringName(tr("Size:"));
|
|||
|
|
m_hardness.setQStringName(tr("Hardness:"));
|
|||
|
|
m_eraseType.setQStringName(tr("Type:"));
|
|||
|
|
m_colorType.setQStringName(tr("Mode:"));
|
|||
|
|
m_currentStyle.setQStringName(tr("Selective"));
|
|||
|
|
m_invertOption.setQStringName(tr("Invert"));
|
|||
|
|
m_multi.setQStringName(tr("Frame Range"));
|
|||
|
|
m_pencil.setQStringName(tr("Pencil Mode"));
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//------------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::draw()
|
|||
|
|
{
|
|||
|
|
/*-- MouseLeave時に赤点が描かれるのを防ぐ --*/
|
|||
|
|
if (m_pointSize == -1 && m_cleanerSize == 0)
|
|||
|
|
return;
|
|||
|
|
|
|||
|
|
double pixelSize2 = getPixelSize() * getPixelSize();
|
|||
|
|
m_thick = sqrt(pixelSize2) / 2.0;
|
|||
|
|
|
|||
|
|
TImageP img = getImage(false);
|
|||
|
|
if (!img)
|
|||
|
|
return;
|
|||
|
|
|
|||
|
|
if (m_eraseType.getValue() == RECTERASE) {
|
|||
|
|
TPixel color = TPixel32::Red;
|
|||
|
|
if (m_multi.getValue() && m_firstFrameSelected)
|
|||
|
|
drawRect(m_firstRect, color, 0x3F33, true);
|
|||
|
|
|
|||
|
|
if (m_selecting || (m_multi.getValue() && !m_firstFrameSelected))
|
|||
|
|
drawRect(m_selectingRect, color, 0xFFFF, true);
|
|||
|
|
}
|
|||
|
|
if (m_eraseType.getValue() == NORMALERASE) {
|
|||
|
|
TToonzImageP image(img);
|
|||
|
|
TRasterP ras = image->getRaster();
|
|||
|
|
int lx = ras->getLx();
|
|||
|
|
int ly = ras->getLy();
|
|||
|
|
|
|||
|
|
/*-- InkCheck, PaintCheck, Ink#1CheckがONのときは、BrushTipの描画色を変える --*/
|
|||
|
|
if ((ToonzCheck::instance()->getChecks() & ToonzCheck::eInk) || (ToonzCheck::instance()->getChecks() & ToonzCheck::ePaint) || (ToonzCheck::instance()->getChecks() & ToonzCheck::eInk1))
|
|||
|
|
glColor3d(0.5, 0.8, 0.8);
|
|||
|
|
else
|
|||
|
|
glColor3d(1.0, 0.0, 0.0);
|
|||
|
|
drawEmptyCircle(tround(m_cleanerSize), m_brushPos,
|
|||
|
|
(m_pencil.getValue() || m_colorType.getValue() == AREAS),
|
|||
|
|
lx % 2 == 0, ly % 2 == 0);
|
|||
|
|
}
|
|||
|
|
if ((m_eraseType.getValue() == FREEHANDERASE || m_eraseType.getValue() == POLYLINEERASE) && m_multi.getValue()) {
|
|||
|
|
TPixel color = TPixel32::Red;
|
|||
|
|
tglColor(color);
|
|||
|
|
if (m_firstStroke)
|
|||
|
|
drawStrokeCenterline(*m_firstStroke, 1);
|
|||
|
|
}
|
|||
|
|
if (m_eraseType.getValue() == POLYLINEERASE && !m_polyline.empty()) {
|
|||
|
|
TPixel color = TPixel32::Red;
|
|||
|
|
tglColor(color);
|
|||
|
|
tglDrawCircle(m_polyline[0], 2);
|
|||
|
|
glBegin(GL_LINE_STRIP);
|
|||
|
|
for (UINT i = 0; i < m_polyline.size(); i++)
|
|||
|
|
tglVertex(m_polyline[i]);
|
|||
|
|
tglVertex(m_mousePos);
|
|||
|
|
glEnd();
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
int EraserTool::getCursorId() const
|
|||
|
|
{
|
|||
|
|
if (m_eraseType.getValue() == NORMALERASE)
|
|||
|
|
return ToolCursor::NormalEraserCursor;
|
|||
|
|
else if (ToonzCheck::instance()->getChecks() & ToonzCheck::eBlackBg)
|
|||
|
|
return ToolCursor::RectEraserCursorWhite;
|
|||
|
|
else
|
|||
|
|
return ToolCursor::RectEraserCursor;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::resetMulti()
|
|||
|
|
{
|
|||
|
|
m_isXsheetCell = false;
|
|||
|
|
m_firstFrameSelected = false;
|
|||
|
|
m_firstRect.empty();
|
|||
|
|
m_selectingRect.empty();
|
|||
|
|
TTool::Application *app = TTool::getApplication();
|
|||
|
|
m_level = app->getCurrentLevel()->getLevel()
|
|||
|
|
? app->getCurrentLevel()->getSimpleLevel()
|
|||
|
|
: 0;
|
|||
|
|
m_firstFrameId = m_veryFirstFrameId = getFrameId();
|
|||
|
|
if (m_firstStroke) {
|
|||
|
|
delete m_firstStroke;
|
|||
|
|
m_firstStroke = 0;
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::multiUpdate(const TXshSimpleLevelP &level, TFrameId firstFid, TFrameId lastFid, TRectD firstRect, TRectD lastRect)
|
|||
|
|
{
|
|||
|
|
bool backward = false;
|
|||
|
|
if (firstFid > lastFid) {
|
|||
|
|
tswap(firstFid, lastFid);
|
|||
|
|
backward = true;
|
|||
|
|
}
|
|||
|
|
assert(firstFid <= lastFid);
|
|||
|
|
vector<TFrameId> allFids;
|
|||
|
|
level->getFids(allFids);
|
|||
|
|
|
|||
|
|
/*-- フレーム範囲に対応するFIdを取得 --*/
|
|||
|
|
std::vector<TFrameId>::iterator i0 = allFids.begin();
|
|||
|
|
while (i0 != allFids.end() && *i0 < firstFid)
|
|||
|
|
i0++;
|
|||
|
|
if (i0 == allFids.end())
|
|||
|
|
return;
|
|||
|
|
std::vector<TFrameId>::iterator i1 = i0;
|
|||
|
|
while (i1 != allFids.end() && *i1 <= lastFid)
|
|||
|
|
i1++;
|
|||
|
|
assert(i0 < i1);
|
|||
|
|
vector<TFrameId> fids(i0, i1);
|
|||
|
|
int m = fids.size();
|
|||
|
|
assert(m > 0);
|
|||
|
|
|
|||
|
|
wstring levelName = level->getName();
|
|||
|
|
|
|||
|
|
/*-- FrameRangeの各フレームについて --*/
|
|||
|
|
TUndoManager::manager()->beginBlock();
|
|||
|
|
for (int i = 0; i < m; ++i) {
|
|||
|
|
TFrameId fid = fids[i];
|
|||
|
|
assert(firstFid <= fid && fid <= lastFid);
|
|||
|
|
TToonzImageP ti = level->getFrame(fid, true);
|
|||
|
|
if (!ti)
|
|||
|
|
continue;
|
|||
|
|
/*--補間の係数を取得 --*/
|
|||
|
|
double t = m > 1 ? (double)i / (double)(m - 1) : 0.5;
|
|||
|
|
/*--invertがONのとき、外側領域を4つのRectに分けてupdate--*/
|
|||
|
|
if (m_invertOption.getValue()) {
|
|||
|
|
TRect rect = convert(interpolateRect(firstRect, lastRect, backward ? 1 - t : t));
|
|||
|
|
TRectD rect01 = TRectD(TPointD(-100000., -100000.), TPointD((double)rect.x0, 100000.));
|
|||
|
|
update(ti, rect01, level, true, fid);
|
|||
|
|
TRectD rect02 = TRectD(convert(rect.getP01()), TPointD((double)rect.x1, 100000.));
|
|||
|
|
update(ti, rect02, level, true, fid);
|
|||
|
|
TRectD rect03 = TRectD(TPointD((double)rect.x0, -100000.), convert(rect.getP10()));
|
|||
|
|
update(ti, rect03, level, true, fid);
|
|||
|
|
TRectD rect04 = TRectD(TPointD((double)rect.x1, -100000.), TPointD(100000., 100000.));
|
|||
|
|
update(ti, rect04, level, true, fid);
|
|||
|
|
} else
|
|||
|
|
update(ti, interpolateRect(firstRect, lastRect, backward ? 1 - t : t), level, true, fid);
|
|||
|
|
|
|||
|
|
TRect savebox;
|
|||
|
|
TRop::computeBBox(ti->getRaster(), savebox);
|
|||
|
|
ti->setSavebox(savebox);
|
|||
|
|
|
|||
|
|
level->getProperties()->setDirtyFlag(true);
|
|||
|
|
notifyImageChanged(fid);
|
|||
|
|
}
|
|||
|
|
TUndoManager::manager()->endBlock();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::update(const TToonzImageP &ti, TRectD selArea, const TXshSimpleLevelP &level,
|
|||
|
|
bool multi, const TFrameId &frameId)
|
|||
|
|
{
|
|||
|
|
if (m_selectingRect.x0 > m_selectingRect.x1) {
|
|||
|
|
selArea.x1 = m_selectingRect.x0;
|
|||
|
|
selArea.x0 = m_selectingRect.x1;
|
|||
|
|
}
|
|||
|
|
if (m_selectingRect.y0 > m_selectingRect.y1) {
|
|||
|
|
selArea.y1 = m_selectingRect.y0;
|
|||
|
|
selArea.y0 = m_selectingRect.y1;
|
|||
|
|
}
|
|||
|
|
if (selArea.getLx() < 1 || selArea.getLy() < 1)
|
|||
|
|
return;
|
|||
|
|
bool selective = m_currentStyle.getValue();
|
|||
|
|
int styleId = TTool::getApplication()->getCurrentLevelStyleIndex();
|
|||
|
|
|
|||
|
|
TRasterCM32P raster = ti->getRaster();
|
|||
|
|
TTileSetCM32 *tileSet = new TTileSetCM32(raster->getSize());
|
|||
|
|
tileSet->add(raster, ToonzImageUtils::convertWorldToRaster(selArea, ti));
|
|||
|
|
TUndo *undo;
|
|||
|
|
|
|||
|
|
wstring inkPaint = m_colorType.getValue();
|
|||
|
|
undo = new RectRasterUndo(tileSet, selArea, TStroke(), selective ? styleId : -1, m_eraseType.getValue(), inkPaint,
|
|||
|
|
level.getPointer(), selective, m_invertOption.getValue(), frameId);
|
|||
|
|
|
|||
|
|
ToonzImageUtils::eraseRect(ti, selArea, selective ? styleId : -1,
|
|||
|
|
inkPaint == LINES || inkPaint == ALL,
|
|||
|
|
inkPaint == AREAS || inkPaint == ALL);
|
|||
|
|
|
|||
|
|
TUndoManager::manager()->add(undo);
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::leftButtonDown(const TPointD &pos, const TMouseEvent &e)
|
|||
|
|
{
|
|||
|
|
m_selecting = true;
|
|||
|
|
TImageP image(getImage(true));
|
|||
|
|
|
|||
|
|
TRectD invalidateRect;
|
|||
|
|
if (TToonzImageP ti = image) {
|
|||
|
|
if (m_eraseType.getValue() == RECTERASE) {
|
|||
|
|
if (m_multi.getValue() && m_firstRect.isEmpty()) {
|
|||
|
|
invalidateRect = m_selectingRect;
|
|||
|
|
m_selectingRect.empty();
|
|||
|
|
invalidate(invalidateRect.enlarge(2));
|
|||
|
|
}
|
|||
|
|
m_selectingRect.x0 = pos.x;
|
|||
|
|
m_selectingRect.y0 = pos.y;
|
|||
|
|
m_selectingRect.x1 = pos.x + 1;
|
|||
|
|
m_selectingRect.y1 = pos.y + 1;
|
|||
|
|
invalidateRect = m_selectingRect.enlarge(2);
|
|||
|
|
}
|
|||
|
|
if (m_eraseType.getValue() == NORMALERASE) {
|
|||
|
|
TRasterCM32P raster = ti->getRaster();
|
|||
|
|
TThickPoint intPos;
|
|||
|
|
/*--Areasタイプの時は常にPencilと同じ消し方にする--*/
|
|||
|
|
if (m_pencil.getValue() || m_colorType.getValue() == AREAS)
|
|||
|
|
intPos = TThickPoint(pos + convert(raster->getCenter()), m_toolSize.getValue());
|
|||
|
|
else
|
|||
|
|
intPos = TThickPoint(pos + convert(raster->getCenter()), m_toolSize.getValue() - 1);
|
|||
|
|
int currentStyle = 0;
|
|||
|
|
if (m_currentStyle.getValue())
|
|||
|
|
currentStyle = TTool::getApplication()->getCurrentLevelStyleIndex();
|
|||
|
|
m_tileSet = new TTileSetCM32(raster->getSize());
|
|||
|
|
m_tileSaver = new TTileSaverCM32(raster, m_tileSet);
|
|||
|
|
TPointD halfThick(m_toolSize.getValue() * 0.5, m_toolSize.getValue() * 0.5);
|
|||
|
|
invalidateRect = TRectD(pos - halfThick, pos + halfThick);
|
|||
|
|
if (m_hardness.getValue() == 100 || m_pencil.getValue() || m_colorType.getValue() == AREAS) {
|
|||
|
|
if (m_colorType.getValue() == LINES) {
|
|||
|
|
m_colorTypeEraser = INK;
|
|||
|
|
}
|
|||
|
|
if (m_colorType.getValue() == AREAS)
|
|||
|
|
m_colorTypeEraser = PAINT;
|
|||
|
|
if (m_colorType.getValue() == ALL)
|
|||
|
|
m_colorTypeEraser = INKNPAINT;
|
|||
|
|
m_normalEraser = new RasterStrokeGenerator(raster, ERASE, m_colorTypeEraser, 0, intPos,
|
|||
|
|
m_currentStyle.getValue(), currentStyle,
|
|||
|
|
!(m_pencil.getValue() || m_colorType.getValue() == AREAS));
|
|||
|
|
m_tileSaver->save(m_normalEraser->getLastRect());
|
|||
|
|
m_normalEraser->generateLastPieceOfStroke(m_pencil.getValue() || m_colorType.getValue() == AREAS);
|
|||
|
|
} else {
|
|||
|
|
m_points.clear();
|
|||
|
|
m_backupRas = raster->clone();
|
|||
|
|
m_workRas = TRaster32P(raster->getSize());
|
|||
|
|
m_workRas->clear();
|
|||
|
|
TPointD center = raster->getCenterD();
|
|||
|
|
TThickPoint point(pos + center, m_toolSize.getValue());
|
|||
|
|
m_points.push_back(point);
|
|||
|
|
m_bluredBrush = new BluredBrush(m_workRas, m_toolSize.getValue(), m_brushPad, false);
|
|||
|
|
|
|||
|
|
TRect bbox = m_bluredBrush->getBoundFromPoints(m_points);
|
|||
|
|
m_tileSaver->save(bbox);
|
|||
|
|
m_bluredBrush->addPoint(point, 1);
|
|||
|
|
m_bluredBrush->eraseDrawing(raster, m_backupRas, bbox, m_currentStyle.getValue(),
|
|||
|
|
currentStyle, m_colorType.getValue());
|
|||
|
|
}
|
|||
|
|
/*--- 現在のFidを記憶する ---*/
|
|||
|
|
m_workingFrameId = getFrameId();
|
|||
|
|
}
|
|||
|
|
if (m_eraseType.getValue() == FREEHANDERASE || m_eraseType.getValue() == POLYLINEERASE) {
|
|||
|
|
int col = getColumnIndex();
|
|||
|
|
m_enabled = col >= 0;
|
|||
|
|
|
|||
|
|
if (!m_enabled)
|
|||
|
|
return;
|
|||
|
|
|
|||
|
|
if (m_multi.getValue() && m_firstStroke && !m_firstFrameSelected) {
|
|||
|
|
invalidateRect = m_firstStroke->getBBox();
|
|||
|
|
delete m_firstStroke;
|
|||
|
|
m_firstStroke = 0;
|
|||
|
|
invalidate(invalidateRect.enlarge(2));
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
m_active = true;
|
|||
|
|
m_track.clear();
|
|||
|
|
m_firstPos = pos;
|
|||
|
|
double pixelSize2 = getPixelSize() * getPixelSize();
|
|||
|
|
m_track.add(TThickPoint(pos, m_thick), pixelSize2);
|
|||
|
|
TPointD dpiScale = m_viewer->getDpiScale();
|
|||
|
|
|
|||
|
|
TPixel color = ToonzCheck::instance()->getChecks() & ToonzCheck::eBlackBg ? TPixel32::White : TPixel32::Black;
|
|||
|
|
tglColor(color);
|
|||
|
|
|
|||
|
|
getViewer()->startForegroundDrawing();
|
|||
|
|
|
|||
|
|
glPushMatrix();
|
|||
|
|
glScaled(dpiScale.x, dpiScale.y, 1);
|
|||
|
|
if (m_eraseType.getValue() == POLYLINEERASE) {
|
|||
|
|
if (m_polyline.empty() || m_polyline.back() != pos)
|
|||
|
|
m_polyline.push_back(pos);
|
|||
|
|
} else
|
|||
|
|
m_track.drawLastFragments();
|
|||
|
|
glPopMatrix();
|
|||
|
|
getViewer()->endForegroundDrawing();
|
|||
|
|
int maxThick = 2 * m_thick;
|
|||
|
|
TPointD halfThick(maxThick * 0.5, maxThick * 0.5);
|
|||
|
|
invalidateRect = TRectD(pos - halfThick, pos + halfThick);
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
invalidate(invalidateRect.enlarge(2));
|
|||
|
|
m_isLeftButtonPressed = true;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::leftButtonDrag(const TPointD &pos, const TMouseEvent &e)
|
|||
|
|
{
|
|||
|
|
/*-- 先にLeftButtonDownに入っていなければreturn --*/
|
|||
|
|
if (!m_isLeftButtonPressed)
|
|||
|
|
return;
|
|||
|
|
|
|||
|
|
double pixelSize2 = getPixelSize() * getPixelSize();
|
|||
|
|
|
|||
|
|
m_brushPos = m_mousePos = pos;
|
|||
|
|
if (!m_selecting)
|
|||
|
|
return;
|
|||
|
|
|
|||
|
|
TImageP image(getImage(true));
|
|||
|
|
|
|||
|
|
if (TToonzImageP ti = image) {
|
|||
|
|
TRectD invalidateRect;
|
|||
|
|
TPointD rasCenter = ti->getRaster()->getCenterD();
|
|||
|
|
if (m_eraseType.getValue() == RECTERASE) {
|
|||
|
|
TRectD oldRect = m_selectingRect;
|
|||
|
|
if (oldRect.x0 > oldRect.x1)
|
|||
|
|
tswap(oldRect.x1, oldRect.x0);
|
|||
|
|
if (oldRect.y0 > oldRect.y1)
|
|||
|
|
tswap(oldRect.y1, oldRect.y0);
|
|||
|
|
m_selectingRect.x1 = pos.x;
|
|||
|
|
m_selectingRect.y1 = pos.y;
|
|||
|
|
invalidateRect = m_selectingRect;
|
|||
|
|
if (invalidateRect.x0 > invalidateRect.x1)
|
|||
|
|
tswap(invalidateRect.x1, invalidateRect.x0);
|
|||
|
|
if (invalidateRect.y0 > invalidateRect.y1)
|
|||
|
|
tswap(invalidateRect.y1, invalidateRect.y0);
|
|||
|
|
invalidateRect += oldRect;
|
|||
|
|
invalidate(invalidateRect.enlarge(2));
|
|||
|
|
}
|
|||
|
|
if (m_eraseType.getValue() == NORMALERASE) {
|
|||
|
|
if (m_normalEraser && (m_hardness.getValue() == 100 || m_pencil.getValue() || m_colorType.getValue() == AREAS)) {
|
|||
|
|
TPointD pp(pos.x, pos.y);
|
|||
|
|
TThickPoint intPos;
|
|||
|
|
if (m_pencil.getValue() || m_colorType.getValue() == AREAS)
|
|||
|
|
intPos = TThickPoint(pp + convert(ti->getRaster()->getCenter()), m_toolSize.getValue());
|
|||
|
|
else
|
|||
|
|
intPos = TThickPoint(pp + convert(ti->getRaster()->getCenter()), m_toolSize.getValue() - 1);
|
|||
|
|
|
|||
|
|
bool isAdded = m_normalEraser->add(intPos);
|
|||
|
|
if (ti && isAdded) {
|
|||
|
|
m_tileSaver->save(m_normalEraser->getLastRect());
|
|||
|
|
m_normalEraser->generateLastPieceOfStroke(m_pencil.getValue() || m_colorType.getValue() == AREAS);
|
|||
|
|
vector<TThickPoint> brushPoints = m_normalEraser->getPointsSequence();
|
|||
|
|
int m = (int)brushPoints.size();
|
|||
|
|
vector<TThickPoint> points;
|
|||
|
|
if (m == 3) {
|
|||
|
|
points.push_back(brushPoints[0]);
|
|||
|
|
points.push_back(brushPoints[1]);
|
|||
|
|
} else {
|
|||
|
|
points.push_back(brushPoints[m - 4]);
|
|||
|
|
points.push_back(brushPoints[m - 3]);
|
|||
|
|
points.push_back(brushPoints[m - 2]);
|
|||
|
|
}
|
|||
|
|
invalidateRect = ToolUtils::getBounds(points, m_toolSize.getValue());
|
|||
|
|
}
|
|||
|
|
} else {
|
|||
|
|
assert(m_workRas.getPointer() && m_backupRas.getPointer());
|
|||
|
|
|
|||
|
|
TThickPoint old = m_points.back();
|
|||
|
|
if (norm2(pos - old) < 4)
|
|||
|
|
return;
|
|||
|
|
|
|||
|
|
int thickness = m_toolSize.getValue();
|
|||
|
|
TThickPoint point(pos + rasCenter, thickness);
|
|||
|
|
TThickPoint mid((old + point) * 0.5, (point.thick + old.thick) * 0.5);
|
|||
|
|
m_points.push_back(mid);
|
|||
|
|
m_points.push_back(point);
|
|||
|
|
|
|||
|
|
int currentStyle = 0;
|
|||
|
|
if (m_currentStyle.getValue())
|
|||
|
|
currentStyle = TTool::getApplication()->getCurrentLevelStyleIndex();
|
|||
|
|
|
|||
|
|
TRect bbox;
|
|||
|
|
int m = (int)m_points.size();
|
|||
|
|
if (m == 3) {
|
|||
|
|
// ho appena cominciato. devo disegnare un segmento
|
|||
|
|
TThickPoint pa = m_points.front();
|
|||
|
|
vector<TThickPoint> points;
|
|||
|
|
points.push_back(pa);
|
|||
|
|
points.push_back(mid);
|
|||
|
|
invalidateRect = ToolUtils::getBounds(points, thickness);
|
|||
|
|
bbox = m_bluredBrush->getBoundFromPoints(points);
|
|||
|
|
m_bluredBrush->addArc(pa, (mid + pa) * 0.5, mid, 1, 1);
|
|||
|
|
} else {
|
|||
|
|
vector<TThickPoint> points;
|
|||
|
|
points.push_back(m_points[m - 4]);
|
|||
|
|
points.push_back(old);
|
|||
|
|
points.push_back(mid);
|
|||
|
|
invalidateRect = ToolUtils::getBounds(points, thickness);
|
|||
|
|
bbox = m_bluredBrush->getBoundFromPoints(points);
|
|||
|
|
m_bluredBrush->addArc(m_points[m - 4], old, mid, 1, 1);
|
|||
|
|
}
|
|||
|
|
m_tileSaver->save(bbox);
|
|||
|
|
m_bluredBrush->eraseDrawing(ti->getRaster(), m_backupRas, bbox, m_currentStyle.getValue(),
|
|||
|
|
currentStyle, m_colorType.getValue());
|
|||
|
|
}
|
|||
|
|
invalidate(invalidateRect.enlarge(2) - rasCenter);
|
|||
|
|
}
|
|||
|
|
if (m_eraseType.getValue() == FREEHANDERASE) {
|
|||
|
|
if (!m_enabled || !m_active)
|
|||
|
|
return;
|
|||
|
|
|
|||
|
|
getViewer()->startForegroundDrawing();
|
|||
|
|
TPixel color = ToonzCheck::instance()->getChecks() & ToonzCheck::eBlackBg ? TPixel32::White : TPixel32::Black;
|
|||
|
|
tglColor(color);
|
|||
|
|
glPushMatrix();
|
|||
|
|
tglMultMatrix(getMatrix());
|
|||
|
|
TPointD dpiScale = m_viewer->getDpiScale();
|
|||
|
|
glScaled(dpiScale.x, dpiScale.y, 1);
|
|||
|
|
m_track.add(TThickPoint(pos, m_thick), pixelSize2);
|
|||
|
|
m_track.drawLastFragments();
|
|||
|
|
glPopMatrix();
|
|||
|
|
getViewer()->endForegroundDrawing();
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::onImageChanged()
|
|||
|
|
{
|
|||
|
|
if (!m_multi.getValue())
|
|||
|
|
return;
|
|||
|
|
TTool::Application *app = TTool::getApplication();
|
|||
|
|
TXshSimpleLevel *xshl = 0;
|
|||
|
|
if (app->getCurrentLevel()->getLevel())
|
|||
|
|
xshl = app->getCurrentLevel()->getSimpleLevel();
|
|||
|
|
|
|||
|
|
if (!xshl || m_level.getPointer() != xshl || (m_selectingRect.isEmpty() && !m_firstStroke))
|
|||
|
|
resetMulti();
|
|||
|
|
else if (m_firstFrameId == getFrameId())
|
|||
|
|
m_firstFrameSelected = false; //nel caso sono passato allo stato 1 e torno all'immagine iniziale, torno allo stato iniziale
|
|||
|
|
else { //cambio stato.
|
|||
|
|
m_firstFrameSelected = true;
|
|||
|
|
if (m_eraseType.getValue() != FREEHANDERASE && m_eraseType.getValue() != POLYLINEERASE) {
|
|||
|
|
assert(!m_selectingRect.isEmpty());
|
|||
|
|
m_firstRect = m_selectingRect;
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::leftButtonUp(const TPointD &pos, const TMouseEvent &e)
|
|||
|
|
{
|
|||
|
|
/*--先にLeftButtonDownに入っていなければ処理をしない--*/
|
|||
|
|
if (!m_isLeftButtonPressed)
|
|||
|
|
return;
|
|||
|
|
m_isLeftButtonPressed = false;
|
|||
|
|
|
|||
|
|
if (!m_selecting)
|
|||
|
|
return;
|
|||
|
|
TImageP image(getImage(true));
|
|||
|
|
if (TToonzImageP ti = image) {
|
|||
|
|
if (m_eraseType.getValue() == RECTERASE) {
|
|||
|
|
if (m_selectingRect.x0 > m_selectingRect.x1)
|
|||
|
|
tswap(m_selectingRect.x1, m_selectingRect.x0);
|
|||
|
|
if (m_selectingRect.y0 > m_selectingRect.y1)
|
|||
|
|
tswap(m_selectingRect.y1, m_selectingRect.y0);
|
|||
|
|
|
|||
|
|
if (m_multi.getValue()) {
|
|||
|
|
TTool::Application *app = TTool::getApplication();
|
|||
|
|
if (m_firstFrameSelected) {
|
|||
|
|
multiUpdate(m_level, m_firstFrameId, getFrameId(), m_firstRect, m_selectingRect);
|
|||
|
|
if (e.isShiftPressed()) {
|
|||
|
|
m_firstRect = m_selectingRect;
|
|||
|
|
m_firstFrameId = getFrameId();
|
|||
|
|
invalidate();
|
|||
|
|
} else {
|
|||
|
|
if (m_isXsheetCell) {
|
|||
|
|
app->getCurrentColumn()->setColumnIndex(m_currCell.first);
|
|||
|
|
app->getCurrentFrame()->setFrame(m_currCell.second);
|
|||
|
|
} else
|
|||
|
|
app->getCurrentFrame()->setFid(m_veryFirstFrameId);
|
|||
|
|
resetMulti();
|
|||
|
|
}
|
|||
|
|
} else {
|
|||
|
|
m_isXsheetCell = app->getCurrentFrame()->isEditingScene();
|
|||
|
|
m_currCell = std::pair<int, int>(getColumnIndex(), getFrame());
|
|||
|
|
}
|
|||
|
|
} else {
|
|||
|
|
TTool::Application *app = TTool::getApplication();
|
|||
|
|
TXshLevel *level = app->getCurrentLevel()->getLevel();
|
|||
|
|
TXshSimpleLevelP simLevel = level->getSimpleLevel();
|
|||
|
|
TFrameId frameId = getFrameId();
|
|||
|
|
if (m_invertOption.getValue()) {
|
|||
|
|
TUndoManager::manager()->beginBlock();
|
|||
|
|
TRectD rect = m_selectingRect;
|
|||
|
|
TRectD worldBBox = ToonzImageUtils::convertRasterToWorld(ti->getRaster()->getBounds(), ti);
|
|||
|
|
rect *= ToonzImageUtils::convertRasterToWorld(ti->getSavebox(), ti);
|
|||
|
|
|
|||
|
|
TRectD rect01 = TRectD(worldBBox.getP00(), TPointD(rect.x0, worldBBox.y1));
|
|||
|
|
if (rect01.getLx() > 0 && rect01.getLy() > 0)
|
|||
|
|
update(ti, rect01, simLevel, false, frameId);
|
|||
|
|
|
|||
|
|
TRectD rect02 = TRectD(rect.getP01(), TPointD(rect.x1, worldBBox.y1));
|
|||
|
|
if (rect02.getLx() > 0 && rect02.getLy() > 0)
|
|||
|
|
update(ti, rect02, simLevel, false, frameId);
|
|||
|
|
|
|||
|
|
TRectD rect03 = TRectD(TPointD(rect.x0, worldBBox.y0), rect.getP10());
|
|||
|
|
if (rect03.getLx() > 0 && rect03.getLy() > 0)
|
|||
|
|
update(ti, rect03, simLevel, false, frameId);
|
|||
|
|
|
|||
|
|
TRectD rect04 = TRectD(TPointD(rect.x1, worldBBox.y0), TPointD(worldBBox.x1, worldBBox.y1));
|
|||
|
|
if (rect04.getLx() > 0 && rect04.getLy() > 0)
|
|||
|
|
update(ti, rect04, simLevel, false, frameId);
|
|||
|
|
TUndoManager::manager()->endBlock();
|
|||
|
|
invalidate();
|
|||
|
|
} else {
|
|||
|
|
update(ti, m_selectingRect, simLevel, false, frameId);
|
|||
|
|
invalidate(m_selectingRect.enlarge(2));
|
|||
|
|
}
|
|||
|
|
m_selectingRect.empty();
|
|||
|
|
|
|||
|
|
TTool::getApplication()->getCurrentXsheet()->notifyXsheetChanged();
|
|||
|
|
notifyImageChanged();
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
if (m_eraseType.getValue() == NORMALERASE) {
|
|||
|
|
TTool::Application *app = TTool::getApplication();
|
|||
|
|
int currentStyle = app->getCurrentLevelStyleIndex();
|
|||
|
|
TXshLevel *level = app->getCurrentLevel()->getLevel();
|
|||
|
|
TXshSimpleLevelP simLevel = level->getSimpleLevel();
|
|||
|
|
|
|||
|
|
/*--Erase中にフレームが動いても、クリック時のFidに対してUndoを記録する--*/
|
|||
|
|
TFrameId frameId = m_workingFrameId.isEmptyFrame() ? getCurrentFid() : m_workingFrameId;
|
|||
|
|
|
|||
|
|
if (m_normalEraser && (m_hardness.getValue() == 100 || m_pencil.getValue() || m_colorType.getValue() == AREAS)) {
|
|||
|
|
TUndoManager::manager()->add(new RasterEraserUndo(m_tileSet, m_normalEraser->getPointsSequence(),
|
|||
|
|
m_colorTypeEraser, 0, m_normalEraser->isSelective(), currentStyle,
|
|||
|
|
simLevel.getPointer(), frameId,
|
|||
|
|
(m_pencil.getValue() || m_colorType.getValue() == AREAS)));
|
|||
|
|
app->getCurrentTool()->getTool()->notifyImageChanged(frameId);
|
|||
|
|
app->getCurrentXsheet()->notifyXsheetChanged();
|
|||
|
|
delete m_normalEraser;
|
|||
|
|
m_normalEraser = 0;
|
|||
|
|
} else {
|
|||
|
|
if (m_points.size() != 1) {
|
|||
|
|
TPointD rasCenter = ti->getRaster()->getCenterD();
|
|||
|
|
TThickPoint point(pos + rasCenter, m_toolSize.getValue());
|
|||
|
|
m_points.push_back(point);
|
|||
|
|
int m = m_points.size();
|
|||
|
|
vector<TThickPoint> points;
|
|||
|
|
points.push_back(m_points[m - 3]);
|
|||
|
|
points.push_back(m_points[m - 2]);
|
|||
|
|
points.push_back(m_points[m - 1]);
|
|||
|
|
TRect bbox = m_bluredBrush->getBoundFromPoints(points);
|
|||
|
|
m_tileSaver->save(bbox);
|
|||
|
|
m_bluredBrush->addArc(points[0], points[1], points[2], 1, 1);
|
|||
|
|
m_bluredBrush->eraseDrawing(ti->getRaster(), m_backupRas, bbox, m_currentStyle.getValue(),
|
|||
|
|
currentStyle, m_colorType.getValue());
|
|||
|
|
TRectD invalidateRect = ToolUtils::getBounds(points, m_toolSize.getValue());
|
|||
|
|
invalidate(invalidateRect.enlarge(2) - rasCenter);
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
m_backupRas = TRasterCM32P();
|
|||
|
|
m_workRas = TRaster32P();
|
|||
|
|
delete m_bluredBrush;
|
|||
|
|
m_bluredBrush = 0;
|
|||
|
|
TUndoManager::manager()->add(new RasterBluredEraserUndo(m_tileSet, m_points,
|
|||
|
|
currentStyle, m_currentStyle.getValue(), simLevel.getPointer(),
|
|||
|
|
frameId, m_toolSize.getValue(), m_hardness.getValue() * 0.01, m_colorType.getValue()));
|
|||
|
|
}
|
|||
|
|
delete m_tileSaver;
|
|||
|
|
m_tileSaver = 0;
|
|||
|
|
/*-- 作業したフレームをシグナルで知らせる --*/
|
|||
|
|
notifyImageChanged(frameId);
|
|||
|
|
/*-- 作業フレームをリセット --*/
|
|||
|
|
m_workingFrameId = TFrameId();
|
|||
|
|
}
|
|||
|
|
if (m_eraseType.getValue() == FREEHANDERASE) {
|
|||
|
|
bool isValid = m_enabled && m_active;
|
|||
|
|
m_enabled = m_active = false;
|
|||
|
|
if (!isValid)
|
|||
|
|
return;
|
|||
|
|
if (m_track.isEmpty())
|
|||
|
|
return;
|
|||
|
|
double pixelSize2 = getPixelSize() * getPixelSize();
|
|||
|
|
m_track.add(TThickPoint(m_firstPos, m_thick), pixelSize2);
|
|||
|
|
m_track.filterPoints();
|
|||
|
|
double error = (30.0 / 11) * sqrt(pixelSize2);
|
|||
|
|
TStroke *stroke = m_track.makeStroke(error);
|
|||
|
|
|
|||
|
|
stroke->setStyle(1);
|
|||
|
|
m_track.clear();
|
|||
|
|
|
|||
|
|
TTool::Application *app = TTool::getApplication();
|
|||
|
|
int styleId = app->getCurrentLevelStyleIndex();
|
|||
|
|
if (m_multi.getValue()) //stroke multi
|
|||
|
|
{
|
|||
|
|
if (m_firstFrameSelected) {
|
|||
|
|
TFrameId tmp = getFrameId();
|
|||
|
|
if (m_firstStroke && stroke)
|
|||
|
|
multiAreaEraser(m_level, m_firstFrameId, tmp, m_firstStroke, stroke);
|
|||
|
|
notifyImageChanged();
|
|||
|
|
if (e.isShiftPressed()) {
|
|||
|
|
TRectD invalidateRect = m_firstStroke->getBBox();
|
|||
|
|
delete m_firstStroke;
|
|||
|
|
m_firstStroke = 0;
|
|||
|
|
invalidate(invalidateRect.enlarge(2));
|
|||
|
|
m_firstStroke = stroke;
|
|||
|
|
invalidateRect = m_firstStroke->getBBox();
|
|||
|
|
invalidate(invalidateRect.enlarge(2));
|
|||
|
|
m_firstFrameId = getFrameId();
|
|||
|
|
} else {
|
|||
|
|
if (m_isXsheetCell) {
|
|||
|
|
app->getCurrentColumn()->setColumnIndex(m_currCell.first);
|
|||
|
|
app->getCurrentFrame()->setFrame(m_currCell.second);
|
|||
|
|
} else
|
|||
|
|
app->getCurrentFrame()->setFid(m_veryFirstFrameId);
|
|||
|
|
resetMulti();
|
|||
|
|
delete stroke;
|
|||
|
|
}
|
|||
|
|
} else //primo frame
|
|||
|
|
{
|
|||
|
|
m_firstStroke = stroke;
|
|||
|
|
m_isXsheetCell = app->getCurrentFrame()->isEditingScene();
|
|||
|
|
m_currCell = std::pair<int, int>(getColumnIndex(), getFrame());
|
|||
|
|
invalidate(m_firstStroke->getBBox().enlarge(2));
|
|||
|
|
}
|
|||
|
|
} else //stroke non multi
|
|||
|
|
{
|
|||
|
|
if (!getImage(true))
|
|||
|
|
return;
|
|||
|
|
TXshLevel *level = app->getCurrentLevel()->getLevel();
|
|||
|
|
TXshSimpleLevelP simLevel = level->getSimpleLevel();
|
|||
|
|
TFrameId frameId = getFrameId();
|
|||
|
|
eraseStroke(image, stroke, m_eraseType.getValue(), m_colorType.getValue(),
|
|||
|
|
m_invertOption.getValue(), m_currentStyle.getValue(), styleId, simLevel,
|
|||
|
|
frameId);
|
|||
|
|
notifyImageChanged();
|
|||
|
|
if (m_invertOption.getValue())
|
|||
|
|
invalidate();
|
|||
|
|
else
|
|||
|
|
invalidate(stroke->getBBox().enlarge(2));
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
ToolUtils::updateSaveBox();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
m_selecting = false;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e)
|
|||
|
|
{
|
|||
|
|
TStroke *stroke;
|
|||
|
|
TTool::Application *app = TTool::getApplication();
|
|||
|
|
if (m_polyline.size() <= 1) {
|
|||
|
|
resetMulti();
|
|||
|
|
return;
|
|||
|
|
}
|
|||
|
|
if (m_polyline.back() != pos)
|
|||
|
|
m_polyline.push_back(pos);
|
|||
|
|
if (m_polyline.back() != m_polyline.front())
|
|||
|
|
m_polyline.push_back(m_polyline.front());
|
|||
|
|
vector<TThickPoint> strokePoints;
|
|||
|
|
for (UINT i = 0; i < m_polyline.size() - 1; i++) {
|
|||
|
|
strokePoints.push_back(TThickPoint(m_polyline[i], 1));
|
|||
|
|
strokePoints.push_back(TThickPoint(0.5 * (m_polyline[i] + m_polyline[i + 1]), 1));
|
|||
|
|
}
|
|||
|
|
strokePoints.push_back(TThickPoint(m_polyline.back(), 1));
|
|||
|
|
m_polyline.clear();
|
|||
|
|
stroke = new TStroke(strokePoints);
|
|||
|
|
assert(stroke->getPoint(0) == stroke->getPoint(1));
|
|||
|
|
|
|||
|
|
int styleId = app->getCurrentLevelStyleIndex();
|
|||
|
|
if (m_multi.getValue()) //stroke multi
|
|||
|
|
{
|
|||
|
|
if (m_firstFrameSelected) {
|
|||
|
|
TFrameId tmp = getFrameId();
|
|||
|
|
if (m_firstStroke && stroke)
|
|||
|
|
multiAreaEraser(m_level, m_firstFrameId, tmp, m_firstStroke, stroke);
|
|||
|
|
if (e.isShiftPressed()) {
|
|||
|
|
TRectD invalidateRect = m_firstStroke->getBBox();
|
|||
|
|
delete m_firstStroke;
|
|||
|
|
m_firstStroke = 0;
|
|||
|
|
invalidate(invalidateRect.enlarge(2));
|
|||
|
|
m_firstStroke = stroke;
|
|||
|
|
invalidateRect = m_firstStroke->getBBox();
|
|||
|
|
invalidate(invalidateRect.enlarge(2));
|
|||
|
|
m_firstFrameId = getFrameId();
|
|||
|
|
} else {
|
|||
|
|
if (m_isXsheetCell) {
|
|||
|
|
app->getCurrentColumn()->setColumnIndex(m_currCell.first);
|
|||
|
|
app->getCurrentFrame()->setFrame(m_currCell.second);
|
|||
|
|
} else
|
|||
|
|
app->getCurrentFrame()->setFid(m_veryFirstFrameId);
|
|||
|
|
resetMulti();
|
|||
|
|
delete stroke;
|
|||
|
|
}
|
|||
|
|
} else //primo frame
|
|||
|
|
{
|
|||
|
|
m_firstStroke = stroke;
|
|||
|
|
m_isXsheetCell = app->getCurrentFrame()->isEditingScene();
|
|||
|
|
m_currCell = std::pair<int, int>(getColumnIndex(), getFrame());
|
|||
|
|
invalidate(m_firstStroke->getBBox().enlarge(2));
|
|||
|
|
}
|
|||
|
|
} else {
|
|||
|
|
if (!getImage(true))
|
|||
|
|
return;
|
|||
|
|
TXshLevel *level = app->getCurrentLevel()->getLevel();
|
|||
|
|
TXshSimpleLevelP simLevel = level->getSimpleLevel();
|
|||
|
|
TFrameId frameId = getFrameId();
|
|||
|
|
TToonzImageP ti = (TToonzImageP)getImage(true);
|
|||
|
|
eraseStroke(ti, stroke, m_eraseType.getValue(), m_colorType.getValue(),
|
|||
|
|
m_invertOption.getValue(), m_currentStyle.getValue(), styleId, simLevel, frameId);
|
|||
|
|
notifyImageChanged();
|
|||
|
|
if (m_invertOption.getValue())
|
|||
|
|
invalidate();
|
|||
|
|
else
|
|||
|
|
invalidate(stroke->getBBox().enlarge(2));
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
bool EraserTool::onPropertyChanged(string propertyName)
|
|||
|
|
{
|
|||
|
|
/*--- 変更されたPropertyに合わせて処理を分ける ---*/
|
|||
|
|
if (propertyName == m_eraseType.getName()) {
|
|||
|
|
/*--- polylineにした時、前回のpolyline選択をクリアする ---*/
|
|||
|
|
if (m_eraseType.getValue() == POLYLINEERASE && !m_polyline.empty())
|
|||
|
|
m_polyline.clear();
|
|||
|
|
EraseType = toString(m_eraseType.getValue());
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
else if (propertyName == m_toolSize.getName()) {
|
|||
|
|
EraseSize = m_toolSize.getValue();
|
|||
|
|
m_cleanerSize = m_toolSize.getValue();
|
|||
|
|
|
|||
|
|
m_brushPad = ToolUtils::getBrushPad(m_toolSize.getValue(), m_hardness.getValue() * 0.01);
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
else if (propertyName == m_invertOption.getName())
|
|||
|
|
EraseInvert = m_invertOption.getValue();
|
|||
|
|
|
|||
|
|
else if (propertyName == m_currentStyle.getName())
|
|||
|
|
EraseSelective = m_currentStyle.getValue();
|
|||
|
|
|
|||
|
|
else if (propertyName == m_multi.getName()) {
|
|||
|
|
if (m_multi.getValue())
|
|||
|
|
resetMulti();
|
|||
|
|
EraseRange = m_multi.getValue();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
else if (propertyName == m_pencil.getName()) {
|
|||
|
|
ErasePencil = m_pencil.getValue();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
else if (propertyName == m_colorType.getName()) {
|
|||
|
|
EraseColorType = toString(m_colorType.getValue());
|
|||
|
|
/*-- ColorModelのCursor更新のためにSIGNALを出す --*/
|
|||
|
|
TTool::getApplication()->getCurrentTool()->notifyToolChanged();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
else if (propertyName == m_hardness.getName()) {
|
|||
|
|
EraseHardness = m_hardness.getValue();
|
|||
|
|
m_brushPad = ToolUtils::getBrushPad(m_toolSize.getValue(), m_hardness.getValue() * 0.01);
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
if (propertyName == m_hardness.getName() || propertyName == m_toolSize.getName()) {
|
|||
|
|
m_brushPad = ToolUtils::getBrushPad(m_toolSize.getValue(), m_hardness.getValue() * 0.01);
|
|||
|
|
TRectD rect(m_brushPos - TPointD(EraseSize + 2, EraseSize + 2),
|
|||
|
|
m_brushPos + TPointD(EraseSize + 2, EraseSize + 2));
|
|||
|
|
invalidate(rect);
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
/*--- Erase動作中にプロパティが変わったら、終了処理を行う ---*/
|
|||
|
|
if (m_isLeftButtonPressed) {
|
|||
|
|
storeUndoAndRefresh();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
return true;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::mouseMove(const TPointD &pos, const TMouseEvent &e)
|
|||
|
|
{
|
|||
|
|
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
|
|||
|
|
|
|||
|
|
struct Locals {
|
|||
|
|
EraserTool *m_this;
|
|||
|
|
|
|||
|
|
void setValue(TIntProperty &prop, int value)
|
|||
|
|
{
|
|||
|
|
prop.setValue(value);
|
|||
|
|
|
|||
|
|
m_this->onPropertyChanged(prop.getName());
|
|||
|
|
TTool::getApplication()->getCurrentTool()->notifyToolChanged();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
void addValue(TIntProperty &prop, double add)
|
|||
|
|
{
|
|||
|
|
const TIntProperty::Range &range = prop.getRange();
|
|||
|
|
setValue(prop, tcrop<double>(prop.getValue() + add, range.first, range.second));
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
} locals = {this};
|
|||
|
|
|
|||
|
|
switch (e.getModifiersMask()) {
|
|||
|
|
case TMouseEvent::ALT_KEY: {
|
|||
|
|
// User wants to alter the maximum brush size
|
|||
|
|
const TPointD &diff = pos - m_mousePos;
|
|||
|
|
double add = (fabs(diff.x) > fabs(diff.y)) ? diff.x : diff.y;
|
|||
|
|
|
|||
|
|
locals.addValue(m_toolSize, add);
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
DEFAULT:
|
|||
|
|
m_brushPos = pos;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
m_mousePos = pos;
|
|||
|
|
invalidate();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::onEnter()
|
|||
|
|
{
|
|||
|
|
TToonzImageP ti(getImage(false));
|
|||
|
|
if (!ti)
|
|||
|
|
return;
|
|||
|
|
if (m_firstTime) {
|
|||
|
|
m_toolSize.setValue(EraseSize);
|
|||
|
|
m_eraseType.setValue(toWideString(EraseType.getValue()));
|
|||
|
|
m_currentStyle.setValue(EraseSelective ? 1 : 0);
|
|||
|
|
m_invertOption.setValue(EraseInvert ? 1 : 0);
|
|||
|
|
m_colorType.setValue(toWideString(EraseColorType.getValue()));
|
|||
|
|
m_multi.setValue(EraseRange ? 1 : 0);
|
|||
|
|
m_hardness.setValue(EraseHardness);
|
|||
|
|
m_pencil.setValue(ErasePencil);
|
|||
|
|
m_firstTime = false;
|
|||
|
|
}
|
|||
|
|
double x = m_toolSize.getValue();
|
|||
|
|
|
|||
|
|
double minRange = 1;
|
|||
|
|
double maxRange = 100;
|
|||
|
|
|
|||
|
|
double minSize = 0.1;
|
|||
|
|
double maxSize = 100;
|
|||
|
|
|
|||
|
|
m_pointSize = (x - minRange) / (maxRange - minRange) * (maxSize - minSize) + minSize;
|
|||
|
|
|
|||
|
|
// getApplication()->editImage();
|
|||
|
|
m_cleanerSize = m_toolSize.getValue();
|
|||
|
|
TTool::Application *app = TTool::getApplication();
|
|||
|
|
m_level = app->getCurrentLevel()->getLevel()
|
|||
|
|
? app->getCurrentLevel()->getSimpleLevel()
|
|||
|
|
: 0;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::onLeave()
|
|||
|
|
{
|
|||
|
|
m_pointSize = -1;
|
|||
|
|
m_cleanerSize = 0;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//----------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::onActivate()
|
|||
|
|
{
|
|||
|
|
if (m_multi.getValue())
|
|||
|
|
resetMulti();
|
|||
|
|
|
|||
|
|
/*-- 他のツールからpolylineに入った時、前回のpolyline選択をクリアする --*/
|
|||
|
|
if (m_eraseType.getValue() == POLYLINEERASE && !m_polyline.empty())
|
|||
|
|
m_polyline.clear();
|
|||
|
|
|
|||
|
|
onEnter();
|
|||
|
|
m_brushPad = ToolUtils::getBrushPad(m_toolSize.getValue(), m_hardness.getValue() * 0.01);
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//------------------------------------------------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::multiAreaEraser(const TXshSimpleLevelP &sl, TFrameId &firstFid, TFrameId &lastFid,
|
|||
|
|
TStroke *firstStroke, TStroke *lastStroke)
|
|||
|
|
{
|
|||
|
|
TStroke *first = new TStroke();
|
|||
|
|
TStroke *last = new TStroke();
|
|||
|
|
*first = *firstStroke;
|
|||
|
|
*last = *lastStroke;
|
|||
|
|
TVectorImageP firstImage = new TVectorImage();
|
|||
|
|
TVectorImageP lastImage = new TVectorImage();
|
|||
|
|
firstImage->addStroke(first);
|
|||
|
|
lastImage->addStroke(last);
|
|||
|
|
|
|||
|
|
bool backward = false;
|
|||
|
|
if (firstFid > lastFid) {
|
|||
|
|
tswap(firstFid, lastFid);
|
|||
|
|
backward = true;
|
|||
|
|
}
|
|||
|
|
assert(firstFid <= lastFid);
|
|||
|
|
vector<TFrameId> allFids;
|
|||
|
|
sl->getFids(allFids);
|
|||
|
|
|
|||
|
|
std::vector<TFrameId>::iterator i0 = allFids.begin();
|
|||
|
|
while (i0 != allFids.end() && *i0 < firstFid)
|
|||
|
|
i0++;
|
|||
|
|
if (i0 == allFids.end())
|
|||
|
|
return;
|
|||
|
|
std::vector<TFrameId>::iterator i1 = i0;
|
|||
|
|
while (i1 != allFids.end() && *i1 <= lastFid)
|
|||
|
|
i1++;
|
|||
|
|
assert(i0 < i1);
|
|||
|
|
vector<TFrameId> fids(i0, i1);
|
|||
|
|
int m = fids.size();
|
|||
|
|
assert(m > 0);
|
|||
|
|
TUndoManager::manager()->beginBlock();
|
|||
|
|
for (int i = 0; i < m; ++i) {
|
|||
|
|
TFrameId fid = fids[i];
|
|||
|
|
assert(firstFid <= fid && fid <= lastFid);
|
|||
|
|
TImageP img = sl->getFrame(fid, true);
|
|||
|
|
double t = m > 1 ? (double)i / (double)(m - 1) : 0.5;
|
|||
|
|
doMultiEraser(img, backward ? 1 - t : t, sl, fid, firstImage, lastImage);
|
|||
|
|
sl->getProperties()->setDirtyFlag(true);
|
|||
|
|
notifyImageChanged(fid);
|
|||
|
|
}
|
|||
|
|
TUndoManager::manager()->endBlock();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//-------------------------------------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
void EraserTool::doMultiEraser(const TImageP &img, double t,
|
|||
|
|
const TXshSimpleLevelP &sl, const TFrameId &fid,
|
|||
|
|
const TVectorImageP &firstImage, const TVectorImageP &lastImage)
|
|||
|
|
{
|
|||
|
|
// ColorController::instance()->switchToLevelPalette();
|
|||
|
|
int styleId = TTool::getApplication()->getCurrentLevelStyleIndex();
|
|||
|
|
if (t == 0)
|
|||
|
|
eraseStroke(img, firstImage->getStroke(0), m_eraseType.getValue(), m_colorType.getValue(),
|
|||
|
|
m_invertOption.getValue(), m_currentStyle.getValue(), styleId, sl, fid);
|
|||
|
|
else if (t == 1)
|
|||
|
|
eraseStroke(img, lastImage->getStroke(0), m_eraseType.getValue(), m_colorType.getValue(),
|
|||
|
|
m_invertOption.getValue(), m_currentStyle.getValue(), styleId, sl, fid);
|
|||
|
|
else {
|
|||
|
|
assert(firstImage->getStrokeCount() == 1);
|
|||
|
|
assert(lastImage->getStrokeCount() == 1);
|
|||
|
|
TVectorImageP vi = TInbetween(firstImage, lastImage).tween(t);
|
|||
|
|
assert(vi->getStrokeCount() == 1);
|
|||
|
|
eraseStroke(img, vi->getStroke(0), m_eraseType.getValue(), m_colorType.getValue(),
|
|||
|
|
m_invertOption.getValue(), m_currentStyle.getValue(), styleId, sl, fid);
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//--------------------------------------------------------------------------------------------------
|
|||
|
|
/*!ドラッグ中にツールが切り替わった時、終了処理を行う
|
|||
|
|
*/
|
|||
|
|
|
|||
|
|
void EraserTool::onDeactivate()
|
|||
|
|
{
|
|||
|
|
if (!m_isLeftButtonPressed || !m_selecting)
|
|||
|
|
return;
|
|||
|
|
|
|||
|
|
storeUndoAndRefresh();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//--------------------------------------------------------------------------------------------------
|
|||
|
|
/*-- Erase終了処理 --*/
|
|||
|
|
void EraserTool::storeUndoAndRefresh()
|
|||
|
|
{
|
|||
|
|
m_isLeftButtonPressed = false;
|
|||
|
|
|
|||
|
|
/*-- 各データのリフレッシュ --*/
|
|||
|
|
if (m_firstStroke) {
|
|||
|
|
delete m_firstStroke;
|
|||
|
|
m_firstStroke = 0;
|
|||
|
|
}
|
|||
|
|
if (m_normalEraser) {
|
|||
|
|
TUndoManager::manager()->add(new RasterEraserUndo(m_tileSet,
|
|||
|
|
m_normalEraser->getPointsSequence(),
|
|||
|
|
m_colorTypeEraser,
|
|||
|
|
0,
|
|||
|
|
m_normalEraser->isSelective(),
|
|||
|
|
TTool::getApplication()->getCurrentLevelStyleIndex(),
|
|||
|
|
TTool::getApplication()->getCurrentLevel()->getLevel()->getSimpleLevel(),
|
|||
|
|
m_workingFrameId.isEmptyFrame() ? getCurrentFid() : m_workingFrameId,
|
|||
|
|
(m_pencil.getValue() || m_colorType.getValue() == AREAS)));
|
|||
|
|
delete m_normalEraser;
|
|||
|
|
m_normalEraser = 0;
|
|||
|
|
}
|
|||
|
|
if (m_bluredBrush) {
|
|||
|
|
m_backupRas = TRasterCM32P();
|
|||
|
|
m_workRas = TRaster32P();
|
|||
|
|
delete m_bluredBrush;
|
|||
|
|
m_bluredBrush = 0;
|
|||
|
|
TUndoManager::manager()->add(new RasterBluredEraserUndo(m_tileSet, m_points,
|
|||
|
|
TTool::getApplication()->getCurrentLevelStyleIndex(),
|
|||
|
|
m_currentStyle.getValue(),
|
|||
|
|
TTool::getApplication()->getCurrentLevel()->getLevel()->getSimpleLevel(),
|
|||
|
|
m_workingFrameId.isEmptyFrame() ? getCurrentFid() : m_workingFrameId,
|
|||
|
|
m_toolSize.getValue(),
|
|||
|
|
m_hardness.getValue() * 0.01,
|
|||
|
|
m_colorType.getValue()));
|
|||
|
|
}
|
|||
|
|
if (m_tileSaver) {
|
|||
|
|
delete m_tileSaver;
|
|||
|
|
m_tileSaver = 0;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
TRectD invalidateRect;
|
|||
|
|
if (m_firstRect != TRectD()) {
|
|||
|
|
invalidateRect += m_firstRect;
|
|||
|
|
m_firstRect.empty();
|
|||
|
|
}
|
|||
|
|
if (m_selectingRect != TRectD()) {
|
|||
|
|
invalidateRect += m_selectingRect;
|
|||
|
|
m_selectingRect.empty();
|
|||
|
|
}
|
|||
|
|
if (!m_track.isEmpty())
|
|||
|
|
m_track.clear();
|
|||
|
|
|
|||
|
|
if (!invalidateRect.isEmpty())
|
|||
|
|
invalidate(invalidateRect.enlarge(2));
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
//--------------------------------------------------------------------------------------------------
|
|||
|
|
/*! Brush、PaintBrush、EraserToolがPencilModeのときにTrueを返す
|
|||
|
|
*/
|
|||
|
|
bool EraserTool::isPencilModeActive()
|
|||
|
|
{
|
|||
|
|
return m_eraseType.getValue() == NORMALERASE && m_pencil.getValue();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
} //namespace
|