Skip to content

Commit

Permalink
adaptative panel for experimental skew tool
Browse files Browse the repository at this point in the history
  • Loading branch information
@maoschanz
maoschanz committed Jan 30, 2020
1 parent 31862b3 commit e1ddfc3
Show file tree
Hide file tree
Showing 2 changed files with 180 additions and 71 deletions.
159 changes: 97 additions & 62 deletions src/tools/canvas_tools/tool_matrix.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def __init__(self, window):
self.row.get_style_context().add_class('destructive-action')

self.apply_to_selection = False
self.dont_update = False
self.temp_w = 1
self.temp_h = 1
self.add_tool_action_simple('matrix-reset', self.on_reset_values)
Expand All @@ -46,57 +45,21 @@ def try_build_panel(self):
self.window.options_manager.try_add_bottom_panel(self.panel_id, self)

def build_bottom_panel(self):
bar = DrawingAdaptativeBottomBar()
builder = bar.build_ui('tools/ui/tool_matrix.ui')

self.angle_spinbtn = builder.get_object('angle_spinbtn')
self.angle_spinbtn.connect('value-changed', self.on_angle_changed)

self.xx_spinbtn = builder.get_object('xx_spinbtn')
self.xx_spinbtn.connect('value-changed', self.on_coord_changed)

self.yx_spinbtn = builder.get_object('yx_spinbtn')
self.yx_spinbtn.connect('value-changed', self.on_coord_changed)

self.xy_spinbtn = builder.get_object('xy_spinbtn')
self.xy_spinbtn.connect('value-changed', self.on_coord_changed)

self.yy_spinbtn = builder.get_object('yy_spinbtn')
self.yy_spinbtn.connect('value-changed', self.on_coord_changed)

self.x0_spinbtn = builder.get_object('x0_spinbtn')
self.x0_spinbtn.connect('value-changed', self.on_coord_changed)

self.y0_spinbtn = builder.get_object('y0_spinbtn')
self.y0_spinbtn.connect('value-changed', self.on_coord_changed)

return bar
self.bar = SkewToolPanel(self.window, self)
return self.bar

############################################################################

def on_reset_values(self, *args):
self.dont_update = True

if self.apply_to_selection:
source_pixbuf = self.get_selection_pixbuf()
else:
source_pixbuf = self.get_main_pixbuf()
self.temp_w = source_pixbuf.get_width()
self.temp_h = source_pixbuf.get_height()
self.bar.set_all_values(100, 0, 0, 100, 0, 0, 0)

self.xx_spinbtn.set_value(100)
self.xy_spinbtn.set_value(0)
self.yx_spinbtn.set_value(0)
self.yy_spinbtn.set_value(100)
self.x0_spinbtn.set_value(0)
self.y0_spinbtn.set_value(0)
self.angle_spinbtn.set_value(0)
self.dont_update = False
self.on_coord_changed()

def on_angle_changed(self, *args):
self.dont_update = True
angle = self.angle_spinbtn.get_value_as_int()
def new_angle(self, angle):
rad = math.pi * angle / 180
print('rad', rad)
xx = math.cos(rad)
Expand All @@ -121,27 +84,15 @@ def on_angle_changed(self, *args):
x0 = max(0, x0)
y0 = max(0, y0)

self.xx_spinbtn.set_value(xx * 100)
self.xy_spinbtn.set_value(xy * 100)
self.yx_spinbtn.set_value(yx * 100)
self.yy_spinbtn.set_value(yy * 100)
self.x0_spinbtn.set_value(x0)
self.y0_spinbtn.set_value(y0)

# x_old = 100
# y_old = 100
# x_new = xx * x_old + xy * y_old + x0
# y_new = yx * x_old + yy * y_old + y0
# print(x_new, y_new)

self.dont_update = False
self.on_coord_changed()
self.bar.set_all_values(xx * 100, xy * 100, yx * 100, yy * 100, x0, y0, angle)

def on_coord_changed(self, *args):
if self.dont_update:
return
operation = self.build_operation()
self.do_tool_operation(operation)
############################################################################

def build_operation(self):
operation = {
Expand All @@ -150,18 +101,17 @@ def build_operation(self):
'is_preview': True,
'local_dx': 0,
'local_dy': 0,
'xx': self.xx_spinbtn.get_value_as_int()/100,
'yx': self.yx_spinbtn.get_value_as_int()/100,
'xy': self.xy_spinbtn.get_value_as_int()/100,
'yy': self.yy_spinbtn.get_value_as_int()/100,
'x0': self.x0_spinbtn.get_value_as_int(),
'y0': self.y0_spinbtn.get_value_as_int()
'xx': self.bar.xx_spinbtn.get_value_as_int()/100,
'yx': self.bar.yx_spinbtn.get_value_as_int()/100,
'xy': self.bar.xy_spinbtn.get_value_as_int()/100,
'yy': self.bar.yy_spinbtn.get_value_as_int()/100,
'x0': self.bar.x0_spinbtn.get_value_as_int(),
'y0': self.bar.y0_spinbtn.get_value_as_int()
}
return operation

def do_tool_operation(self, operation):
self.start_tool_operation(operation)

if operation['is_selection']:
source_pixbuf = self.get_selection_pixbuf()
else:
Expand All @@ -178,3 +128,88 @@ def do_tool_operation(self, operation):
############################################################################
################################################################################

class SkewToolPanel(DrawingAdaptativeBottomBar):
__gtype_name__ = 'SkewToolPanel'

def __init__(self, window, skew_tool):
super().__init__()
self.window = window
# knowing the tool is needed because the panel doesn't compact the same
# way if it's applied to the selection
self.skew_tool = skew_tool
self.dont_update = False

builder = self.build_ui('tools/ui/tool_matrix.ui')
self.values_btn = builder.get_object('values_btn')
self.xy_label = builder.get_object('xy_label')
self.yx_label = builder.get_object('yx_label')
self.separator = builder.get_object('separator')

self.angle_spinbtn = builder.get_object('angle_spinbtn')
self.angle_spinbtn.connect('value-changed', self.on_angle_changed)

self.xx_spinbtn = builder.get_object('xx_spinbtn')
self.yx_spinbtn = builder.get_object('yx_spinbtn')
self.xy_spinbtn = builder.get_object('xy_spinbtn')
self.yy_spinbtn = builder.get_object('yy_spinbtn')
self.x0_spinbtn = builder.get_object('x0_spinbtn')
self.y0_spinbtn = builder.get_object('y0_spinbtn')
self.xx_spinbtn.connect('value-changed', self.on_coord_changed)
self.yx_spinbtn.connect('value-changed', self.on_coord_changed)
self.xy_spinbtn.connect('value-changed', self.on_coord_changed)
self.yy_spinbtn.connect('value-changed', self.on_coord_changed)
self.x0_spinbtn.connect('value-changed', self.on_coord_changed)
self.y0_spinbtn.connect('value-changed', self.on_coord_changed)

def set_all_values(self, xx, xy, yx, yy, x0, y0, angle):
self.dont_update = True
self.xx_spinbtn.set_value(100)
self.xy_spinbtn.set_value(0)
self.yx_spinbtn.set_value(0)
self.yy_spinbtn.set_value(100)
self.x0_spinbtn.set_value(0)
self.y0_spinbtn.set_value(0)
self.angle_spinbtn.set_value(0)
self.dont_update = False
self.on_coord_changed()

def on_angle_changed(self, *args):
angle = self.angle_spinbtn.get_value_as_int()
self.skew_tool.new_angle(angle)
self.on_coord_changed()

def on_coord_changed(self, *args):
if self.dont_update:
return
self.skew_tool.build_and_do_op() # XXX yikes

def init_adaptability(self):
super().init_adaptability()
temp_limit_size = self.centered_box.get_preferred_width()[0] + \
self.cancel_btn.get_preferred_width()[0] + \
self.apply_btn.get_preferred_width()[0]
self.set_limit_size(temp_limit_size)

def update_for_new_tool(self, tool):
self.set_compact(self._is_narrow)

def toggle_options_menu(self):
self.values_btn.set_active(not self.values_btn.get_active())

def hide_options_menu(self):
self.values_btn.set_active(False)

def set_compact(self, state):
super().set_compact(state)
if state:
self.centered_box.set_orientation(Gtk.Orientation.VERTICAL)
else:
self.centered_box.set_orientation(Gtk.Orientation.HORIZONTAL)
self.xy_label.set_visible(not state)
self.yx_label.set_visible(not state)
self.separator.set_visible(not state)

############################################################################
################################################################################


92 changes: 83 additions & 9 deletions src/tools/ui/tool_matrix.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,22 +78,55 @@
<property name="visible">True</property>
<property name="spacing">10</property>
<property name="orientation">horizontal</property>

<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="spacing">10</property>
<property name="orientation">horizontal</property>
<child>
<object class="GtkLabel" id="xy_label">
<property name="label" translatable="yes">xy</property>
<property name="visible">True</property>
</object>
</child>
<child>
<object class="GtkSpinButton" id="xy_btn">
<property name="visible">True</property>
<property name="adjustment">adj_xy</property>
<property name="tooltip_text" translatable="yes">xy</property>
</object>
</child>
</object>
</child>

<child>
<object class="GtkMenuButton">
<property name="popover">test_popover</property>
<property name="label">values</property>
<object class="GtkSeparator" id="separator">
<property name="visible">True</property>
<property name="valign">center</property>
</object>
</child>

<child>
<object class="GtkButton">
<property name="action-name">win.matrix-reset</property>
<property name="label">reset</property>
<object class="GtkBox">
<property name="visible">True</property>
<property name="valign">center</property>
<property name="spacing">10</property>
<property name="orientation">horizontal</property>
<child>
<object class="GtkLabel" id="yx_label">
<property name="label" translatable="yes">yx</property>
<property name="visible">True</property>
</object>
</child>
<child>
<object class="GtkSpinButton" id="yx_btn">
<property name="visible">True</property>
<property name="adjustment">adj_yx</property>
<property name="tooltip_text" translatable="yes">yx</property>
</object>
</child>
</object>
</child>

</object>
</child>

Expand All @@ -103,7 +136,9 @@
<property name="tooltip-text" translatable="yes">Apply</property>
<property name="visible">True</property>
<property name="valign">center</property>
<style><class name="suggested-action"/></style>
<style>
<class name="suggested-action"/>
</style>
<child>
<object class="GtkImage">
<property name="icon-name">emblem-ok-symbolic</property>
Expand All @@ -115,11 +150,36 @@
<property name="pack-type">end</property>
</packing>
</child>

<child>
<object class="GtkMenuButton" id="values_btn">
<property name="popover">test_popover</property>
<property name="tooltip-text" translatable="yes">More options</property>
<!-- <property name="menu-model">actions-menu</property> -->
<property name="valign">center</property>
<property name="halign">center</property>
<child>
<object class="GtkImage">
<property name="icon-name">view-more-symbolic</property>
<property name="visible">True</property>
</object>
</child>
</object>
<packing>
<property name="pack-type">end</property>
</packing>
</child>
</object>

<!-- -->

<menu id="options-menu">
<section>
<item>
<attribute name="label" translatable="yes">Reset</attribute>
<attribute name="action">win.matrix-reset</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">Cancel</attribute>
Expand Down Expand Up @@ -328,6 +388,20 @@
</packing>
</child>

<child>
<object class="GtkButton">
<property name="action-name">win.matrix-reset</property>
<property name="label">reset</property>
<property name="visible">True</property>
<property name="valign">center</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="width">2</property>
<property name="top-attach">8</property>
</packing>
</child>

</object>
</child>
</object>
Expand Down

1 comment on commit e1ddfc3

@maoschanz
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#21

Please sign in to comment.