Changeset 3798 for trunk/umitGUI/radialnet/ControlWidget.py

Timestamp:

11/29/08 18:08:19 (4 years ago)

Author:

luis

Message:

Integration of RadialNet:
- higwidgets
- Added Mapper to Notebook
- Change version number
Credit for commit: me and Daniel Cassiano
AUTHOR of RadialNet: Joao Medeiros

Files:

• trunk/umitGUI/radialnet/ControlWidget.py (modified) (33 diffs)

trunk/umitGUI/radialnet/ControlWidget.py

@@ -23 +23 @@
 import gobject
 
-import bestwidgets as bw
+#import bestwidgets as bw
 import higwidgets.drawing as drawing
 
@@ -29 +29 @@
 from umitGUI.radialnet.RadialNet import *
 
+from higwidgets.higboxes import HIGBox, HIGHBox, HIGVBox, HIGScrolledWindow
+from higwidgets.higexpanders import HIGExpanderRNet
+from higwidgets.higtables import HIGTableRNet
 
 OPTIONS = ['address',
@@ -42 +45 @@
 
 
-class ControlWidget(bw.BWVBox):
+class ControlWidget(HIGVBox):
     """
     """
@@ -48 +51 @@
         """
         """
-        bw.BWVBox.__init__(self)
+        HIGVBox.__init__(self)
         self.set_border_width(6)
 
@@ -64 +67 @@
         self.__view = ControlView(self.radialnet)
 
-        self.bw_pack_start_noexpand_nofill(self.__action)
-        self.bw_pack_start_noexpand_nofill(self.__interpolation)
-        self.bw_pack_start_noexpand_nofill(self.__layout)
-        self.bw_pack_start_noexpand_nofill(self.__view)
-
-
-
-class ControlAction(bw.BWExpander):
+        self._pack_noexpand_nofill(self.__action)
+        self._pack_noexpand_nofill(self.__interpolation)
+        self._pack_noexpand_nofill(self.__layout)
+        self._pack_noexpand_nofill(self.__view)
+
+
+
+class ControlAction(HIGExpanderRNet):
     """
     """
@@ -77 +80 @@
         """
         """
-        bw.BWExpander.__init__(self, 'Action')
+        HIGExpanderRNet.__init__(self, 'Action')
         self.set_expanded(True)
 
@@ -88 +91 @@
         """
         """
-        self.__tbox = bw.BWTable(1, 4)
-        self.__tbox.bw_set_spacing(0)
-        self.__vbox = bw.BWVBox()
+        self.__tbox = HIGTableRNet(1, 4)
+        self.__tbox._set_spacing(0)
+        self.__vbox = HIGVBox()
 
         self.__tooltips = gtk.Tooltips()
@@ -126 +129 @@
         self.__region_color.set_active(self.radialnet.get_region_color())
 
-        self.__tbox.bw_attach_next(self.__jump_to)
-        self.__tbox.bw_attach_next(self.__info)
-        self.__tbox.bw_attach_next(self.__group)
-        self.__tbox.bw_attach_next(self.__region)
-
-        self.__vbox.bw_pack_start_noexpand_nofill(self.__tbox)
-        self.__vbox.bw_pack_start_noexpand_nofill(self.__region_color)
-
-        self.bw_add(self.__vbox)
+        self.__tbox._attach_next(self.__jump_to)
+        self.__tbox._attach_next(self.__info)
+        self.__tbox._attach_next(self.__group)
+        self.__tbox._attach_next(self.__region)
+
+        self.__vbox._pack_noexpand_nofill(self.__tbox)
+        self.__vbox._pack_noexpand_nofill(self.__region_color)
+
+        self._add(self.__vbox)
 
         self.__jump_to.set_active(True)
@@ -354 +357 @@
 
 
-class ControlVariable(bw.BWHBox):
+class ControlVariable(HIGHBox):
     """
     """
@@ -360 +363 @@
         """
         """
-        bw.BWHBox.__init__(self, spacing=0)
+        HIGHBox.__init__(self, spacing=0)
 
         self.__increment_pass = increment
@@ -399 +402 @@
         self.__right_button.connect('released', self.__released)
 
-        self.bw_pack_start_noexpand_nofill(self.__left_button)
-        self.bw_pack_start_expand_fill(self.__control)
-        self.bw_pack_start_noexpand_nofill(self.__right_button)
+        self._pack_noexpand_nofill(self.__left_button)
+        self._pack_expand_fill(self.__control)
+        self._pack_noexpand_nofill(self.__right_button)
 
 
@@ -432 +435 @@
 
 
-class ControlFisheye(bw.BWVBox):
+class ControlFisheye(HIGVBox):
     """
     """
@@ -438 +441 @@
         """
         """
-        bw.BWVBox.__init__(self)
+        HIGVBox.__init__(self)
         self.set_border_width(6)
 
@@ -450 +453 @@
         """
         """
-        self.__params = bw.BWHBox()
+        self.__params = HIGHBox()
 
         self.__fisheye_label = gtk.Label('<b>Fisheye</b> on ring')
@@ -477 +480 @@
         self.__spread_spin.set_digits(2)
 
-        self.__params.bw_pack_start_noexpand_nofill(self.__fisheye_label)
-        self.__params.bw_pack_start_noexpand_nofill(self.__ring_spin)
-        self.__params.bw_pack_start_expand_fill(self.__ring_scale)
-        self.__params.bw_pack_start_noexpand_nofill(self.__interest_label)
-        self.__params.bw_pack_start_noexpand_nofill(self.__interest_spin)
-        self.__params.bw_pack_start_noexpand_nofill(self.__spread_label)
-        self.__params.bw_pack_start_noexpand_nofill(self.__spread_spin)
-
-        self.bw_pack_start_noexpand_nofill(self.__params)
+        self.__params._pack_noexpand_nofill(self.__fisheye_label)
+        self.__params._pack_noexpand_nofill(self.__ring_spin)
+        self.__params._pack_expand_fill(self.__ring_scale)
+        self.__params._pack_noexpand_nofill(self.__interest_label)
+        self.__params._pack_noexpand_nofill(self.__interest_spin)
+        self.__params._pack_noexpand_nofill(self.__spread_label)
+        self.__params._pack_noexpand_nofill(self.__spread_spin)
+
+        self._pack_noexpand_nofill(self.__params)
 
         self.__ring.connect('value_changed', self.__change_ring)
@@ -578 +581 @@
 
 
-class ControlInterpolation(bw.BWExpander):
+class ControlInterpolation(HIGExpanderRNet):
     """
     """
@@ -584 +587 @@
         """
         """
-        bw.BWExpander.__init__(self, 'Interpolation')
+        HIGExpanderRNet.__init__(self, 'Interpolation')
 
         self.radialnet = radialnet
@@ -594 +597 @@
         """
         """
-        self.__vbox = bw.BWVBox()
+        self.__vbox = HIGVBox()
 
         self.__cartesian_radio = gtk.RadioButton(None, 'Cartesian')
@@ -605 +608 @@
                                    INTERPOLATION_POLAR)
 
-        self.__system_box = bw.BWHBox()
-        self.__system_box.bw_pack_start_noexpand_nofill(self.__polar_radio)
-        self.__system_box.bw_pack_start_noexpand_nofill(self.__cartesian_radio)
-
-        self.__frames_box = bw.BWHBox()
+        self.__system_box = HIGHBox()
+        self.__system_box._pack_noexpand_nofill(self.__polar_radio)
+        self.__system_box._pack_noexpand_nofill(self.__cartesian_radio)
+
+        self.__frames_box = HIGHBox()
         self.__frames_label = gtk.Label('Frames')
         self.__frames_label.set_alignment(0.0, 0.5)
@@ -618 +621 @@
         self.__frames.connect('value_changed', self.__change_frames)
         self.__frames_spin = gtk.SpinButton(self.__frames)
-        self.__frames_box.bw_pack_start_expand_fill(self.__frames_label)
-        self.__frames_box.bw_pack_start_noexpand_nofill(self.__frames_spin)
-
-        self.__vbox.bw_pack_start_noexpand_nofill(self.__frames_box)
-        self.__vbox.bw_pack_start_noexpand_nofill(self.__system_box)
-
-        self.bw_add(self.__vbox)
+        self.__frames_box._pack_expand_fill(self.__frames_label)
+        self.__frames_box._pack_noexpand_nofill(self.__frames_spin)
+
+        self.__vbox._pack_noexpand_nofill(self.__frames_box)
+        self.__vbox._pack_noexpand_nofill(self.__system_box)
+
+        self._add(self.__vbox)
 
         gobject.timeout_add(REFRESH_RATE, self.__update_animation)
@@ -665 +668 @@
 
 
-class ControlLayout(bw.BWExpander):
+class ControlLayout(HIGExpanderRNet):
     """
     """
@@ -671 +674 @@
         """
         """
-        bw.BWExpander.__init__(self, 'Layout')
+        HIGExpanderRNet.__init__(self, 'Layout')
 
         self.radialnet = radialnet
@@ -681 +684 @@
         """
         """
-        self.__hbox = bw.BWHBox()
+        self.__hbox = HIGHBox()
 
         self.__layout = gtk.combo_box_new_text()
@@ -691 +694 @@
         self.__force.connect('clicked', self.__force_update)
 
-        self.__hbox.bw_pack_start_expand_fill(self.__layout)
-        self.__hbox.bw_pack_start_noexpand_nofill(self.__force)
-
-        self.bw_add(self.__hbox)
+        self.__hbox._pack_expand_fill(self.__layout)
+        self.__hbox._pack_noexpand_nofill(self.__force)
+
+        self._add(self.__hbox)
 
         self.__check_layout()
@@ -729 +732 @@
 
 
-class ControlRingGap(bw.BWVBox):
+class ControlRingGap(HIGVBox):
     """
     """
@@ -735 +738 @@
         """
         """
-        bw.BWVBox.__init__(self)
+        HIGVBox.__init__(self)
 
         self.radialnet = radialnet
@@ -758 +761 @@
         self.__spin.connect('value_changed', self.__change_lower)
 
-        self.__lower_hbox = bw.BWHBox()
-        self.__lower_hbox.bw_pack_start_expand_fill(self.__label)
-        self.__lower_hbox.bw_pack_start_noexpand_nofill(self.__spin)
-
-        self.bw_pack_start_noexpand_nofill(self.__radius)
-        self.bw_pack_start_noexpand_nofill(self.__lower_hbox)
+        self.__lower_hbox = HIGHBox()
+        self.__lower_hbox._pack_expand_fill(self.__label)
+        self.__lower_hbox._pack_noexpand_nofill(self.__spin)
+
+        self._pack_noexpand_nofill(self.__radius)
+        self._pack_noexpand_nofill(self.__lower_hbox)
 
 
@@ -774 +777 @@
 
 
-class ControlOptions(bw.BWScrolledWindow):
+class ControlOptions(HIGScrolledWindow):
     """
     """
@@ -780 +783 @@
         """
         """
-        bw.BWScrolledWindow.__init__(self)
+        HIGScrolledWindow.__init__(self)
 
         self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_ALWAYS)
@@ -875 +878 @@
 
 
-class ControlView(bw.BWExpander):
+class ControlView(HIGExpanderRNet):
     """
     """
@@ -881 +884 @@
         """
         """
-        bw.BWExpander.__init__(self, 'View')
+        HIGExpanderRNet.__init__(self, 'View')
         self.set_expanded(True)
 
@@ -892 +895 @@
         """
         """
-        self.__vbox = bw.BWVBox(spacing=0)
+        self.__vbox = HIGVBox(spacing=0)
 
         self.__zoom = ControlVariable('Zoom',
@@ -904 +907 @@
         self.__options.set_border_width(0)
 
-        self.__vbox.bw_pack_start_expand_nofill(self.__options)
-        self.__vbox.bw_pack_start_noexpand_nofill(self.__navigation)
-        self.__vbox.bw_pack_start_noexpand_nofill(self.__zoom)
-        self.__vbox.bw_pack_start_noexpand_nofill(self.__ring_gap)
-
-        self.bw_add(self.__vbox)
+        self.__vbox._pack_expand_nofill(self.__options)
+        self.__vbox._pack_noexpand_nofill(self.__navigation)
+        self.__vbox._pack_noexpand_nofill(self.__zoom)
+        self.__vbox._pack_noexpand_nofill(self.__ring_gap)
+
+        self._add(self.__vbox)