From 235dd07c5995cfdf3d11e075ade1f93236057b4b Mon Sep 17 00:00:00 2001
From: gregw <>
Date: Mon, 25 Feb 2002 19:25:44 +0000
Subject: [PATCH] *** empty log message ***

---
 .../src/directdevices/DirectDeviceManager.py  | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/direct/src/directdevices/DirectDeviceManager.py b/direct/src/directdevices/DirectDeviceManager.py
index db0f710c92..7b387347e3 100644
--- a/direct/src/directdevices/DirectDeviceManager.py
+++ b/direct/src/directdevices/DirectDeviceManager.py
@@ -7,10 +7,10 @@ ANALOG_MIN = -0.95
 ANALOG_MAX = 0.95
 ANALOG_DEADBAND = 0.125
 
-try:
-    myBase = base
-except:
-    myBase = simbase
+#try:
+#    myBase = base
+#except:
+#    myBase = simbase
 
 class DirectDeviceManager(VrpnClient, DirectObject):
     def __init__(self, server = None):
@@ -90,12 +90,31 @@ class DirectAnalogs(AnalogNode, DirectObject):
         AnalogNode.__init__(self, vrpnClient, device)
         # Attach node to data graph
         self.nodePath = myBase.dataRoot.attachNewNode(self)
-        # See if any of the parameters are dconfig'd
-        self.analogDeadband = myBase.config.GetFloat('vrpn-analog-deadband',
-                                                     ANALOG_DEADBAND)
-        self.analogMin = myBase.config.GetFloat('vrpn-analog-min', ANALOG_MIN)
-        self.analogMax = myBase.config.GetFloat('vrpn-analog-max', ANALOG_MAX)
+        # See if any of the general analog parameters are dconfig'd
+        generalAnalogDeadband = myBase.config.GetFloat('vrpn-analog-deadband',
+                                                       ANALOG_DEADBAND)
+        generalAnalogMin = myBase.config.GetFloat('vrpn-analog-min',
+                                                  ANALOG_MIN)
+        generalAnalogMax = myBase.config.GetFloat('vrpn-analog-max',
+                                                  ANALOG_MAX)
+        # See if any of the specific analogs paramaters have been dconfig'd
+        # These will override the general ones above. We just grab the analog
+        # number off the end of the name.
+        self.analogDeadband = myBase.config.GetFloat('vrpn-analog-deadband-'
+                                                     + self.name[-1:],
+                                                     generalAnalogDeadband)
+        self.analogMin = myBase.config.GetFloat('vrpn-analog-min-'
+                                                + self.name[-1:],
+                                                generalAnalogMin)
+        self.analogMax = myBase.config.GetFloat('vrpn-analog-max-'
+                                                + self.name[-1:],
+                                                generalAnalogMax)
         self.analogRange = self.analogMax - self.analogMin
+        print "Analog ", self.name[-1:], ": "
+        print "   dead = ", self.analogDeadband
+        print "    max = ", self.analogMax
+        print "    min = ", self.analogMin
+        print "  range = ", self.analogRange
     
     def __getitem__(self, index):
         if (index < 0) or (index >= self.getNumControls()):