[Commit-gnuradio] r9369 - in gnuradio/branches/developers/jblum/grc/grc: data/grc_gnuradio scripts

[jblum]

Author: jblum
Date: 2008-08-21 22:02:37 -0600 (Thu, 21 Aug 2008)
New Revision: 9369

Modified:
   gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/flow_graph.tmpl
   gnuradio/branches/developers/jblum/grc/grc/scripts/grc
Log:
removed package tests from source

Modified: 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/flow_graph.tmpl
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/flow_graph.tmpl    
    2008-08-21 23:51:49 UTC (rev 9368)
+++ 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/flow_graph.tmpl    
    2008-08-22 04:02:37 UTC (rev 9369)
@@ -40,21 +40,14 @@
 #set $class_name = $flow_graph.get_option('id')
 #set $param_str = ', '.join(['self'] + ['%s=%s'%(param.get_id(), 
param.get_make()) for param in $parameters])
 #if $generate_options == 'wx_gui'
-       #import os
-       #from grc.Constants import MAIN_WINDOW_PREFIX,DATA_DIR
-       ##set the icon for the wx app
-       #set $WX_APP_ICON = '"%s"'%os.path.join($DATA_DIR, 'grc-icon-32.png')
-       ##>>> platform dependency! wx under cygwin has issues with icon paths
-       #if sys.platform == 'cygwin'
-       #set $WX_APP_ICON = None
-       #end if
+       #from grc.Constants import MAIN_WINDOW_PREFIX, DATA_DIR
 class $(class_name)(grc_wxgui.top_block_gui):
 
        def __init__($param_str):
                grc_wxgui.top_block_gui.__init__(
                        self,
                        title="$MAIN_WINDOW_PREFIX - Executing: 
$flow_graph.get_option('title')",
-                       icon=$WX_APP_ICON,
+                       icon="$(os.path.join($DATA_DIR, 'grc-icon-32.png'))",
                )
 #elif $generate_options == 'no_gui'
 class $(class_name)(gr.top_block):

Modified: gnuradio/branches/developers/jblum/grc/grc/scripts/grc
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/scripts/grc      2008-08-21 
23:51:49 UTC (rev 9368)
+++ gnuradio/branches/developers/jblum/grc/grc/scripts/grc      2008-08-22 
04:02:37 UTC (rev 9369)
@@ -37,17 +37,6 @@
 """%VERSION
        parser = OptionParser(usage=usage, version=version)
        (options, args) = parser.parse_args()
-       #"test" import modules that this program will use
-       error = False
-       for module in ('pygtk', 'wx', 'numpy', 'lxml', 'gnuradio', 
'gnuradio.gr.hier_block2', 'Cheetah'):
-               try: __import__(module)
-               except ImportError: #print error
-                       error = True
-                       print '\nMissing critical module: "%s"'%module
-       if error: #exit
-               print '\nExiting!\n'
-               exit(-1)
-       #end import of modules
        from grc_gnuradio.Platform import Platform
        from grc.ActionHandler import ActionHandler
        ActionHandler(args, Platform())