Reduce waiting time in PixelsMovement to lock the sprite

This commit is contained in:
David Capello 2015-08-05 11:39:46 -03:00
parent 6a47100731
commit 05ed1b8950

View File

@ -115,7 +115,7 @@ void PixelsMovement::flipImage(doc::algorithm::FlipType flipType)
flipType); flipType);
{ {
ContextWriter writer(m_reader, 5000); ContextWriter writer(m_reader, 1000);
// Regenerate the transformed (rotated, scaled, etc.) image and // Regenerate the transformed (rotated, scaled, etc.) image and
// mask. // mask.
@ -131,7 +131,7 @@ void PixelsMovement::flipImage(doc::algorithm::FlipType flipType)
void PixelsMovement::cutMask() void PixelsMovement::cutMask()
{ {
{ {
ContextWriter writer(m_reader, 5000); ContextWriter writer(m_reader, 1000);
if (writer.cel()) if (writer.cel())
m_transaction.execute(new cmd::ClearMask(writer.cel())); m_transaction.execute(new cmd::ClearMask(writer.cel()));
} }
@ -145,7 +145,7 @@ void PixelsMovement::copyMask()
// m_transaction.setMaskPosition) // m_transaction.setMaskPosition)
Mask emptyMask; Mask emptyMask;
{ {
ContextWriter writer(m_reader, 5000); ContextWriter writer(m_reader, 1000);
m_document->generateMaskBoundaries(&emptyMask); m_document->generateMaskBoundaries(&emptyMask);
update_screen_for_document(m_document); update_screen_for_document(m_document);
} }
@ -172,7 +172,7 @@ void PixelsMovement::catchImageAgain(const gfx::Point& pos, HandleType handle)
// m_transaction.setMaskPosition) // m_transaction.setMaskPosition)
Mask emptyMask; Mask emptyMask;
{ {
ContextWriter writer(m_reader, 5000); ContextWriter writer(m_reader, 1000);
m_document->generateMaskBoundaries(&emptyMask); m_document->generateMaskBoundaries(&emptyMask);
update_screen_for_document(m_document); update_screen_for_document(m_document);
} }
@ -183,7 +183,7 @@ void PixelsMovement::moveImage(const gfx::Point& pos, MoveModifier moveModifier)
gfx::Transformation::Corners oldCorners; gfx::Transformation::Corners oldCorners;
m_currentData.transformBox(oldCorners); m_currentData.transformBox(oldCorners);
ContextWriter writer(m_reader, 5000); ContextWriter writer(m_reader, 1000);
int x1, y1, x2, y2; int x1, y1, x2, y2;
x1 = m_initialData.bounds().x; x1 = m_initialData.bounds().x;
@ -452,7 +452,7 @@ void PixelsMovement::stampImage()
ASSERT(cel && image); ASSERT(cel && image);
{ {
ContextWriter writer(m_reader, 5000); ContextWriter writer(m_reader, 1000);
{ {
// Expand the canvas to paste the image in the fully visible // Expand the canvas to paste the image in the fully visible
// portion of sprite. // portion of sprite.
@ -488,7 +488,7 @@ void PixelsMovement::dropImageTemporarily()
m_isDragging = false; m_isDragging = false;
{ {
ContextWriter writer(m_reader, 5000); ContextWriter writer(m_reader, 1000);
// TODO Add undo information so the user can undo each transformation step. // TODO Add undo information so the user can undo each transformation step.
@ -537,7 +537,7 @@ void PixelsMovement::dropImage()
// Destroy the extra cel (this cel will be used by the drawing // Destroy the extra cel (this cel will be used by the drawing
// cursor surely). // cursor surely).
ContextWriter writer(m_reader, 5000); ContextWriter writer(m_reader, 1000);
m_document->destroyExtraCel(); m_document->destroyExtraCel();
} }
@ -553,7 +553,7 @@ void PixelsMovement::discardImage(bool commit)
// Destroy the extra cel and regenerate the mask boundaries (we've // Destroy the extra cel and regenerate the mask boundaries (we've
// just deselect the mask). // just deselect the mask).
ContextWriter writer(m_reader, 5000); ContextWriter writer(m_reader, 1000);
m_document->destroyExtraCel(); m_document->destroyExtraCel();
m_document->generateMaskBoundaries(); m_document->generateMaskBoundaries();
} }
@ -581,7 +581,7 @@ gfx::Size PixelsMovement::getInitialImageSize() const
void PixelsMovement::setMaskColor(bool opaque, color_t mask_color) void PixelsMovement::setMaskColor(bool opaque, color_t mask_color)
{ {
ContextWriter writer(m_reader, 5000); ContextWriter writer(m_reader, 1000);
m_opaque = opaque; m_opaque = opaque;
m_maskColor = mask_color; m_maskColor = mask_color;
redrawExtraImage(); redrawExtraImage();