commit of extraogenous file

tomesparon · Sep 4, 2017 · 51b75e0 · 51b75e0
1 parent fb24d9c
commit 51b75e0
Show file tree

Hide file tree

Showing 19 changed files with 13 additions and 3 deletions.
diff --git a/Retina_CPU_Code/mainCamDemo.py b/Retina_CPU_Code/mainCamDemo.py
@@ -53,8 +53,6 @@
 if useVideo:
     camid = os.getcwd() + os.sep + 'testvideo'+ os.sep +'vtest.webm'
     cap = cv2.VideoCapture(camid)
-    camid = os.getcwd() + os.sep + 'testvideo'+ os.sep +'vtest.webm'
-    cap = cv2.VideoCapture(camid)
 else:
     camid = 1
     cap = cv2.VideoCapture(camid)

diff --git a/...timage/otherimages/color-blind-test3.jpeg → ...CPU_Code/testimage/color-blind-test3.jpeg b/...timage/otherimages/color-blind-test3.jpeg → ...CPU_Code/testimage/color-blind-test3.jpeg
diff --git a/Retina_CPU_Code/testimage/otherimages/768px-Pixel_geometry_01_Pengo.jpg b/Retina_CPU_Code/testimage/otherimages/768px-Pixel_geometry_01_Pengo.jpg
diff --git a/Retina_CPU_Code/testimage/otherimages/airballoon.jpg b/Retina_CPU_Code/testimage/otherimages/airballoon.jpg
diff --git a/Retina_CPU_Code/testimage/baboon.jpg → ...CPU_Code/testimage/otherimages/baboon.jpg b/Retina_CPU_Code/testimage/baboon.jpg → ...CPU_Code/testimage/otherimages/baboon.jpg
diff --git a/Retina_CPU_Code/testimage/otherimages/balloons-717047_960_720.jpg b/Retina_CPU_Code/testimage/otherimages/balloons-717047_960_720.jpg
diff --git a/Retina_CPU_Code/testimage/otherimages/blue16.jpg b/Retina_CPU_Code/testimage/otherimages/blue16.jpg
diff --git a/Retina_CPU_Code/testimage/otherimages/blueyellow.PNG b/Retina_CPU_Code/testimage/otherimages/blueyellow.PNG
diff --git a/Retina_CPU_Code/testimage/otherimages/bluyellow.PNG b/Retina_CPU_Code/testimage/otherimages/bluyellow.PNG
diff --git a/Retina_CPU_Code/testimage/otherimages/dots.PNG b/Retina_CPU_Code/testimage/otherimages/dots.PNG
diff --git a/Retina_CPU_Code/testimage/otherimages/greendots.PNG b/Retina_CPU_Code/testimage/otherimages/greendots.PNG
diff --git a/Retina_CPU_Code/testimage/otherimages/greendots2.png b/Retina_CPU_Code/testimage/otherimages/greendots2.png
diff --git a/Retina_CPU_Code/testimage/otherimages/rg.png b/Retina_CPU_Code/testimage/otherimages/rg.png
diff --git a/Retina_CPU_Code/testimage/otherimages/strippps.PNG b/Retina_CPU_Code/testimage/otherimages/strippps.PNG
diff --git a/Retina_CPU_Code/testimage/otherimages/stripr.PNG b/Retina_CPU_Code/testimage/otherimages/stripr.PNG
diff --git a/Retina_CPU_Code/testvideo/vtest.webm b/Retina_CPU_Code/testvideo/vtest.webm
diff --git a/Retina_CUDA_Code/Tests/mainCamDemo.py b/Retina_CUDA_Code/Tests/mainCamDemo.py
@@ -55,7 +55,7 @@
 
 showInverse = True
 showCortex = True
-useVideo = True
+useVideo = False
 print "USER KEYBOARD CONTROLS"
 print " + to increase retina size\n - to decrease retina size"
 print "esc - exit\ni - Toggle inverted retinal images\nu - Toggle cortical images"

diff --git a/Retina_CUDA_Code/Tests/testvideo/vtest2.webm b/Retina_CUDA_Code/Tests/testvideo/vtest2.webm
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,12 @@
+matplotlib==1.5.0rc3
+numpy==1.11.3+mkl
+numpydoc==0.5
+opencv-python==3.1.0
+PyQt4==4.11.4
+PyQtdesignerplugins==1.1
+pyqtgraph==0.9.10
+PyQwt==5.2.1
+scikit-image==0.11.3
+scikit-learn==0.16.1
+scilab2py==0.6
+scipy==0.16.1