- Note dimensions always absolute

- UI updates for better OpenGL rendering
- update to preferences handling

Author: mfessenden

bin/SceneGraph

@@ -6,26 +6,54 @@ from optparse import OptionParser
 
 
 if __name__ == "__main__":
-    parser = OptionParser()
-    parser.add_option("-f", "--filename", action="store", dest="filename")
-    parser.add_option("-g", "--opengl", action="store_true", dest="opengl", default=False)
-    (options, args) = parser.parse_args()
     from SceneGraph import scenegraph
-    app = QtGui.QApplication(sys.argv)
+    from SceneGraph.options import PACKAGE, PLATFORM, EDGE_TYPES, VIEWPORT_MODES
+
+    APP_STYLES = [s.lower() for s in QtGui.QStyleFactory.keys()]
 
-    if sys.platform == 'darwin':
-        app.setStyle('cleanlooks')
+    filename = None
+    args = sys.argv
+    if len(args)>1:
+        if os.path.exists(args[1]):            
+            filename = args[1]
+
+    parser = OptionParser()
+    parser.add_option("-g", "--use_gl", action="store_true", dest="use_gl", default=False, help='use OpenGL renderer.')
+    parser.add_option("--fx", action="store_true", dest="render_fx", default=True, help='render node dropshadow & glow effects.')
+    parser.add_option("-m", action="store", dest="viewport_mode", help='set the Qt viewport mode (ie. "full", "smart", "minimal").')
+    parser.add_option("-e", action="store", dest="edge_type", help='node edge style (ie. "bezier", "polygon").')
+    parser.add_option("-s", action="store", dest="app_style", help='Qt application style (ie. "%s").' % '", "'.join(APP_STYLES))
 
     # oxygen looks better in linux overall, but plastique groupBoxes look better
     # Designer previews in GTK+
-    if 'linux' in sys.platform:
-        app.setStyle("oxygen")
+    if PLATFORM == 'Linux':
+        parser.set_default('app_style', 'oxygen')
+
+    if PLATFORM == 'MacOSX':
+        parser.set_default('app_style', 'cleanlooks')
+
+    (options, args) = parser.parse_args()    
+    app = QtGui.QApplication(sys.argv)
+
+    # set the application style
+    if options.app_style:
+        if options.app_style.lower() in APP_STYLES:
+            print '[%s]: INFO: setting Qt style: "%s".' % (PACKAGE, options.app_style)
+            app.setStyle(options.app_style)
+
+    # update prefs
+    prefs = dict()
+    if options.viewport_mode:
+        if options.viewport_mode.lower() in VIEWPORT_MODES:
+            prefs.update(viewport_mode=options.viewport_mode.lower())
 
+    if options.edge_type:
+        if options.edge_type.lower() in EDGE_TYPES:
+            prefs.update(edge_type=options.edge_type.lower())
 
-    #app.setStyle("gtk") # gtk is default
-    sgui = scenegraph.SceneGraphUI(opengl=options.opengl)
+    sgui = scenegraph.SceneGraphUI(use_gl=options.use_gl, render_fx=options.render_fx, **prefs)
     sgui.show()
 
-    if options.filename:
-        sgui.readGraph(options.filename)
+    if filename:
+        sgui.readGraph(filename)
     sys.exit(app.exec_())

bin/TestGraph

@@ -8,7 +8,7 @@ from optparse import OptionParser
 if __name__ == "__main__":
     parser = OptionParser()
     parser.add_option("-f", "--filename", action="store", dest="filename")
-    parser.add_option("-g", "--opengl", action="store_true", dest="opengl", default=False)
+    parser.add_option("-g", "--use_gl", action="store_true", dest="use_gl", default=False)
     parser.add_option("-d", "--debug", action="store_true", dest="debug", default=False)
     (options, args) = parser.parse_args()
     from SceneGraph.test import test
@@ -22,7 +22,7 @@ if __name__ == "__main__":
         app.setStyle("oxygen")
 
     #app.setStyle("gtk") # gtk is default
-    sgui = test.TestGraph(opengl=options.opengl, debug=options.debug)
+    sgui = test.TestGraph(use_gl=options.use_gl, debug=options.debug)
     sgui.show()
 
     if options.filename:

core/graph.py

@@ -422,6 +422,7 @@ def add_edge(self, src, dest, **kwargs):
         src_attr = kwargs.pop('src_attr', 'output')
         dest_attr = kwargs.pop('dest_attr', 'input')
         weight = kwargs.pop('weight', 1.0)
+        edge_type = kwargs.pop('edge_type', 'bezier')
 
         if src is None or dest is None:
             log.warning('none type passed.')
@@ -440,18 +441,14 @@ def add_edge(self, src, dest, **kwargs):
         if conn_str in self.connections():
             log.warning('connection already exists: %s' % conn_str)
             return 
-    
-        edge_attrs = dict(src_id=src.id, dest_id=dest.id, src_attr=src_attr, dest_attr=dest_attr)
+        
+        # edge attributes for nx graph
+        edge_attrs = dict(src_id=src.id, dest_id=dest.id, src_attr=src_attr, dest_attr=dest_attr, edge_type=edge_type)
 
         src_conn = src.get_connection(src_attr)
         dest_conn = dest.get_connection(dest_attr)
         edge_id_str = '(%s,%s)' % (src.id, dest.id)
-        '''
-        print '# source dag:  ', src.name
-        print '# dest dag:    ', dest.name
-        print '# source conn: ', src_conn, src_attr
-        print '# dest conn:   ', dest_conn, dest_attr
-        '''
+
         if edge_id_str not in src_conn._edges and edge_id_str not in dest_conn._edges:            
             # add the nx edge        
             self.network.add_edge(src.id, dest.id, key='attributes', weight=weight, attr_dict=edge_attrs)

options.py

@@ -99,19 +99,28 @@
     }
 
 
+EDGE_TYPES = ['bezier', 'polygon']
+
+
+VIEWPORT_MODES = dict(
+                full = 'QtGui.QGraphicsView.FullViewportUpdate',
+                smart = 'QtGui.QGraphicsView.SmartViewportUpdate',
+                minimal = 'QtGui.QGraphicsView.MinimalViewportUpdate',
+                bounding = 'QtGui.QGraphicsView.BoundingRectViewportUpdate'
+                )
 
 def setup_platform_defaults():
     """
     Setup globals for a specific platform.
     """
     import sys
-    plaform = 'Windows'
+    platform = 'Windows'
     if 'linux' in sys.platform:
-        plaform = 'Linux'
+        platform = 'Linux'
 
     if sys.platform == 'darwin':
-        plaform = 'MacOSX'
-    return plaform
+        platform = 'MacOSX'
+    return platform
 
 
 def setup_fonts(font='SansSerif', size=8, platform=None):

plugins/note.mtd

@@ -23,4 +23,8 @@
     [attr force_expand]
         default             BOOL      false
         label               STRING    "Expand Node"
-        private             BOOL      true  
+        private             BOOL      true  
+
+    [attr show_name]
+        default             BOOL      false
+        label               STRING    "Show name"

plugins/note.py

@@ -17,8 +17,9 @@ def __init__(self, name=None, **kwargs):
 
         self.corner_loc     = 'top'   
         self.base_height    = 75
-        self.doc_text       = kwargs.get('doc_text', "Sample note text.")
         self.font_size      = 6
+        self.show_name      = kwargs.get('show_name', False)
+        self.doc_text       = kwargs.get('doc_text', "Sample note text.")        
 
     @property
     def data(self):
@@ -29,5 +30,5 @@ def data(self):
         for attr in self.REQUIRED:
             if hasattr(self, attr):
                 data[attr] = getattr(self, attr)
-        data.update(doc_text=self.doc_text, corner_loc=self.corner_loc, font_size=self.font_size)
+        data.update(doc_text=self.doc_text, corner_loc=self.corner_loc, font_size=self.font_size, show_name=self.show_name)
         return data

plugins/note_widget.py

@@ -31,7 +31,8 @@ def __init__(self, dagnode, parent=None):
         self.bufferX         = 3
         self.bufferY         = 3
         self.pen_width       = 1.5                            # pen width for NoteBackground  
-
+        self.handle_size     = 6                              # size of the resize handle
+          
         # fonts
         self._font           = 'SansSerif'
         self._font_size      = self.dagnode.font_size
@@ -53,6 +54,8 @@ def __init__(self, dagnode, parent=None):
         # temp resizing attributes
         self.top_left        = ()
         self.btm_right       = ()
+        self.min_width       = 75                             # widget minimum size  
+        self.min_height      = 60                             # widget minimum size  
 
         # label
         self._evaluate_tag   = False                          # indicates the node is set to "evaluate" (a la Houdini)
@@ -168,8 +171,8 @@ def mouseMoveEvent(self, event):
             self.btm_right = (scene_pos.x(), scene_pos.y())
             # create a temporary rectangle with the current selection
             rect = QtCore.QRectF(QtCore.QPointF(*self.top_left), QtCore.QPointF(*self.btm_right))    
-            self.dagnode.width = rect.width()
-            self.dagnode.height = rect.height()
+            self.dagnode.width = abs(rect.width())
+            self.dagnode.height = abs(rect.height())
 
     def mousePressEvent(self, event):
         """
@@ -193,7 +196,13 @@ def mouseReleaseEvent(self, event):
             self.handle_selected = False
             #self.setPos(cpos.x(), cpos.y())            
         QtGui.QGraphicsItem.mouseReleaseEvent(self, event)
-        
+
+        # tidy up
+        if self.dagnode.width < self.min_width:
+            self.dagnode.width = self.min_width
+
+        if self.dagnode.height < self.min_height:
+            self.dagnode.height = self.min_height
 
     def dagnodeUpdated(self, *args, **kwargs):
         """
@@ -357,12 +366,11 @@ def handleRect(self):
         * testing
         """
         rect = self.boundingRect()
-        size = 6
-        buffer = 2
-        p1 = rect.bottomRight() # need as p1
-        p2 = QtCore.QPointF(p1.x() - (size+buffer), p1.y())
-        topLeft = QtCore.QPointF(p2.x(), p2.y() - (size+buffer))
-        return QtCore.QRectF(topLeft, QtCore.QSize(size, size))
+        hbuffer = self.handle_size/3.0
+        p1 = rect.bottomRight()
+        p2 = QtCore.QPointF(abs(p1.x()) - (self.handle_size + hbuffer), p1.y())
+        topLeft = QtCore.QPointF(p2.x(), p2.y() - (self.handle_size + hbuffer))
+        return QtCore.QRectF(topLeft, QtCore.QSize(self.handle_size, self.handle_size))
 
     def paint(self, painter, option, widget):
         """
@@ -452,11 +460,16 @@ def paint(self, painter, option, widget):
         painter.setBrush(qbrush)
 
         # draw background
-        painter.drawPolygon(note_shape)        
+        if not self.handle_selected:
+            painter.drawPolygon(note_shape)
+        else:
+            painter.drawRect(self.boundingRect())
         painter.setBrush(cbrush)
         painter.setPen(cpen)
+
         # draw corner
-        painter.drawPolygon(corner_shape)
+        if not self.handle_selected:
+            painter.drawPolygon(corner_shape)
 
         self.center_label.hide()
         cpos = self.mapToScene(self.boundingRect().center())
@@ -472,7 +485,7 @@ def paint(self, painter, option, widget):
             if self._debug:
                 self.center_label.show()
                 self.center_label.setPos(0,0)
-            self.setPos(cpos.x(),cpos.y())            
+            self.setPos(cpos.x(),cpos.y())
         self.resize_handle.setRect(self.handleRect())
 
     def setDebug(self, val):