Added new command to rotate canvas.

ChangeLog

@@ -1,3 +1,7 @@
+2009-06-14  David A. Capello  <davidcapello@gmail.com>
+
+	* src/commands/cmd_rotate_canvas.cpp: Added.
+
 2009-06-11  David A. Capello  <davidcapello@gmail.com>
 
 	* src/modules/gui.h (JWidgetPtr): Added to automatically delete

makefile.lst

@@ -62,6 +62,7 @@ COMMON_SOURCES =					\
 	src/commands/cmd_remove_frame.cpp		\
 	src/commands/cmd_remove_layer.cpp		\
 	src/commands/cmd_reselect_mask.cpp		\
+	src/commands/cmd_rotate_canvas.cpp		\
 	src/commands/cmd_save_file.cpp			\
 	src/commands/cmd_save_mask.cpp			\
 	src/commands/cmd_screen_shot.cpp		\

src/commands/cmd_rotate_canvas.cpp

@@ -0,0 +1,168 @@
+/* ASE - Allegro Sprite Editor
+ * Copyright (C) 2001-2009  David Capello
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "config.h"
+
+#include <allegro/unicode.h>
+
+#include "jinete/jinete.h"
+
+#include "commands/commands.h"
+#include "core/app.h"
+#include "core/job.h"
+#include "modules/gui.h"
+#include "modules/sprites.h"
+#include "raster/cel.h"
+#include "raster/image.h"
+#include "raster/mask.h"
+#include "raster/sprite.h"
+#include "raster/stock.h"
+#include "undoable.h"
+#include "widgets/colbar.h"
+
+class RotateCanvasJob : public Job
+{
+  SpriteWriter m_sprite;
+  int m_angle;
+
+public:
+
+  RotateCanvasJob(const SpriteReader& sprite, int angle)
+    : Job("Rotate Canvas")
+    , m_sprite(sprite)
+  {
+    m_angle = angle;
+  }
+
+protected:
+
+  /**
+   * [working thread]
+   */
+  virtual void on_job()
+  {
+    Undoable undoable(m_sprite, "Rotate Canvas");
+
+    // get all sprite cels
+    JList cels = jlist_new();
+    sprite_get_cels(m_sprite, cels);
+
+    // for each cel...
+    JLink link;
+    JI_LIST_FOR_EACH(cels, link) {
+      Cel* cel = (Cel*)link->data;
+      Image* image = stock_get_image(m_sprite->stock, cel->image);
+
+      // change it location
+      switch (m_angle) {
+	case 180:
+	  undoable.set_cel_position(cel,
+				    m_sprite->w - cel->x - image->w,
+				    m_sprite->h - cel->y - image->h);
+	  break;
+	case 90:
+	  undoable.set_cel_position(cel, m_sprite->h - cel->y - image->h, cel->x);
+	  break;
+	case -90:
+	  undoable.set_cel_position(cel, cel->y, m_sprite->w - cel->x - image->w);
+	  break;
+      }
+    }
+    jlist_free(cels);
+
+    // for each stock's image
+    for (int i=0; i<m_sprite->stock->nimage; ++i) {
+      Image* image = stock_get_image(m_sprite->stock, i);
+      if (!image)
+	continue;
+
+      // rotate the image
+      Image* new_image = image_new(image->imgtype,
+				   m_angle == 180 ? image->w: image->h,
+				   m_angle == 180 ? image->h: image->w);
+
+      switch (m_angle) {
+	case 180:
+	  for (int y=0; y<image->h; ++y)
+	    for (int x=0; x<image->w; ++x)
+	      new_image->putpixel(image->w - x - 1,
+				  image->h - y - 1, image->getpixel(x, y));
+	  break;
+	case 90:
+	  for (int y=0; y<image->h; ++y)
+	    for (int x=0; x<image->w; ++x)
+	      new_image->putpixel(image->h - y - 1, x, image->getpixel(x, y));
+	  break;
+	case -90:
+	  for (int y=0; y<image->h; ++y)
+	    for (int x=0; x<image->w; ++x)
+	      new_image->putpixel(y, image->w - x - 1, image->getpixel(x, y));
+	  break;
+      }
+
+      undoable.replace_stock_image(i, new_image);
+
+      job_progress((float)i / m_sprite->stock->nimage);
+
+      // cancel all the operation?
+      if (is_canceled())
+	return;	       // Undoable destructor will undo all operations
+    }
+
+    // resize sprite
+    if (m_angle != 180)
+      undoable.set_sprite_size(m_sprite->h, m_sprite->w);
+
+    // TODO rotate mask
+
+    // regenerate mask
+    sprite_generate_mask_boundaries(m_sprite);
+
+    // commit changes
+    undoable.commit();
+  }
+
+};
+
+static bool cmd_rotate_canvas_enabled(const char *argument)
+{
+  const CurrentSpriteReader sprite;
+  return sprite != NULL;
+}
+
+static void cmd_rotate_canvas_execute(const char *argument)
+{
+  int angle = ustrtol(argument, NULL, 10);
+  CurrentSpriteReader sprite;
+
+  {
+    RotateCanvasJob job(sprite, angle);
+    job.do_job();
+  }
+
+  sprite_generate_mask_boundaries(sprite);
+  update_screen_for_sprite(sprite);
+}
+
+Command cmd_rotate_canvas = {
+  CMD_ROTATE_CANVAS,
+  cmd_rotate_canvas_enabled,
+  NULL,
+  cmd_rotate_canvas_execute,
+  NULL
+};

src/commands/commands.cpp

@@ -103,6 +103,7 @@ extern Command cmd_remove_frame;
 extern Command cmd_remove_layer;
 extern Command cmd_replace_color;
 extern Command cmd_reselect_mask;
+extern Command cmd_rotate_canvas;
 extern Command cmd_save_file;
 extern Command cmd_save_file_as;
 extern Command cmd_save_file_copy_as;
@@ -197,6 +198,7 @@ static Command *commands[] = {
   &cmd_remove_layer,
   &cmd_replace_color,
   &cmd_reselect_mask,
+  &cmd_rotate_canvas,
   &cmd_save_file,
   &cmd_save_file_as,
   &cmd_save_file_copy_as,

src/commands/commands.h

@@ -97,6 +97,7 @@
 #define CMD_REMOVE_LAYER		"remove_layer"
 #define CMD_REPLACE_COLOR		"replace_color"
 #define CMD_RESELECT_MASK		"reselect_mask"
+#define CMD_ROTATE_CANVAS		"rotate_canvas"
 #define CMD_SAVE_FILE			"save_file"
 #define CMD_SAVE_FILE_AS		"save_file_as"
 #define CMD_SAVE_FILE_COPY_AS		"save_file_copy_as"