Merge pull request #1 from szkszk95/master

修改了一些w和h

Common.py

@@ -25,6 +25,6 @@ def meterFinderByTemplate(image, template):
         topLeft = minLoc
     else:
         topLeft = maxLoc
-    bottomRight = (topLeft[0] + w, topLeft[1] + h)
+    bottomRight = (topLeft[0] + h, topLeft[1] + w)
 
     return image[topLeft[1]:bottomRight[1], topLeft[0]:bottomRight[0]]

Interface.py

@@ -1,6 +1,8 @@
 import cv2
 import json
 from SF6 import SF6
+from youwen import youwen
+
 
 def meterReaderCallBack(image, info):
     """call back function"""
@@ -44,6 +46,8 @@ def getInfo(ID):
     # string to pointer
     if info["type"] == "SF6":
         info["type"] = SF6
+    elif info["type"] == "youwen":
+        info["type"] = youwen
     info["template"] = cv2.imread("template/" + ID + ".jpg")
     return info
 
@@ -64,13 +68,13 @@ def meterReader(image, meterIDs):
         y = info["ROI"]["y"]
         w = info["ROI"]["w"]
         h = info["ROI"]["h"]
-        ROI = image[x:x + h, y:y + w]
+        ROI = image[y:y + h, x:x + w]
         # call back
         results[ID] = meterReaderCallBack(ROI, info)
     return results
 
 
-image = cv2.imread("image/2018-11-20-16-22-02.jpg")
-
-print(meterReader(image, ["1_1"]))
+# image = cv2.imread("image/2018-11-20-16-22-02.jpg")
+image = cv2.imread("image/youwen_1.jpg")
+print(meterReader(image, ["youwen_1"]))
 

SF6.py

@@ -13,4 +13,4 @@ def SF6(image, info):
     cv2.imshow("meter", meter)
     cv2.waitKey(0)
 
-    return 1
+    return 1

config/youwen_1.json

@@ -0,0 +1,27 @@
+{
+      "distance": 10.0,
+      "horizontal": 10.0,
+      "vertical": 20.0,
+      "name": "youwen_1",
+      "type": "youwen",
+      "ROI": {
+          "x": 450,
+          "y":300,
+          "w": 800,
+          "h": 600
+      },
+      "startPoint": {
+          "x": 27,
+          "y": 70
+      },
+      "endPoint": {
+          "x": 62,
+          "y": 68
+      },
+      "centerPoint": {
+          "x": 43,
+          "y": 55
+      },
+      "startValue": 0.0,
+      "totalValue": 100.0
+}

youwen.py

@@ -0,0 +1,20 @@
+from Common import *
+
+
+def youwen(image, info):
+    """
+    :param image: ROI image
+    :param info: information for this meter
+    :return: value
+    """
+    # your method
+    print("YouWen Reader called!!!")
+    # template match
+    print(info["template"])
+    cv2.imshow("image", image)
+    cv2.waitKey(0)
+    meter = meterFinderByTemplate(image, info["template"])
+    cv2.imshow("meter", meter)
+    cv2.waitKey(0)
+
+    return 1