Browse Source

Fixed crash when palmQuad == null.

Daniel Kauth 11 years ago
parent
commit
52d3de5937
2 changed files with 10 additions and 6 deletions
  1. 1 0
      bbiwarg/Graphics/TouchEventVisualizer.cs
  2. 9 6
      bbiwarg/VideoHandle.cs

+ 1 - 0
bbiwarg/Graphics/TouchEventVisualizer.cs

@@ -19,6 +19,7 @@ namespace bbiwarg.Graphics
 
         public TouchEventVisualizer(int width, int height)
         {
+            OutputImage = new Graphics.OutputImage(width, height);
             touchPositions = new List<List<Vector2D>>();
             kalmanFilters = new List<Kalman2DPositionFilter>();
             this.width = width;

+ 9 - 6
bbiwarg/VideoHandle.cs

@@ -172,14 +172,17 @@ namespace bbiwarg
                 touchEventVisualizer = new TouchEventVisualizer(Width, Height);
             if (getCurrentMovieFrame() == 0)
                 touchEventVisualizer.Reset();
-            foreach (PalmTouchEvent e in palmTouchDetector.PalmTouchEvents)
+            if (palmTouchDetector != null)
             {
-                if (sourceIsMovie())
-                    touchEventVisualizer.addPalmTouchEvent(e, getCurrentMovieFrame());
-                else
-                    touchEventVisualizer.addPalmTouchEvent(e, videoFrame);
+                foreach (PalmTouchEvent e in palmTouchDetector.PalmTouchEvents)
+                {
+                    if (sourceIsMovie())
+                        touchEventVisualizer.addPalmTouchEvent(e, getCurrentMovieFrame());
+                    else
+                        touchEventVisualizer.addPalmTouchEvent(e, videoFrame);
+                }
+                touchEventVisualizer.updateImage();
             }
-            touchEventVisualizer.updateImage();
 
             // add borders
             edgeFingerOutputImage.drawRectangle(0, 0, Width - 1, Height - 1, 255, 255, 255);