Changeset 20

Timestamp:

10/17/08 14:34:26 (4 years ago)

Author:

jschild

Message:

-updated WacomTablet?
--Matrix outputs a transform matrix of pen position
--Value12 now gives the AspectRation? Width/Height? of the tablet to recalculate normalized values
--Button24 now is true if any tool is within proximity (pen, airbrush, mouse,...)
--some bug fixes
--addition bool property toggle-reset, as the intuos3 resets to the wrong values which get messed up during normalization

Location:

trunk

Files:

• avango-daemon/include/avango/daemon/HIDInput.h (modified) (2 diffs)
• avango-daemon/include/avango/daemon/WacomTablet.h (modified) (3 diffs)
• avango-daemon/python/__init__.py (modified) (1 diff)
• avango-daemon/python/_daemon.cpp (modified) (2 diffs)
• avango-daemon/src/avango/daemon/HIDInput.cpp (modified) (3 diffs)
• avango-daemon/src/avango/daemon/WacomTablet.cpp (modified) (7 diffs)
• avango-menu/python/avango/menu/layout/_PushButtonLayouter.py (modified) (1 diff)
• examples/daemon/wacom-app.py (modified) (7 diffs)
• examples/daemon/wacom-daemon.py (modified) (3 diffs)

trunk/avango-daemon/include/avango/daemon/HIDInput.h

@@ -221 +221 @@
       virtual float normalizeAbsValue(const struct input_event& event) const;
 
+      bool stationLooksForEvent(int station_index, const struct input_event& event) const;
+
+      void applyEventToStation(int station_index, const struct input_event& event);
+
+      void clearRelativeStationValues();
+
+      template <class ValueType> ValueType scanForOptionalFeature(const std::string& feature, ValueType default_value);
+
+
     private:
 
-      bool stationLooksForEvent(int station_index, const struct input_event& event) const;
+//      bool stationLooksForEvent(int station_index, const struct input_event& event) const;
       const HIDMapping&  getStationHIDMapping(int station_index) const;
       const HIDLEDMapping&  getStationHIDLEDMapping(int station_index) const;
@@ -231 +240 @@
 
       template <class ValueType> ValueType scanForRequiredFeature(const std::string& feature);
-      template <class ValueType> ValueType scanForOptionalFeature(const std::string& feature, ValueType default_value);
-
-      void applyEventToStation(int station_index, const struct input_event& event);
-      void clearRelativeStationValues();
+
+//      void applyEventToStation(int station_index, const struct input_event& event);
+//      void clearRelativeStationValues();
 
     };

trunk/avango-daemon/include/avango/daemon/WacomTablet.h

@@ -33 +33 @@
 
 #include <avango/daemon/HIDInput.h>
+#include <osg/Matrixf>
+#include <avango/osg/Object.h>
+#include <avango/osg/Fields.h>
+#include <avango/osg/MatrixTransform.h>
 
 namespace av
@@ -52 +56 @@
       WacomTablet();
 
+
     protected:
 
@@ -65 +70 @@
 
       /**
+       * overrides readloop() from av::daemon::HIDInput, used to create a transformation Matrix
+       * from pen input
+       */
+      void readLoop();
+
+      /**
        * overrides normalizeAbsValue from HIDInput, used to perform custom normalization
        * of some values
        */
       float normalizeAbsValue(const input_event& event) const;
+
+      /**
+       * Retrieves aspect ratio of tablet from maximum absolute values, Ratio is written in Value12
+       */
+      void retrieveAspectRatio();
+
+      /**
+       * overrides HIDInput::parse_features() to add toggle_reset property
+       */
+      int parse_features();
+
+      bool mToggleReset;
     };
   }

trunk/avango-daemon/python/__init__.py

@@ -159 +159 @@
     mydev.value[0] = \'EV_REL::REL_X\'. All appearing value und button events of a tablet
     are already set up in the constructor of this class. Optional properties: value, button,
-    led, norm_abs, accum_rel_events, reset_rel_values_cycle, timeout."""
+    led, norm_abs, accum_rel_events, reset_rel_values_cycle, timeout, toggle_reset."""
     def __init__(self):
         super(WacomTablet, self).__init__()

trunk/avango-daemon/python/_daemon.cpp

@@ -74 +74 @@
   std::string getTimeoutFeature(av::daemon::Device* self) { return self->queryFeature("timeout"); }
   std::string getPortFeature(av::daemon::Device* self) { return self->queryFeature("port"); }
+  std::string getToggleResetFeature(av::daemon::Device* self) { return self->queryFeature("toggle-reset"); }
 
   // wrapper for specialized configureFeature calls, required by .add_property
+  std::string parseBoolString(std::string value)
+  {
+    if ((value == "true")||(value=="TRUE")||(value=="True")) return "1";
+    if ((value == "false")||(value=="FALSE")||(value=="False")) return "0";
+    return value;
+  }
   void setTTYFeature(av::daemon::Device* self, std::string value) { self->configureFeature("tty", value); }
-  void setNormAbsFeature(av::daemon::Device* self, std::string value) { self->configureFeature("norm-abs", value); }
-  void setAccumRelFeature(av::daemon::Device* self, std::string value) { self->configureFeature("accum-rel-events", value); }
+  void setNormAbsFeature(av::daemon::Device* self, std::string value) { self->configureFeature("norm-abs",parseBoolString(value)); }
+  //void setNormAbsFeature(av::daemon::Device* self, bool value) { (value)?self->configureFeature("norm-abs", "1"):self->configureFeature("norm-abs", "0"); }
+  void setAccumRelFeature(av::daemon::Device* self, std::string value) { self->configureFeature("accum-rel-events", parseBoolString(value)); }
   void setResetRelCycleFeature(av::daemon::Device* self, std::string value) { self->configureFeature("reset-rel-values-cycle", value); }
   void setTimeoutFeature(av::daemon::Device* self, std::string value) { self->configureFeature("timeout", value); }
   void setPortFeature(av::daemon::Device* self, std::string value) { self->configureFeature("port", value); }
+  void setToggleResetFeature(av::daemon::Device* self, std::string value) { self->configureFeature("toggle-reset", parseBoolString(value)); }
 
   // set LED states
@@ -175 +184 @@
   class_<av::daemon::WacomTablet, av::Link<av::daemon::WacomTablet>, bases<av::daemon::HIDInput>, boost::noncopyable >("_WacomTabletHelper",
     "A helper class that provides some basic properties and functions inherited from HIDInput.")
+    .add_property("toggle_reset", &::getToggleResetFeature, &::setToggleResetFeature)
     ;
 

trunk/avango-daemon/src/avango/daemon/HIDInput.cpp

@@ -27 +27 @@
 #include <cstring>
 #include <fcntl.h>
+#include <iostream>
 #include <sstream>
 #include <iomanip>
@@ -269 +270 @@
 }
 
-int
+/*virtual*/ int
 av::daemon::HIDInput::parse_features()
 {
@@ -285 +286 @@
   mResetRelCycle = scanForOptionalFeature<int>("reset-rel-values-cycle", 0);
   mTimeout = scanForOptionalFeature<unsigned int>("timeout", 200);
-
+  std::cout << "Parse Features, mNormAbs = " << mNormAbs << std::endl;
   return 1;
 }

trunk/avango-daemon/src/avango/daemon/WacomTablet.cpp

@@ -37 +37 @@
 
 av::daemon::WacomTablet::WacomTablet()
-{}
+{
+}
 
 av::daemon::WacomTablet::~WacomTablet()
@@ -69 +70 @@
   configureFeature(station + "10", "EV_ABS::ABS_TILT_Y");  // Pen tilt y axis
   configureFeature(station + "11", "EV_REL::REL_WHEEL");   // Relative Wheel on mouse
+  configureFeature(station + "12", "AspectRatio");         // Ratio of Width/Height of Tablet
 
   //auto-configure buttons
@@ -96 +98 @@
   configureFeature(station + "22", "EV_KEY::BTN_STYLUS");        // 1st side button on pen/airbrush
   configureFeature(station + "23", "EV_KEY::BTN_STYLUS2");       // 2nd side button on pen
+  configureFeature(station + "24", "Proximity");                 // true if anything in proximity
+  configureFeature(station + "25", "ToggleReset");               // should be true for Intuos3
+}
+
+void
+av::daemon::WacomTablet::retrieveAspectRatio()
+{
+  HIDInput::AbsInfoMap::iterator it (mAbsInfoMap.find(0));
+  const float x_max = (*it).second.maximum;
+
+  it = (mAbsInfoMap.find(1));
+  const float y_max = (*it).second.maximum;
+
+  NumStationMap::iterator ns = mStations.begin();
+
+  if ((0 < x_max)&&(0 < y_max))
+    (*ns).second->setValue(12,x_max/y_max);
+  else
+    (*ns).second->setValue(12,1);
+}
+
+/* virtual */ void
+av::daemon::WacomTablet::readLoop()
+{
+  float x,y;
+  ::osg::Matrixf matrix;
+
+  if (!parse_features())
+  {
+    logger.warn() << "startDevice: required features missing, not started.";
+    return;
+  }
+
+  NumStationMap::iterator ns;
+  struct input_event      event;
+  int                     reset_wait_counter(0);
+
+  for (;;)
+  {
+
+    while (!isOpen())
+    {
+      if (open())
+      {
+        retrieve_abs_info();
+        retrieveAspectRatio();
+        stopLEDs();
+        startLEDs();
+      }
+      else
+      {
+        logger.warn() << "readLoop: HID device is not open.";
+        // sleep 5 seconds
+        struct timeval timeout = { 5, 0 };
+        while (0 != ::select(0, 0, 0, 0, &timeout)) {}
+      }
+    }
+
+    updateLEDs();
+    if (readEvent(&event)) {
+      reset_wait_counter = 0;
+      logger.trace() << "readLoop: time " << event.time.tv_sec << "." << event.time.tv_usec
+                     << ", type " << event.type << ", code " << event.code << ", value " <<  event.value;
+
+      for (ns = mStations.begin(); ns != mStations.end(); ++ns)
+      {
+        int station_index = ns->first;
+        if (!stationLooksForEvent(station_index, event)) {
+          continue;
+        }
+        applyEventToStation(station_index, event);
+      }
+
+      //set Transform Matrix
+      ns = mStations.begin();
+      x = (*ns).second->getValue(0);
+      y = (*ns).second->getValue(1);
+      matrix.makeTranslate(::osg::Vec3f(x,y,0.0f));
+      (*ns).second->setMatrix(matrix);
+
+      //set Proximity Value and reset some buttons which else get wrong values with normalization
+      for (int code=13; code<21; ++code)
+      {
+        if (0 == (*ns).second->getButton(code))
+        {
+          if (code == 20)
+          {
+            (*ns).second->setButton(24,0);
+            if (mToggleReset)
+            {
+              (*ns).second->setValue(0,0);
+              (*ns).second->setValue(1,0);
+              (*ns).second->setValue(6,0);
+              (*ns).second->setValue(8,0);
+              (*ns).second->setValue(9,0);
+              (*ns).second->setValue(10,0);
+            }
+          }
+        }
+        else
+        {
+          (*ns).second->setButton(24,1);
+          code = 21;
+        }
+      }
+    }
+    else
+    { // timeout
+      ++reset_wait_counter;
+      // reset all EV_REL mappings to 0.0 if not accumulating relative values
+      if (!mAccumRel && (mResetRelCycle >= 0) && (reset_wait_counter >= mResetRelCycle))
+      {
+        reset_wait_counter = 0;
+        clearRelativeStationValues();
+        logger.trace() << "readLoop: resetting all EV_REL mappings.";
+      }
+    }
+  }
+
 }
 
@@ -103 +224 @@
   float normalized_value = 0.0f;
   HIDInput::AbsInfoMap::const_iterator iter (mAbsInfoMap.find(event.code));
+  const input_absinfo& info = (*iter).second;
+  NumStationMap::const_iterator ns = mStations.begin();
 
   switch (event.code) {
@@ -113 +236 @@
     if (iter != mAbsInfoMap.end())
     {
-      const input_absinfo& info = (*iter).second;
+      //info = (*iter).second;
       normalized_value = (float)event.value / (float)(info.maximum - info.minimum);
     }
@@ -121 +244 @@
     else normalized_value = 0.0f;
     break;
+  case ABS_X:
+  case ABS_WHEEL:
+  case ABS_TILT_X:
+    normalized_value = 2.0f* ((float)event.value -(float)info.minimum) / (float)(info.maximum + info.minimum ) - 1.0f;
+    break;
+  case ABS_Y:
+  case ABS_TILT_Y:
+    normalized_value = -2.0f* ((float)event.value -(float)info.minimum) / (float)(info.maximum + info.minimum ) + 1.0f;
+    break;
+  case ABS_MISC:
+    std::cout << event.value << std::endl;
+    if (iter != mAbsInfoMap.end())
+    {
+       //info = (*iter).second;
+       std::cout << info.maximum << " <-max min-> " << info.minimum << std::endl;
+    }
+    break;
   default:
     normalized_value = HIDInput::normalizeAbsValue(event);
@@ -127 +267 @@
   return normalized_value;
 }
+
+/*virtual*/ int
+av::daemon::WacomTablet::parse_features()
+{
+  if (HIDInput::parse_features())
+    mToggleReset = HIDInput::scanForOptionalFeature<bool>("toggle-reset", false);
+  std::cout << "Parse Features, mToggleReset = " << mToggleReset << std::endl;
+  return 1;
+}

trunk/avango-menu/python/avango/menu/layout/_PushButtonLayouter.py

@@ -98 +98 @@
         self._last_select = self.Select.value
 
-
     def push_button_enable_changed(self):
         self.super().layout_base_enable_changed()

trunk/examples/daemon/wacom-app.py

@@ -77 +77 @@
     PenTiltY = avango.SFFloat()
     UnknownRelWheel = avango.SFFloat()
+    Ratio = avango.SFFloat()
     Button0 = avango.SFBool()
     Button1 = avango.SFBool()
@@ -101 +102 @@
     ButtonStylus = avango.SFBool()
     ButtonStylus2 = avango.SFBool()
+    Proximity = avango.SFBool()
+    Matrix = avango.osg.SFMatrix()
 
     def evaluate(self):
@@ -119 +122 @@
         print "PenTiltY: " + str(self.PenTiltY.value)
         print "UnknownRelWheel: " + str(self.UnknownRelWheel.value)
+        print "Ratio: " + str(self.Ratio.value)
         print "---Buttons-------------------------------------"
         print "Button0: " + str(self.Button0.value)
@@ -144 +148 @@
         print "ButtonStylus: " + str(self.ButtonStylus.value)
         print "ButtonStylus2: " + str(self.ButtonStylus2.value)
+        print "Proximity: " + str(self.Proximity.value)
+        print "Matrix: " + str(self.Matrix.value)
 
         if (self.ButtonAirbrush.value):
@@ -152 +158 @@
         transform.Matrix.value = transform.Matrix.value*\
             avango.osg.make_rot_mat(1.047*self.PenTiltX.value, avango.osg.Vec3(0,1,0))*\
-            avango.osg.make_rot_mat(1.047*self.PenTiltY.value,avango.osg.Vec3(1,0,0))*\
-            avango.osg.make_trans_mat(1*self.PenX.value,-1*self.PenY.value,-10)
+            avango.osg.make_rot_mat(-1.047*self.PenTiltY.value,avango.osg.Vec3(1,0,0))*\
+            avango.osg.make_trans_mat(1*self.PenX.value,self.PenY.value,-10)
         sphereTrans2.Matrix.value = avango.osg.make_trans_mat(0,0,0.25 - (0.175*self.PenPressure.value))
         sphereTrans3.Matrix.value = avango.osg.make_trans_mat(0,0,0.4 - (0.25*self.PenPressure.value))
@@ -184 +190 @@
 tablet.PenTiltY.connect_from(sensor.Value10)
 tablet.UnknownRelWheel.connect_from(sensor.Value11)
+tablet.Ratio.connect_from(sensor.Value12)
 tablet.Button0.connect_from(sensor.Button0)
 tablet.Button1.connect_from(sensor.Button1)
@@ -208 +215 @@
 tablet.ButtonStylus.connect_from(sensor.Button22)
 tablet.ButtonStylus2.connect_from(sensor.Button23)
+tablet.Proximity.connect_from(sensor.Button24)
+tablet.Matrix.connect_from(sensor.Matrix)
 
 # set up viewing

trunk/examples/daemon/wacom-daemon.py

@@ -39 +39 @@
 
 # configure a tablet device
-wacom = avango.daemon.WacomIntuos3()
+wacom = avango.daemon.WacomTablet()
 wacom.station = station
 wacom.device = '/dev/input/wacom'
-#wacom.norm_abs = 'False'
+wacom.norm_abs = 'True'
+wacom.toggle_reset = 'False'
 
 #input events are configures automatically in WacomIntuos3
@@ -59 +60 @@
 #wacom.values[10] = "EV_ABS::ABS_TILT_Y" #abs pen tilt Y axis
 #wacom.values[11] = "EV_REL::REL_WHEEL"
+#wacom.values[12] = "AspectRatio" #Width/Height of tablet CUSTOM
 
 # map incoming key events to station buttons
@@ -85 +87 @@
 #wacom.buttons[22] = "EV_KEY::BTN_STYLUS"
 #wacom.buttons[23] = "EV_KEY::BTN_STYLUS2"
+#wacom.buttons[24] = "Proximity, True if anything active on tablet, CUSTOM