Przeglądaj źródła

add a new resolution size

gsp 2 lat temu
rodzic
commit
de51bdf929

+ 2 - 2
Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="Oxford" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="Oxford" />
+  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="OffLine" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit2.2.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

BIN
OTSCPP/OpenDll/OxfordApi61Dll/Help/Extender.chm


BIN
OTSCPP/OpenDll/OxfordApi61Dll/Help/Extender.chw


+ 6 - 5
OTSIncAMeasureApp/0-OTSModel/OTSDataType/otsdataconst.cs

@@ -65,9 +65,9 @@ namespace OTSDataType
         public const int RESOLUTION_ID_MAX = 7;
         public const int RESOLUTION_ID_DEFAULT = 4;
         public const int RESOLUTION_ID_FIRST_TIE = 0;
-        public static readonly Size[] RESOLUTION_VALUE = { new Size(512, 384), new Size(1024, 684), new Size(1024, 704), new Size(1024, 768), new Size(1536, 1024), new Size(2048, 1408), new Size(2048, 1536), new Size(3072, 2048),new Size(4096, 3072) };
+        public static readonly Size[] RESOLUTION_VALUE = { new Size(512, 384), new Size(1024, 684), new Size(1024, 704), new Size(1024, 768), new Size(1536, 1024), new Size(2048, 1408),new Size(2048,1416), new Size(2048, 1536), new Size(3072, 2048),new Size(4096, 3072) };
 
-        public static readonly string[] RESOLUTION_STRINGS = { "512 X 384", "1024 X 684", "1024 X 704", "1024 X 768", "1536 X 1024", "2048 X 1408",  "2048 X 1536", "3072 X 2048",  "4096 X 3072" };
+        public static readonly string[] RESOLUTION_STRINGS = { "512 X 384", "1024 X 684", "1024 X 704", "1024 X 768", "1536 X 1024", "2048 X 1408", "2048 X 1416" , "2048 X 1536", "3072 X 2048",  "4096 X 3072" };
 
         // image parameter
         public const int STOP_PARAM_PARTICLE_MIN = 0;
@@ -233,9 +233,10 @@ namespace OTSDataType
             _1024_768 = 3,
             _1536_1024 = 4,
             _2048_1408 = 5,
-            _2048_1536 = 6,
-            _3072_2048= 7,
-            _4096_3072 = 8
+            _2048_1416 = 6,
+            _2048_1536 = 7,
+            _3072_2048= 8,
+            _4096_3072 = 9
         }