Преглед на файлове

renamed Palm to PalmRect (namepsace+class can't have same name)

Alexander Hendrich преди 10 години
родител
ревизия
d2b7c55a2b
променени са 4 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 2 2
      bbiwarg/Detectors/Palm/Palm.cs
  2. 2 2
      bbiwarg/Detectors/Palm/PalmDetector.cs
  3. 1 1
      bbiwarg/Detectors/Touch/TouchDetector.cs
  4. 1 1
      bbiwarg/MainBBWIWARG.cs

+ 2 - 2
bbiwarg/Detectors/Palm/Palm.cs

@@ -12,12 +12,12 @@ using Emgu.CV.Structure;
 
 namespace bbiwarg.Detectors.Palm
 {
-    class Palm
+    class PalmRect
     {
         private Vector2D origin;
         private Matrix<float> transformationMatrix;
         
-        public Palm(MCvBox2D palmRect)
+        public PalmRect(MCvBox2D palmRect)
         {
             PointF[] vertices = palmRect.GetVertices();
             

+ 2 - 2
bbiwarg/Detectors/Palm/PalmDetector.cs

@@ -66,9 +66,9 @@ namespace bbiwarg.Detectors.Palm
             }
         }
 
-        public Palm getPalm()
+        public PalmRect getPalm()
         {
-            return new Palm(palmRect);
+            return new PalmRect(palmRect);
         }
 
         private List<Finger> getFingersWithoutThumb(FingerDetector fingerDetector)

+ 1 - 1
bbiwarg/Detectors/Touch/TouchDetector.cs

@@ -20,7 +20,7 @@ namespace bbiwarg.Detectors.Touch
         private List<Finger> fingers;
         private List<TouchEvent> touchEvents;
 
-        public TouchDetector(List<Finger> fingers, DepthImage depthImage, TouchImage touchImage, Palm.Palm palm) {
+        public TouchDetector(List<Finger> fingers, DepthImage depthImage, TouchImage touchImage, Palm.PalmRect palm) {
             this.depthImage = depthImage;
             this.touchImage = touchImage;
             this.fingers = fingers;

+ 1 - 1
bbiwarg/MainBBWIWARG.cs

@@ -12,7 +12,7 @@ namespace bbiwarg
     {
         static void Main(string[] args)
         {
-            IInputProvider inputProvider = new IisuInputProvider();//"..\\..\\videos\\touch\\4.skv");
+            IInputProvider inputProvider = new IisuInputProvider("..\\..\\videos\\touch\\4.skv");
             VideoHandle videoHandle = new VideoHandle(inputProvider);
             videoHandle.start();