From 0e88f66747dc622d0712ccb490cd8e7c16b13bb7 Mon Sep 17 00:00:00 2001
From: manojgudi
Date: Sun, 29 Dec 2013 01:48:20 +0530
Subject: Solved incorrect import issues in grc, changed __init__ of gr-sbhs

---
 gr-sbhs/grc/sbhs_controller.xml | 2 +-
 gr-sbhs/grc/sbhs_plant.xml      | 2 +-
 gr-sbhs/python/__init__.py      | 4 ----
 gr-sbhs/python/gr_sbhs.py       | 5 +++++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/gr-sbhs/grc/sbhs_controller.xml b/gr-sbhs/grc/sbhs_controller.xml
index a8729e9a0..369e5b450 100644
--- a/gr-sbhs/grc/sbhs_controller.xml
+++ b/gr-sbhs/grc/sbhs_controller.xml
@@ -10,7 +10,7 @@
     <key>sbhs_controller</key>
     <category>controller</category>
 
-    <import>import gr_controller</import>
+    <import>import gnuradio.sbhs.gr_controller as gr_controller</import>
     <make>gr_controller.sbhs_controller()
 self.$(id).set_parameters($P, $I, $d, $a, $b, $window)
     </make>
diff --git a/gr-sbhs/grc/sbhs_plant.xml b/gr-sbhs/grc/sbhs_plant.xml
index f6e9c34c1..428514c71 100644
--- a/gr-sbhs/grc/sbhs_plant.xml
+++ b/gr-sbhs/grc/sbhs_plant.xml
@@ -10,7 +10,7 @@
     <key>gr_sbhs</key>
     <category>sbhs</category>
 
-    <import>import gr_sbhs</import>
+    <import>import gnuradio.sbhs.gr_sbhs as gr_sbhs</import>
     <make>gr_sbhs.gr_sbhs()
 self.$(id).set_parameters($window)
     </make>
diff --git a/gr-sbhs/python/__init__.py b/gr-sbhs/python/__init__.py
index 7b719281c..b9829df26 100644
--- a/gr-sbhs/python/__init__.py
+++ b/gr-sbhs/python/__init__.py
@@ -43,10 +43,6 @@ if _RTLD_GLOBAL != 0:
 # import any pure python here
 # Dummy File for future use
 
-from scan_machines import *
-print "Scanning Machines"
-scan_machines()
-
 # ----------------------------------------------------------------
 # Tail of workaround
 if _RTLD_GLOBAL != 0:
diff --git a/gr-sbhs/python/gr_sbhs.py b/gr-sbhs/python/gr_sbhs.py
index 28a8dee2d..a3070962e 100644
--- a/gr-sbhs/python/gr_sbhs.py
+++ b/gr-sbhs/python/gr_sbhs.py
@@ -8,11 +8,16 @@ from scan_machines import *
 class gr_sbhs(gras.Block):
 
 	def __init__(self):
+		
 		gras.Block.__init__(self,
 			name="gr_sbhs",
 			in_sig=[numpy.float32, numpy.float32],
 			out_sig=[numpy.float32])	
 		
+		from scan_machines import *
+		print "Scanning Machines"
+		scan_machines()
+
 		# SBHS init
 		self.new_device = Sbhs()
 		self.new_device.connect(1)
-- 
cgit