conduit r1614 - in trunk: . conduit/gtkui conduit/hildonui



Author: jstowers
Date: Fri Aug  1 14:51:51 2008
New Revision: 1614
URL: http://svn.gnome.org/viewvc/conduit?rev=1614&view=rev

Log:
	* conduit/gtkui/Canvas.py:
	* conduit/hildonui/Canvas.py: Use Class properties for common
	drawing properties.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/conduit/gtkui/Canvas.py
   trunk/conduit/hildonui/Canvas.py

Modified: trunk/conduit/gtkui/Canvas.py
==============================================================================
--- trunk/conduit/gtkui/Canvas.py	(original)
+++ trunk/conduit/gtkui/Canvas.py	Fri Aug  1 14:51:51 2008
@@ -23,11 +23,6 @@
 
 log.info("Module Information: %s" % Utils.get_module_information(goocanvas, "pygoocanvas_version"))
 
-#Style elements common to ConduitCanvasItem and DPCanvasItem
-SIDE_PADDING =      10.0
-LINE_WIDTH =        2.0
-RECTANGLE_RADIUS =  4.0
-
 class _StyleMixin:
 
     STYLES = (
@@ -102,6 +97,10 @@
             return GtkUtil.gdk2intrgba(GtkUtil.str2gdk("red"), int(a*255))
 
 class _CanvasItem(goocanvas.Group, _StyleMixin):
+
+    #attributes common to Conduit and Dataprovider items
+    RECTANGLE_RADIUS =  4.0
+
     def __init__(self, parent, model):
         #FIXME: If parent is None in base constructor then goocanvas segfaults
         #this means a ref to items may be kept so this may leak...
@@ -414,7 +413,7 @@
         items = self._get_child_conduit_canvas_items()
         if len(items) > 0:
             #special case where the top one was deleted
-            top = items[0].get_top()-(LINE_WIDTH/2)
+            top = items[0].get_top()-(items[0].LINE_WIDTH/2)
             if top != 0.0:
                 for item in items:
                     #translate all those below
@@ -467,8 +466,8 @@
                                 width=c_w)
         conduitCanvasItem.connect('button-press-event', self._on_conduit_button_press)
         conduitCanvasItem.translate(
-                LINE_WIDTH/2.0,
-                bottom+(LINE_WIDTH/2.0)
+                conduitCanvasItem.LINE_WIDTH/2.0,
+                bottom+(conduitCanvasItem.LINE_WIDTH/2.0)
                 )
 
         for dp in conduitAdded.get_all_dataproviders():
@@ -648,6 +647,7 @@
     PENDING_MESSAGE = "Pending"
     MAX_TEXT_LENGTH = 10
     MAX_TEXT_LINES = 2
+    LINE_WIDTH = 2.0
 
     def __init__(self, parent, model):
         _CanvasItem.__init__(self, parent, model)
@@ -684,10 +684,10 @@
         self.box = goocanvas.Rect(   
                                 x=0, 
                                 y=0, 
-                                width=self.WIDGET_WIDTH-(2*LINE_WIDTH), 
-                                height=self.WIDGET_HEIGHT-(2*LINE_WIDTH),
-                                radius_y=RECTANGLE_RADIUS, 
-                                radius_x=RECTANGLE_RADIUS,
+                                width=self.WIDGET_WIDTH-(2*self.LINE_WIDTH), 
+                                height=self.WIDGET_HEIGHT-(2*self.LINE_WIDTH),
+                                radius_y=self.RECTANGLE_RADIUS, 
+                                radius_x=self.RECTANGLE_RADIUS,
                                 **self.get_style_properties("box")
                                 )
         pb = self.model.get_icon()
@@ -800,8 +800,10 @@
 class ConduitCanvasItem(_CanvasItem):
 
     DIVIDER = False
-    FLAT_BOX = False
+    FLAT_BOX = True
     WIDGET_HEIGHT = 100
+    SIDE_PADDING = 10.0
+    LINE_WIDTH = 2.0
 
     def __init__(self, parent, model, width):
         _CanvasItem.__init__(self, parent, model)
@@ -847,29 +849,29 @@
         if dpx == 0:
             #Its a source
             dpCanvasItem.translate(
-                        SIDE_PADDING,
-                        SIDE_PADDING + self.l.get_property("line_width")
+                        self.SIDE_PADDING,
+                        self.SIDE_PADDING + self.l.get_property("line_width")
                         )
         else:
             #Its a sink
             if dpy == 0:
-                i = SIDE_PADDING
+                i = self.SIDE_PADDING
             else:
-                i = (dpy * SIDE_PADDING) + SIDE_PADDING
+                i = (dpy * self.SIDE_PADDING) + self.SIDE_PADDING
 
             dpCanvasItem.translate(
-                            self.get_width() - dpCanvasItem.get_width() - SIDE_PADDING,
+                            self.get_width() - dpCanvasItem.get_width() - self.SIDE_PADDING,
                             (dpy * dpCanvasItem.get_height()) + i + self.l.get_property("line_width")
                             )
 
     def _build_widget(self, width):
-        true_width = width-LINE_WIDTH
+        true_width = width-self.LINE_WIDTH
 
         #draw a spacer to give some space between conduits
         points = goocanvas.Points([(0.0, 0.0), (true_width, 0.0)])
         self.l = goocanvas.Polyline(
                                 points=points,
-                                line_width=LINE_WIDTH,
+                                line_width=self.LINE_WIDTH,
                                 stroke_color_rgba=GtkUtil.TRANSPARENT_COLOR
                                 )
         self.add_child(self.l)
@@ -879,17 +881,17 @@
                                 x=0, 
                                 y=5, 
                                 width=true_width,     
-                                height=ConduitCanvasItem.WIDGET_HEIGHT,
-                                radius_y=RECTANGLE_RADIUS, 
-                                radius_x=RECTANGLE_RADIUS,
+                                height=self.WIDGET_HEIGHT,
+                                radius_y=self.RECTANGLE_RADIUS, 
+                                radius_x=self.RECTANGLE_RADIUS,
                                 **self.get_style_properties("boundingBox")
                                 )
         self.add_child(self.boundingBox)
         if self.DIVIDER:
             #draw an underline
             #from point
-            self.dividerPoints[0] = (true_width*0.33,5+ConduitCanvasItem.WIDGET_HEIGHT)
-            self.dividerPoints[1] = (2*(true_width*0.33),5+ConduitCanvasItem.WIDGET_HEIGHT)
+            self.dividerPoints[0] = (true_width*0.33,5+self.WIDGET_HEIGHT)
+            self.dividerPoints[1] = (2*(true_width*0.33),5+self.WIDGET_HEIGHT)
             
             self.divider = goocanvas.Polyline(
                                     points=goocanvas.Points(self.dividerPoints),
@@ -906,13 +908,13 @@
         #padding between items
         numSinks = len(self.sinkDpItems)
         if numSinks:
-            sinkh += ((numSinks - 1)*SIDE_PADDING)
+            sinkh += ((numSinks - 1)*self.SIDE_PADDING)
         if self.sourceItem != None:
             sourceh += self.sourceItem.get_height()
 
         self.set_height(
                     max(sourceh, sinkh)+        #expand to the largest
-                    (1.5*SIDE_PADDING)        #padding at the top and bottom
+                    (1.5*self.SIDE_PADDING)        #padding at the top and bottom
                     )
 
     def _delete_connector(self, item):
@@ -956,7 +958,7 @@
         items = self.sinkDpItems
         if len(items) > 0:
             #special case where the top one was deleted
-            top = items[0].get_top()-self.get_top()-SIDE_PADDING-LINE_WIDTH
+            top = items[0].get_top()-self.get_top()-self.SIDE_PADDING-items[0].LINE_WIDTH
             if top != 0.0:
                 for item in items:
                     #translate all those below
@@ -971,10 +973,10 @@
                         log.debug("Sink Overlap: %s %s ----> %s" % (overlap,i,i+1))
                         #If there is anything more than the normal padding gap between then
                         #the dp must be translated
-                        if overlap < -SIDE_PADDING:
+                        if overlap < -self.SIDE_PADDING:
                             #translate all those below, and make their connectors work again
                             for item in items[i+1:]:
-                                item.translate(0,overlap+SIDE_PADDING)
+                                item.translate(0,overlap+self.SIDE_PADDING)
                                 if self.sourceItem != None:
                                     fromx,fromy,tox,toy = self._get_connector_coordinates(self.sourceItem,item)
                                     self.connectorItems[item].reconnect(fromx,fromy,tox,toy)
@@ -1117,7 +1119,7 @@
                                 goocanvas.Points(self.dividerPoints))        
 
     def set_width(self, w):
-        true_width = w-LINE_WIDTH
+        true_width = w-self.LINE_WIDTH
         self.boundingBox.set_property("width",true_width)
 
         if self.DIVIDER:
@@ -1132,7 +1134,7 @@
         self.l.set_property("points",p)
 
         for d in self.sinkDpItems:
-            desired = w - d.get_width() - SIDE_PADDING
+            desired = w - d.get_width() - self.SIDE_PADDING
             actual = d.get_left()
             change = desired-actual
             #move righthand dp
@@ -1144,10 +1146,10 @@
 class ConnectorCanvasItem(_CanvasItem):
 
     CONNECTOR_RADIUS = 30
-    CONNECTOR_LINE_WIDTH = 5
     CONNECTOR_YOFFSET = 20
     CONNECTOR_TEXT_XPADDING = 5
     CONNECTOR_TEXT_YPADDING = 10
+    LINE_WIDTH = 5.0
 
     def __init__(self, parent, fromX, fromY, toX, toY, twoway, conversionExists):
         _CanvasItem.__init__(self, parent, None)
@@ -1198,7 +1200,7 @@
 
         self.path = goocanvas.Path(
                             data="",
-                            line_width=ConnectorCanvasItem.CONNECTOR_LINE_WIDTH,
+                            line_width=self.LINE_WIDTH,
                             **self.get_style_properties("path")
                             )
         self._draw_path()
@@ -1260,7 +1262,7 @@
         #Reecreate the path to work round goocanvas bug
         self.path = goocanvas.Path(
                             data=p,
-                            line_width=ConnectorCanvasItem.CONNECTOR_LINE_WIDTH,
+                            line_width=self.LINE_WIDTH,
                             **self.get_style_properties("path")
                             )
         self.add_child(self.path,-1)

Modified: trunk/conduit/hildonui/Canvas.py
==============================================================================
--- trunk/conduit/hildonui/Canvas.py	(original)
+++ trunk/conduit/hildonui/Canvas.py	Fri Aug  1 14:51:51 2008
@@ -273,8 +273,10 @@
     #         self.selectedConduitItem.model.disable_slow_sync()
 
 class DataProviderCanvasItem(conduit.gtkui.Canvas.DataProviderCanvasItem):
+
     WIDGET_WIDTH = 160
     WIDGET_HEIGHT = 85
+    LINE_WIDTH = 3.0
 
     def get_styled_item_names(self):
         return ()
@@ -313,7 +315,9 @@
 
 class ConduitCanvasItem(conduit.gtkui.Canvas.ConduitCanvasItem):
 
+    FLAT_BOX = False
     DIVIDER = False
+    LINE_WIDTH = 3.0
 
     def get_styled_item_names(self):
         return ()



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]