[Commit-gnuradio] r6585 - in grc/trunk/src/SignalBlockDefs: . ext

[jblum]

Author: jblum
Date: 2007-10-03 17:05:37 -0600 (Wed, 03 Oct 2007)
New Revision: 6585

Removed:
   grc/trunk/src/SignalBlockDefs/ext/scopesink2.py
Modified:
   grc/trunk/src/SignalBlockDefs/GraphicalSinks.py
Log:
switched to trunk's scopesink2

Modified: grc/trunk/src/SignalBlockDefs/GraphicalSinks.py
===================================================================
--- grc/trunk/src/SignalBlockDefs/GraphicalSinks.py     2007-10-03 22:09:26 UTC 
(rev 6584)
+++ grc/trunk/src/SignalBlockDefs/GraphicalSinks.py     2007-10-03 23:05:37 UTC 
(rev 6585)
@@ -95,8 +95,7 @@
        return sb, make
        
 def ScopeSink(sb):
-       #from gnuradio.wxgui import scopesink2
-       from ext import scopesink2      
+       from gnuradio.wxgui import scopesink2
        type = Enum([
                ('Complex', (scopesink2.scope_sink_c, Complex())),
                ('Float', (scopesink2.scope_sink_f, Float())),
@@ -142,8 +141,7 @@
        return sb, make
        
 def ConstellationSink(sb):
-       #from gnuradio.wxgui import scopesink2
-       from ext import scopesink2      
+       from gnuradio.wxgui import scopesink2
        fcn = scopesink2.constellation_sink     
        sb.add_input_socket('in', Complex())
        sb.add_param('Title', String('Constellation'))

Deleted: grc/trunk/src/SignalBlockDefs/ext/scopesink2.py