Merge branch 'remote'

# Conflicts:
#	example1_basic.py
#	src/orisys/sensor.py

example1_basic.py

@@ -1,9 +1,7 @@
 import os
 os.environ["OPENCV_VIDEOIO_MSMF_ENABLE_HW_TRANSFORMS"] = "0"
 import cv2
-from orisys import Sensor
-import numpy as np
-
+import orisys
 
 def main():
     global start_time
@@ -14,7 +12,8 @@ def main():
     for i in range(15):
         box.append((410+dx, 900+dy, 620+dx, 1110+dy))
     # 打开视频
-    sensor1 = Sensor("./uv_2.mp4",isstitch=False,cuda = True,verbose = True, override=True, box=box)
+    sensor1 = orisys.Sensor("./s1.mp4",isstitch=True,cuda = True,verbose = True)
+
     # 打开摄像头
     # sensor1 = Sensor(0,isstitch=True,cuda = True,verbose = True)
 
@@ -30,7 +29,7 @@ def main():
         fps, fn, fx, fy, flow, depth = sensor1.read_info(sensor1.info.FPS, sensor1.info.FNORMAL, sensor1.info.FSHEARX, sensor1.info.FSHEARY, sensor1.info.VRAW, sensor1.info.DEPTH)
         print(fps,fn,fx,fy)
         # 显示向量场
-        arrows  = sensor1.draw_arrows(sensor1.info.VRAW, threshold=5, grid_spacing=40, arrow_scale=1.0) 
+        arrows = orisys.util.draw_arrows(sensor1.img, flow, threshold=5, grid_spacing=40, arrow_scale=1.0)
         cv2.imshow("Deformation", arrows)
 
         depth_img = cv2.applyColorMap((depth*1* 255.0).astype('uint8'), cv2.COLORMAP_HOT)
@@ -41,10 +40,11 @@ def main():
         if key & 0xFF == ord("q"):
             print("\n 停止程序")
             break
+        if key & 0xFF == ord("r"):
+            sensor1.reset()
     
     sensor1.disconnect() # 断开传感器连接
     
 
-
 if __name__ == '__main__':
     main()