Parcourir la source

删除取图方式中随机选项

cxs il y a 2 ans
Parent
commit
e1f53976e5

+ 2 - 2
OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -2247,7 +2247,7 @@ namespace OTSDataType
                     break;
                 case OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE:
                     {
-                        if (OTS_GET_IMAGE_MODE.FROM_CENTER > (OTS_GET_IMAGE_MODE)a_nValue || (OTS_GET_IMAGE_MODE)a_nValue > OTS_GET_IMAGE_MODE.RANDOM)
+                        if (OTS_GET_IMAGE_MODE.FROM_CENTER > (OTS_GET_IMAGE_MODE)a_nValue || (OTS_GET_IMAGE_MODE)a_nValue > OTS_GET_IMAGE_MODE.DOWN_TO_UP)
                         {
                             return false;
                         }
@@ -2367,7 +2367,7 @@ namespace OTSDataType
             {
                 case OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE:
                     {
-                        for (int i = (int)OTS_GET_IMAGE_MODE.FROM_CENTER; i <= (int)OTS_GET_IMAGE_MODE.RANDOM; ++i)
+                        for (int i = (int)OTS_GET_IMAGE_MODE.FROM_CENTER; i <= (int)OTS_GET_IMAGE_MODE.DOWN_TO_UP; ++i)
                         {
                             //ResourceID;
                             strItem = XmlResourceData.GetInstance().GetStringByKey(GrpImageScan, IDS_IMAGE_MODE_FIRST + i);

+ 2 - 2
OTSIncAMeasureApp/0-OTSModel/OTSDataType/otsdataconst.cs

@@ -212,8 +212,8 @@ namespace OTSDataType
         {
             FROM_CENTER = 0,
             UP_TO_DOWN = 1,
-            DOWN_TO_UP = 2,
-            RANDOM = 3
+            DOWN_TO_UP = 2
+            //RANDOM = 3
         }
 
 

+ 1 - 1
OTSIncAMeasureApp/ResourceManage/ResourceData.cs

@@ -150,7 +150,7 @@ namespace OTSModelSharp.ResourceManage
         public static string GetGetImageIdString(otsdataconst.OTS_GET_IMAGE_MODE a_nGetImageMode)
         {
             string strGetImageId = "";
-            if (a_nGetImageMode >= otsdataconst.OTS_GET_IMAGE_MODE.FROM_CENTER && a_nGetImageMode <= otsdataconst.OTS_GET_IMAGE_MODE.RANDOM)
+            if (a_nGetImageMode >= otsdataconst.OTS_GET_IMAGE_MODE.FROM_CENTER && a_nGetImageMode <= otsdataconst.OTS_GET_IMAGE_MODE.DOWN_TO_UP)
             {
                 strGetImageId = XmlResourceData.GetInstance().GetStringByKey(ResourceID.GrpOtherParam, ResourceID.IDS_FETCHIMAGEMODE + (int)a_nGetImageMode);
             }