فهرست منبع

1、判断是否在节点上,当前节点已移动到value节点上时,获取value_for_ocr时,调用self.__optionExcel.getOptionValueText时必须传递完整参数:optionName、optionValue.
2、修复getOptionValueText函数,当前value=""时永远只获取到最后一个for_ocr的BUG.

scbc.sat2 5 سال پیش
والد
کامیت
12466c9dc7
3فایلهای تغییر یافته به همراه20 افزوده شده و 5 حذف شده
  1. 4 1
      ssat_sdk/MenuTree3/OptionAction.py
  2. 4 3
      ssat_sdk/MenuTree3/OptionExcel.py
  3. 12 1
      ssat_sdk/MenuTree3/logic.py

+ 4 - 1
ssat_sdk/MenuTree3/OptionAction.py

@@ -195,7 +195,10 @@ class COptionAction(CBaseLog):
         ocrThreshold = self.__optionConfig.getThresholdDict(firstParent)  # 注意,此处使用firstParent;
         # 获取当前option的ocr值/value name下所有ocr值;
         if isValueSheet:
-            optionTextList = self.__optionExcel.getOptionValueText(curOption)
+            if curOption.lower() == self.__optionName.lower():
+                optionTextList = self.__optionExcel.getOptionValueText(curOption, self.__optionValue)
+            else:
+                optionTextList = self.__optionExcel.getOptionValueText(curOption)
         else:
             optionTextList = self.__optionExcel.getOptionText(curOption)
         # 获取option下所有兄弟项的ocr:option字典内容;

+ 4 - 3
ssat_sdk/MenuTree3/OptionExcel.py

@@ -557,7 +557,7 @@ class COptionExcel(CBaseLog):
             for valueDict in valueDictList:
                 if value == "":
                     value_for_ocr = valueDict["value_for_ocr"]
-                    valueTextList = value_for_ocr.split(';')
+                    valueTextList.append(value_for_ocr.split(';'))
                 elif valueDict["value"] == value:
                     value_for_ocr = valueDict["value_for_ocr"]
                     valueTextList = value_for_ocr.split(';')
@@ -811,11 +811,12 @@ if __name__ == "__main__":
     # print u"getOptionText", opxls.getOptionText('picture')
     # print "getOptionValueInfo", opxls.getOptionValueInfo('picture')
     # print "getOptionValueText", opxls.getOptionValueText('picture', 'sharpness')
+    print "getOptionValueText", opxls.getOptionValueText('picture_preset', 'movie')
     # print "getOptionInfo", opxls.getOptionInfo('sharpness')
     # print "getOptionAllValueName", opxls.getOptionAllValueName('r_gain')
     ##########################################
-    paths = opxls.getOptionPaths('sharpness')
-    print "getOptionPaths", paths
+    # paths = opxls.getOptionPaths('sharpness')
+    # print "getOptionPaths", paths
     # print "checkOptionPaths", opxls.checkOptionPaths('sharpness')
     # print "checkOptionPaths", opxls.checkOptionPaths(opxls.getOptionPaths('sharpness'))
     # print "getOptionPathsAndValue", opxls.getOptionPathsAndValue('picture', 'sharpness')

+ 12 - 1
ssat_sdk/MenuTree3/logic.py

@@ -80,6 +80,7 @@ class CMenuLogic(CBaseLog):
     返回:
     '''
     def setOptionValue(self, optionName, optionValue):
+        self.info(u"【%s】【%s】" % (optionName, optionValue))
         CMenuLogic.sourceInput.setPattern(11)
         opa = COptionAction(optionName, optionValue, self.__optionConfig, self.__optionExcel)
 
@@ -154,4 +155,14 @@ class CMenuLogic(CBaseLog):
 
 if __name__ == "__main__":
     ml = CMenuLogic()
-    ml.setOptionValue('picture_preset', 'movie')
+    ml.setOptionValue('picture_preset', 'personal')
+    time.sleep(2)
+    ml.setOptionValue('picture_preset', 'dynamic')
+    time.sleep(2)
+    ml.setOptionValue('picture_preset', 'stadium')
+    time.sleep(2)
+    ml.setOptionValue('picture_preset', 'standard')
+    time.sleep(2)
+    ml.setOptionValue('picture_preset', 'natural')
+    time.sleep(2)
+    ml.setOptionValue('picture_preset', 'movie')