Merge lp:~gaspa/a4/rotate-canvas into lp:a4

[Andrea Gasparini]

This merge adds a spinbutton that shows and set the rotation of the whole image.

Changing the spinbutton value trigger a transition towards the angle specified.
Viceversa, when you move around in the regions list, you'll see the angle that will be updated on the spinbutton as well.

[Andrea Gasparini (gaspa)]

Just a note: it rotate around a corner, not the center. It'd behave correctly when we'll merge the merge lp:~andrea-gualano/a4/animations

[lp:~gaspa/a4/rotate-canvas]

57. By Andrea Gasparini on 2010-07-30

pep8 clean, reset spinbutton in open/close, adjustment with -180/180 range

58. By Andrea Gasparini on 2010-07-30

disabled spin with no opened file

[Andrea Colangelo (warp10)]

We need to work on the rotation range to make it continuous, but apart from that, it looks good. Nice work! :)

review: Approve

=== modified file 'a4lib/app.py'
--- a4lib/app.py	2010-07-24 22:28:56 +0000
+++ a4lib/app.py	2010-07-30 07:10:58 +0000
@@ -8,6 +8,7 @@
 import sys
 import glib
 import gtk
+import math
 from a4lib.presentation import PresentationError
 from a4lib.player import GtkCairoPlayer
 
@@ -50,6 +51,7 @@
         self.player = None
         self.last_path = None
         self.is_fullscreen = False
+        self.callback_called = False
 
     def set_status(self, status):
         """Put the given string in the status bar."""
@@ -77,9 +79,17 @@
             # Make the buttons sensitive.
             for button in ('imagemenuitem_close', 'toolbutton_close',
                            'toolbutton_next', 'toolbutton_zoom_in',
-                           'toolbutton_zoom_out', 'toolbutton_editor'):
+                           'toolbutton_zoom_out', 'toolbutton_editor',
+                           'spin_rotation'):
                 self.builder.get_object(button).set_sensitive(True)
-            self.builder.get_object('toolbutton_previous').set_sensitive(False)
+            spin_button = self.builder.get_object('spin_rotation')
+            spin_button.set_value(0)
+
+            def change_rotation(region):
+                degrees = int(math.degrees(region.rotate))
+                self.callback_called = True
+                spin_button.set_value(math.degrees(region.rotate))
+            self.player.set_region_changed_callback(change_rotation)
         finally:
             # Restore the status string.
             self.set_status('')
@@ -98,8 +108,9 @@
         for button in ('imagemenuitem_close', 'toolbutton_close',
                        'toolbutton_previous', 'toolbutton_next',
                        'toolbutton_zoom_in', 'toolbutton_zoom_out',
-                       'toolbutton_editor'):
+                       'toolbutton_editor','spin_rotation'):
             self.builder.get_object(button).set_sensitive(False)
+        self.builder.get_object('spin_rotation').set_value(0)
 
     def on_open_clicked(self, widget):
         """Event called when the 'Open' button is clicked."""
@@ -216,6 +227,13 @@
         dialog.run()
         dialog.destroy()
 
+    def on_spin_rotation_value_changed(self, widget):
+        if self.callback_called:
+            self.callback_called = False
+            return
+        radians = math.radians(widget.get_value())
+        self.player.rotate(radians)
+
     def quit(self, widget=None):
         """Close the window and quit the application."""
         gtk.main_quit()

=== modified file 'a4lib/player.py'
--- a4lib/player.py	2010-07-24 18:17:17 +0000
+++ a4lib/player.py	2010-07-30 07:10:58 +0000
@@ -13,12 +13,27 @@
     def __init__(self, file_name):
         image = Presentation(file_name)
         self.presentation = image
-        self.current_region = Region.whole_image(image)
+        self._current_region = Region.whole_image(image)
         self.current_animation = None
         # Each zoom call Region.scale_of with this factor.
         self.zoom_factor = 1.4
         self.view_status = -1
 
+        self.region_changed_callback = None
+
+    def get_current_region(self):
+        return self._current_region
+
+    def set_current_region(self, region):
+        self._current_region = region
+        if self.region_changed_callback:
+            self.region_changed_callback(region)
+
+    current_region = property(get_current_region, set_current_region)
+
+    def set_region_changed_callback(self, callback):
+        self.region_changed_callback = callback
+
     def _set_animation_to(self, target):
         """Calculate `Animation` given the id of two point of a presentation.
         """
@@ -70,6 +85,13 @@
             self.current_animation = None
         self.current_region = self.current_region.move(step_x, step_y)
 
+    def rotate(self, rotate):
+        region = Region(self.current_region.x, self.current_region.y,
+                        self.current_region.width, self.current_region.height,
+                        rotate)
+        self.current_animation = Animation(
+            self.current_region, region, 0.2, linear_interpolation)
+
     @property
     def last_region(self):
         return self.view_status == len(self.presentation.get_path()) - 1
@@ -118,6 +140,10 @@
         Player.zoom_out(self, translation)
         self._set_timer()
 
+    def rotate(self, radians):
+        Player.rotate(self, radians)
+        self._set_timer()
+
     def move(self, stepx, stepy):
         stepx = self.current_region.width * (
             stepx / self.area.window.get_size()[0])

=== modified file 'ui/window_main.glade'
--- ui/window_main.glade	2010-07-24 22:28:56 +0000
+++ ui/window_main.glade	2010-07-30 07:10:58 +0000
@@ -218,6 +218,25 @@
               </packing>
             </child>
             <child>
+              <object class="GtkToolItem" id="spin_rotation_item">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkSpinButton" id="spin_rotation">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">&#x25CF;</property>
+                    <property name="adjustment">adjustment1</property>
+                    <property name="climb_rate">5</property>
+                    <property name="digits">2</property>
+                    <signal name="value_changed" handler="on_spin_rotation_value_changed"/>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkSeparatorToolItem" id="separator3">
                 <property name="visible">True</property>
               </object>
@@ -277,4 +296,11 @@
       </object>
     </child>
   </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">-180</property>
+    <property name="upper">180</property>
+    <property name="step_increment">5</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
 </interface>