[Commit-gnuradio] r9595 - in gnuradio/trunk/grc: data/platforms/python src/gui src/platforms/base src/platforms/python

[jblum]

Author: jblum
Date: 2008-09-16 21:11:44 -0600 (Tue, 16 Sep 2008)
New Revision: 9595

Added:
   gnuradio/trunk/grc/data/platforms/python/default_flow_graph.grc
Removed:
   gnuradio/trunk/grc/data/platforms/python/default_flow_graph.grc.xml
Modified:
   gnuradio/trunk/grc/data/platforms/python/Makefile.am
   gnuradio/trunk/grc/src/gui/ParamsDialog.py
   gnuradio/trunk/grc/src/platforms/base/Block.py
   gnuradio/trunk/grc/src/platforms/base/Connection.py
   gnuradio/trunk/grc/src/platforms/base/Port.py
   gnuradio/trunk/grc/src/platforms/python/Constants.py.in
Log:
error message formatting

Modified: gnuradio/trunk/grc/data/platforms/python/Makefile.am
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/Makefile.am        2008-09-17 
02:40:35 UTC (rev 9594)
+++ gnuradio/trunk/grc/data/platforms/python/Makefile.am        2008-09-17 
03:11:44 UTC (rev 9595)
@@ -28,7 +28,7 @@
 ourdata_DATA = \
        block.dtd \
        block_tree.xml \
-       default_flow_graph.grc.xml \
+       default_flow_graph.grc \
        flow_graph.tmpl
 
 EXTRA_DIST = $(ourdata_DATA)

Copied: gnuradio/trunk/grc/data/platforms/python/default_flow_graph.grc (from 
rev 9593, gnuradio/trunk/grc/data/platforms/python/default_flow_graph.grc.xml)
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/default_flow_graph.grc             
                (rev 0)
+++ gnuradio/trunk/grc/data/platforms/python/default_flow_graph.grc     
2008-09-17 03:11:44 UTC (rev 9595)
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Default Flow Graph:
+##     include an options block and a variable for sample rate
+###################################################
+ -->
+<flow_graph>
+       <block>
+               <key>options</key>
+               <param>
+                       <key>id</key>
+                       <value>top_block</value>
+               </param>
+               <param>
+                       <key>_coordinate</key>
+                       <value>(10, 10)</value>
+               </param>
+               <param>
+                       <key>_rotation</key>
+                       <value>0</value>
+               </param>
+       </block>
+       <block>
+               <key>variable</key>
+               <param>
+                       <key>id</key>
+                       <value>samp_rate</value>
+               </param>
+               <param>
+                       <key>value</key>
+                       <value>32000</value>
+               </param>
+               <param>
+                       <key>_coordinate</key>
+                       <value>(10, 170)</value>
+               </param>
+               <param>
+                       <key>_rotation</key>
+                       <value>0</value>
+               </param>
+       </block>
+</flow_graph>

Deleted: gnuradio/trunk/grc/data/platforms/python/default_flow_graph.grc.xml

Modified: gnuradio/trunk/grc/src/gui/ParamsDialog.py
===================================================================
--- gnuradio/trunk/grc/src/gui/ParamsDialog.py  2008-09-17 02:40:35 UTC (rev 
9594)
+++ gnuradio/trunk/grc/src/gui/ParamsDialog.py  2008-09-17 03:11:44 UTC (rev 
9595)
@@ -86,7 +86,7 @@
                """
                if self.block.is_valid(): self._error_messages_box.hide()
                else: self._error_messages_box.show()
-               messages = '\n'.join(self.block.get_error_messages())
+               messages = '\n\n'.join(self.block.get_error_messages())
                self._error_messages_text_display.set_text(messages)
 
        def _handle_key_press(self, widget, event):

Modified: gnuradio/trunk/grc/src/platforms/base/Block.py
===================================================================
--- gnuradio/trunk/grc/src/platforms/base/Block.py      2008-09-17 02:40:35 UTC 
(rev 9594)
+++ gnuradio/trunk/grc/src/platforms/base/Block.py      2008-09-17 03:11:44 UTC 
(rev 9595)
@@ -146,11 +146,11 @@
                All checks must evaluate to true.
                """
                if not self.get_enabled(): return
-               for c in self.get_params() + self.get_sinks() + 
self.get_sources():
+               for c in self.get_params() + self.get_sinks() + 
self.get_sources() + self.get_connections():
                        try: assert(c.is_valid())
                        except AssertionError:
                                for msg in c.get_error_messages():
-                                       self._add_error_message('%s: %s'%(c, 
msg))
+                                       self._add_error_message('>>> 
%s:\n\t%s'%(c, msg))
 
        def __str__(self): return 'Block - %s - %s(%s)'%(self.get_id(), 
self.get_name(), self.get_key())
 

Modified: gnuradio/trunk/grc/src/platforms/base/Connection.py
===================================================================
--- gnuradio/trunk/grc/src/platforms/base/Connection.py 2008-09-17 02:40:35 UTC 
(rev 9594)
+++ gnuradio/trunk/grc/src/platforms/base/Connection.py 2008-09-17 03:11:44 UTC 
(rev 9595)
@@ -44,7 +44,13 @@
                self._source = source
                self._sink = sink
 
-       def __str__(self): return 'Connection (%s -> %s)'%(self.get_source(), 
self.get_sink())
+       def __str__(self):
+               return 'Connection (\n\t%s\n\t\t%s\n\t%s\n\t\t%s\n)'%(
+                       self.get_source().get_parent(),
+                       self.get_source(),
+                       self.get_sink().get_parent(),
+                       self.get_sink(),
+               )
 
        def is_connection(self): return True
 

Modified: gnuradio/trunk/grc/src/platforms/base/Port.py
===================================================================
--- gnuradio/trunk/grc/src/platforms/base/Port.py       2008-09-17 02:40:35 UTC 
(rev 9594)
+++ gnuradio/trunk/grc/src/platforms/base/Port.py       2008-09-17 03:11:44 UTC 
(rev 9595)
@@ -48,7 +48,7 @@
                The port must be non-empty and type must a possible type.
                """
                try: assert(not self.is_empty())
-               except AssertionError: self._add_error_message('is empty.')
+               except AssertionError: self._add_error_message('Port is not 
connected.')
                try: assert(self.get_type() in self.TYPES)
                except AssertionError: self._add_error_message('Type "%s" is 
not a possible type.'%self.get_type())
 

Modified: gnuradio/trunk/grc/src/platforms/python/Constants.py.in
===================================================================
--- gnuradio/trunk/grc/src/platforms/python/Constants.py.in     2008-09-17 
02:40:35 UTC (rev 9594)
+++ gnuradio/trunk/grc/src/platforms/python/Constants.py.in     2008-09-17 
03:11:44 UTC (rev 9595)
@@ -37,7 +37,7 @@
 FLOW_GRAPH_TEMPLATE = os.path.join(DATA_DIR, 'flow_graph.tmpl')
 BLOCK_DTD = os.path.join(DATA_DIR, 'block.dtd')
 BLOCK_TREE = os.path.join(DATA_DIR, 'block_tree.xml')
-DEFAULT_FLOW_GRAPH = os.path.join(DATA_DIR, 'default_flow_graph.grc.xml')
+DEFAULT_FLOW_GRAPH = os.path.join(DATA_DIR, 'default_flow_graph.grc')
 
 #coloring
 COMPLEX_COLOR_SPEC = '#3399FF'