Wヘッダ中のヘッダ数情報を利用するように修正，Bヘッダを使用しない形式でエラーにならないよう修正

diff --git a/Karinto/HiokiHicorderDataReader.cs b/Karinto/HiokiHicorderDataReader.cs
index 95ff395..5910aec 100755 (executable)
--- a/Karinto/HiokiHicorderDataReader.cs
+++ b/Karinto/HiokiHicorderDataReader.cs
@@ -27,6 +27,9 @@ namespace Karinto
 \r
         private HiokiHicorderData temp;\r
         private BaHeader[] baHeaders;\r
+        private const int HeaderSize = 0x200;\r
+        private int sizeOfHeaderChunk;\r
+        private int sizeOfDataChunk;\r
 \r
         public HiokiHicorderData Read(FilePath path)\r
         {\r
@@ -36,21 +39,27 @@ namespace Karinto
                 using (FileStream fs = new FileStream(\r
                     path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))\r
                 {\r
-                    long length = fs.Length;\r
-                    if (length < 512 || length > 0x7FFFFFFF ) return null;\r
-                    if ((length & 511) != 0) return null;\r
-\r
-                    byte[] raw = new byte[length];\r
-                    fs.Read(raw, 0, (int)length);\r
+                    if (fs.Length < 512 || fs.Length > 0x7FFFFFFF)\r
+                    {\r
+                        return null;\r
+                    }\r
 \r
                     temp = new HiokiHicorderData();\r
 \r
-                    ParseHeaders(raw);\r
+                    ParseHeaders(fs);\r
+\r
+                    sizeOfDataChunk = (int)fs.Length - sizeOfHeaderChunk;\r
+                    \r
+                    byte[] data = new byte[sizeOfDataChunk];\r
+                    fs.Read(data, 0, data.Length);\r
 \r
-                    for (int i = 1; i <= 16; ++i)\r
+                    if (baHeaders == null)\r
                     {\r
-                        if (temp.ChannelData[i] == null) continue;\r
-                        temp.ChannelData[i].SetRawData(ReadAnalogChannel(raw, i));\r
+                        ReadDataChunk(data);\r
+                    }\r
+                    else\r
+                    {\r
+                        ReadDataChunkWithBHeaders(data);\r
                     }\r
                 }\r
                 hicorderData = temp;\r
@@ -73,37 +82,41 @@ namespace Karinto
             string[] header = new string[elementNum];\r
             for (int i = 0; i < elementNum; ++i)\r
             {\r
-                string element = ASCIIEncoding.ASCII.GetString(data, offset, 12);\r
+                string element = Encoding.ASCII.GetString(data, offset, 12);\r
                 header[i] = element.TrimEnd(new char[]{'\0'});\r
                 offset += elementSize;\r
             }\r
             return header;\r
         }\r
 \r
-        private void ParseHeaders(byte[] data)\r
+        private void ParseHeaders(FileStream fs)\r
         {\r
+            byte[] data = new byte[HeaderSize];\r
+            fs.Read(data, 0, HeaderSize);\r
 \r
             int offset = 0;\r
-            temp.Settings = ParseWHeader(ReadHeader(data, offset));\r
+            string[] header = ReadHeader(data, offset);\r
+            temp.Settings = ParseWHeader(header);\r
 \r
-            offset += 0x200;\r
-            int limit = data.Length;\r
-            while(offset < limit)\r
+            int numberOfHeaders = Int32.Parse(header[1]);\r
+            sizeOfHeaderChunk = numberOfHeaders * HeaderSize;\r
+\r
+            data = new byte[sizeOfHeaderChunk - HeaderSize];\r
+            int readBytes = fs.Read(data, 0, data.Length);\r
+            if (readBytes < data.Length)\r
+            {\r
+                throw new Exception("Invalid Headers");\r
+            }\r
+            \r
+            while(offset < data.Length)\r
             {\r
                 \r
-                string[] header = ReadHeader(data, offset);\r
+                header = ReadHeader(data, offset);\r
                 offset += 0x200;\r
                 switch (header[0])\r
                 {\r
                     case "HBA":\r
                         baHeaders = ParseBAHeader(header);\r
-                        foreach (BaHeader b in baHeaders)\r
-                        {\r
-                            if (b != null)\r
-                            {\r
-                                limit = Math.Min(limit, b.Offset * 0x200);\r
-                            }\r
-                        }\r
                         break;\r
                     case "HC":\r
                         AnalogChannel c = ParseCHeader(header);\r
@@ -113,6 +126,10 @@ namespace Karinto
                         break;\r
                 }\r
             }\r
+            if (offset != data.Length)\r
+            {\r
+                throw new Exception("Invalid Headers");\r
+            }\r
         }\r
 \r
         private static Settings ParseWHeader(string[] header)\r
@@ -123,6 +140,7 @@ namespace Karinto
                                     new Xml.Hioki.HicorderSettingsDataTable();\r
 \r
             Settings settings = table.NewHicorderSettingsRow();\r
+\r
             settings.Model = header[2];\r
             settings.RomVersion = header[3];\r
             settings.Function = header[4];\r
@@ -222,7 +240,8 @@ namespace Karinto
                     {\r
                         break;\r
                     }\r
-                    Match d = RegexSet.DecimalFloat.Match(temp.Settings.RomVersion);\r
+                    string romVer = temp.Settings.RomVersion;\r
+                    Match d = RegexSet.DecimalFloat.Match(romVer);\r
                     Decimal v = Decimal.Parse(d.Groups[0].Value);\r
                     if (v < 2.55m || (5.00m <= v && v < 5.55m))\r
                     {\r
@@ -253,7 +272,7 @@ namespace Karinto
             ch.VariableLower = Double.Parse(header[27]);\r
 \r
             Match m = new Regex(@"(\d+(?:\.\d*)?)%").Match(header[28]);\r
-            ch.Vernier = Int32.Parse(m.Groups[1].Value);\r
+            ch.Vernier = Double.Parse(m.Groups[1].Value);\r
 \r
             ch.Calcurate = header[32];\r
             ch.MeasurementScale = Double.Parse(header[33]);\r
@@ -263,11 +282,43 @@ namespace Karinto
             return ch;\r
         }\r
 \r
+        private void ReadDataChunk(byte[] data)\r
+        {\r
+            int numberOfAnalogCh = 0;\r
+            int numberOfLogicCh = 0;\r
+            int n = 1;\r
+            //short[][] analog;\r
+            switch(temp.Settings.Function)\r
+            {\r
+                case "MEM":\r
+                    break;\r
+                case "REC":\r
+\r
+                    break;\r
+\r
+                default:\r
+                    throw new NotSupportedException();\r
+            }\r
+        }\r
+\r
+        private void ReadDataChunkWithBHeaders(byte[] data)\r
+        {\r
+            for (int i = 1; i <= 16; ++i)\r
+            {\r
+                if (temp.ChannelData[i] != null)\r
+                {\r
+                    temp.ChannelData[i].SetRawData(ReadAnalogChannel(data, i));\r
+                }\r
+            }\r
+        }\r
+\r
         private short[] ReadAnalogChannel(byte[] data, int channel)\r
         {\r
             int n = baHeaders[channel].SampleNumber;\r
             short[] values = new short[n];\r
-            int offset = baHeaders[channel].Offset * 0x200;\r
+            int offset = baHeaders[channel].Offset * HeaderSize;\r
+            offset -= sizeOfHeaderChunk;\r
+\r
             for (int i = 0; i < n; ++i)\r
             {\r
                 values[i] = (short)(data[offset] << 8 | data[offset + 1]);\r

diff --git a/Karinto/Xml/Hioki.Designer.cs b/Karinto/Xml/Hioki.Designer.cs
index 6a1e1b4..3957944 100755 (executable)
--- a/Karinto/Xml/Hioki.Designer.cs
+++ b/Karinto/Xml/Hioki.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     このコードはツールによって生成されました。\r
-//     ランタイム バージョン:2.0.50727.3615\r
+//     ランタイム バージョン:2.0.50727.3620\r
 //\r
 //     このファイルへの変更は、以下の状況下で不正な動作の原因になったり、\r
 //     コードが再生成されるときに損失したりします。\r
@@ -29,6 +29,10 @@ namespace Karinto.Xml {
         \r
         private HicorderAnalogChannelDataTable tableHicorderAnalogChannel;\r
         \r
+        private HicorderTriggerSettingsDataTable tableHicorderTriggerSettings;\r
+        \r
+        private HicorderLogicChannelDataTable tableHicorderLogicChannel;\r
+        \r
         private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;\r
         \r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
@@ -61,6 +65,12 @@ namespace Karinto.Xml {
                 if ((ds.Tables["HicorderAnalogChannel"] != null)) {\r
                     base.Tables.Add(new HicorderAnalogChannelDataTable(ds.Tables["HicorderAnalogChannel"]));\r
                 }\r
+                if ((ds.Tables["HicorderTriggerSettings"] != null)) {\r
+                    base.Tables.Add(new HicorderTriggerSettingsDataTable(ds.Tables["HicorderTriggerSettings"]));\r
+                }\r
+                if ((ds.Tables["HicorderLogicChannel"] != null)) {\r
+                    base.Tables.Add(new HicorderLogicChannelDataTable(ds.Tables["HicorderLogicChannel"]));\r
+                }\r
                 this.DataSetName = ds.DataSetName;\r
                 this.Prefix = ds.Prefix;\r
                 this.Namespace = ds.Namespace;\r
@@ -98,6 +108,24 @@ namespace Karinto.Xml {
         }\r
         \r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+        [global::System.ComponentModel.Browsable(false)]\r
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]\r
+        public HicorderTriggerSettingsDataTable HicorderTriggerSettings {\r
+            get {\r
+                return this.tableHicorderTriggerSettings;\r
+            }\r
+        }\r
+        \r
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+        [global::System.ComponentModel.Browsable(false)]\r
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]\r
+        public HicorderLogicChannelDataTable HicorderLogicChannel {\r
+            get {\r
+                return this.tableHicorderLogicChannel;\r
+            }\r
+        }\r
+        \r
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         [global::System.ComponentModel.BrowsableAttribute(true)]\r
         [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)]\r
         public override global::System.Data.SchemaSerializationMode SchemaSerializationMode {\r
@@ -162,6 +190,12 @@ namespace Karinto.Xml {
                 if ((ds.Tables["HicorderAnalogChannel"] != null)) {\r
                     base.Tables.Add(new HicorderAnalogChannelDataTable(ds.Tables["HicorderAnalogChannel"]));\r
                 }\r
+                if ((ds.Tables["HicorderTriggerSettings"] != null)) {\r
+                    base.Tables.Add(new HicorderTriggerSettingsDataTable(ds.Tables["HicorderTriggerSettings"]));\r
+                }\r
+                if ((ds.Tables["HicorderLogicChannel"] != null)) {\r
+                    base.Tables.Add(new HicorderLogicChannelDataTable(ds.Tables["HicorderLogicChannel"]));\r
+                }\r
                 this.DataSetName = ds.DataSetName;\r
                 this.Prefix = ds.Prefix;\r
                 this.Namespace = ds.Namespace;\r
@@ -204,6 +238,18 @@ namespace Karinto.Xml {
                     this.tableHicorderAnalogChannel.InitVars();\r
                 }\r
             }\r
+            this.tableHicorderTriggerSettings = ((HicorderTriggerSettingsDataTable)(base.Tables["HicorderTriggerSettings"]));\r
+            if ((initTable == true)) {\r
+                if ((this.tableHicorderTriggerSettings != null)) {\r
+                    this.tableHicorderTriggerSettings.InitVars();\r
+                }\r
+            }\r
+            this.tableHicorderLogicChannel = ((HicorderLogicChannelDataTable)(base.Tables["HicorderLogicChannel"]));\r
+            if ((initTable == true)) {\r
+                if ((this.tableHicorderLogicChannel != null)) {\r
+                    this.tableHicorderLogicChannel.InitVars();\r
+                }\r
+            }\r
         }\r
         \r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
@@ -217,6 +263,10 @@ namespace Karinto.Xml {
             base.Tables.Add(this.tableHicorderSettings);\r
             this.tableHicorderAnalogChannel = new HicorderAnalogChannelDataTable();\r
             base.Tables.Add(this.tableHicorderAnalogChannel);\r
+            this.tableHicorderTriggerSettings = new HicorderTriggerSettingsDataTable();\r
+            base.Tables.Add(this.tableHicorderTriggerSettings);\r
+            this.tableHicorderLogicChannel = new HicorderLogicChannelDataTable();\r
+            base.Tables.Add(this.tableHicorderLogicChannel);\r
         }\r
         \r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
@@ -230,6 +280,16 @@ namespace Karinto.Xml {
         }\r
         \r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+        private bool ShouldSerializeHicorderTriggerSettings() {\r
+            return false;\r
+        }\r
+        \r
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+        private bool ShouldSerializeHicorderLogicChannel() {\r
+            return false;\r
+        }\r
+        \r
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) {\r
             if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) {\r
                 this.InitVars();\r
@@ -286,6 +346,10 @@ namespace Karinto.Xml {
         \r
         public delegate void HicorderAnalogChannelRowChangeEventHandler(object sender, HicorderAnalogChannelRowChangeEvent e);\r
         \r
+        public delegate void HicorderTriggerSettingsRowChangeEventHandler(object sender, HicorderTriggerSettingsRowChangeEvent e);\r
+        \r
+        public delegate void HicorderLogicChannelRowChangeEventHandler(object sender, HicorderLogicChannelRowChangeEvent e);\r
+        \r
         /// <summary>\r
         ///Represents the strongly named DataTable class.\r
         ///</summary>\r
@@ -1118,7 +1182,7 @@ namespace Karinto.Xml {
                         bool Variable, \r
                         double VariableUpper, \r
                         double VariableLower, \r
-                        int Vernier, \r
+                        double Vernier, \r
                         string Expand, \r
                         string Graph, \r
                         string Calcurate, \r
@@ -1251,7 +1315,7 @@ namespace Karinto.Xml {
                 base.Columns.Add(this.columnVariableUpper);\r
                 this.columnVariableLower = new global::System.Data.DataColumn("VariableLower", typeof(double), null, global::System.Data.MappingType.Element);\r
                 base.Columns.Add(this.columnVariableLower);\r
-                this.columnVernier = new global::System.Data.DataColumn("Vernier", typeof(int), null, global::System.Data.MappingType.Element);\r
+                this.columnVernier = new global::System.Data.DataColumn("Vernier", typeof(double), null, global::System.Data.MappingType.Element);\r
                 base.Columns.Add(this.columnVernier);\r
                 this.columnExpand = new global::System.Data.DataColumn("Expand", typeof(string), null, global::System.Data.MappingType.Element);\r
                 base.Columns.Add(this.columnExpand);\r
@@ -1389,254 +1453,723 @@ namespace Karinto.Xml {
         }\r
         \r
         /// <summary>\r
-        ///Represents strongly named DataRow class.\r
+        ///Represents the strongly named DataTable class.\r
         ///</summary>\r
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]\r
-        public partial class HicorderSettingsRow : global::System.Data.DataRow {\r
+        [global::System.Serializable()]\r
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]\r
+        public partial class HicorderTriggerSettingsDataTable : global::System.Data.DataTable, global::System.Collections.IEnumerable {\r
             \r
-            private HicorderSettingsDataTable tableHicorderSettings;\r
+            private global::System.Data.DataColumn columnLevel;\r
+            \r
+            private global::System.Data.DataColumn columnSlope;\r
+            \r
+            private global::System.Data.DataColumn columnFilter;\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            internal HicorderSettingsRow(global::System.Data.DataRowBuilder rb) : \r
-                    base(rb) {\r
-                this.tableHicorderSettings = ((HicorderSettingsDataTable)(this.Table));\r
+            public HicorderTriggerSettingsDataTable() {\r
+                this.TableName = "HicorderTriggerSettings";\r
+                this.BeginInit();\r
+                this.InitClass();\r
+                this.EndInit();\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public string Model {\r
-                get {\r
-                    try {\r
-                        return ((string)(this[this.tableHicorderSettings.ModelColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'Model\' の値は DBNull です。", e);\r
-                    }\r
+            internal HicorderTriggerSettingsDataTable(global::System.Data.DataTable table) {\r
+                this.TableName = table.TableName;\r
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {\r
+                    this.CaseSensitive = table.CaseSensitive;\r
                 }\r
-                set {\r
-                    this[this.tableHicorderSettings.ModelColumn] = value;\r
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {\r
+                    this.Locale = table.Locale;\r
+                }\r
+                if ((table.Namespace != table.DataSet.Namespace)) {\r
+                    this.Namespace = table.Namespace;\r
                 }\r
+                this.Prefix = table.Prefix;\r
+                this.MinimumCapacity = table.MinimumCapacity;\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public string RomVersion {\r
-                get {\r
-                    try {\r
-                        return ((string)(this[this.tableHicorderSettings.RomVersionColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'RomVersion\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.RomVersionColumn] = value;\r
-                }\r
+            protected HicorderTriggerSettingsDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : \r
+                    base(info, context) {\r
+                this.InitVars();\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public string Function {\r
+            public global::System.Data.DataColumn LevelColumn {\r
                 get {\r
-                    try {\r
-                        return ((string)(this[this.tableHicorderSettings.FunctionColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'Function\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.FunctionColumn] = value;\r
+                    return this.columnLevel;\r
                 }\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public string Shot {\r
+            public global::System.Data.DataColumn SlopeColumn {\r
                 get {\r
-                    try {\r
-                        return ((string)(this[this.tableHicorderSettings.ShotColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'Shot\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.ShotColumn] = value;\r
+                    return this.columnSlope;\r
                 }\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public System.DateTime TrigDate {\r
+            public global::System.Data.DataColumn FilterColumn {\r
                 get {\r
-                    try {\r
-                        return ((global::System.DateTime)(this[this.tableHicorderSettings.TrigDateColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TrigDate\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.TrigDateColumn] = value;\r
+                    return this.columnFilter;\r
                 }\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public decimal TimePerDiv {\r
+            [global::System.ComponentModel.Browsable(false)]\r
+            public int Count {\r
                 get {\r
-                    try {\r
-                        return ((decimal)(this[this.tableHicorderSettings.TimePerDivColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TimePerDiv\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.TimePerDivColumn] = value;\r
+                    return this.Rows.Count;\r
                 }\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public int Expand {\r
+            public HicorderTriggerSettingsRow this[int index] {\r
                 get {\r
-                    try {\r
-                        return ((int)(this[this.tableHicorderSettings.ExpandColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'Expand\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.ExpandColumn] = value;\r
+                    return ((HicorderTriggerSettingsRow)(this.Rows[index]));\r
                 }\r
             }\r
             \r
+            public event HicorderTriggerSettingsRowChangeEventHandler HicorderTriggerSettingsRowChanging;\r
+            \r
+            public event HicorderTriggerSettingsRowChangeEventHandler HicorderTriggerSettingsRowChanged;\r
+            \r
+            public event HicorderTriggerSettingsRowChangeEventHandler HicorderTriggerSettingsRowDeleting;\r
+            \r
+            public event HicorderTriggerSettingsRowChangeEventHandler HicorderTriggerSettingsRowDeleted;\r
+            \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public string TrigMode {\r
-                get {\r
-                    try {\r
-                        return ((string)(this[this.tableHicorderSettings.TrigModeColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TrigMode\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.TrigModeColumn] = value;\r
-                }\r
+            public void AddHicorderTriggerSettingsRow(HicorderTriggerSettingsRow row) {\r
+                this.Rows.Add(row);\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public string TrigSource {\r
-                get {\r
-                    try {\r
-                        return ((string)(this[this.tableHicorderSettings.TrigSourceColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TrigSource\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.TrigSourceColumn] = value;\r
-                }\r
+            public HicorderTriggerSettingsRow AddHicorderTriggerSettingsRow(string Level, string Slope, string Filter) {\r
+                HicorderTriggerSettingsRow rowHicorderTriggerSettingsRow = ((HicorderTriggerSettingsRow)(this.NewRow()));\r
+                object[] columnValuesArray = new object[] {\r
+                        Level,\r
+                        Slope,\r
+                        Filter};\r
+                rowHicorderTriggerSettingsRow.ItemArray = columnValuesArray;\r
+                this.Rows.Add(rowHicorderTriggerSettingsRow);\r
+                return rowHicorderTriggerSettingsRow;\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public double PreTrig {\r
-                get {\r
-                    try {\r
-                        return ((double)(this[this.tableHicorderSettings.PreTrigColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'PreTrig\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.PreTrigColumn] = value;\r
-                }\r
+            public virtual global::System.Collections.IEnumerator GetEnumerator() {\r
+                return this.Rows.GetEnumerator();\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public System.DateTime TimerTrigStart {\r
-                get {\r
-                    try {\r
-                        return ((global::System.DateTime)(this[this.tableHicorderSettings.TimerTrigStartColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TimerTrigStart\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.TimerTrigStartColumn] = value;\r
-                }\r
+            public override global::System.Data.DataTable Clone() {\r
+                HicorderTriggerSettingsDataTable cln = ((HicorderTriggerSettingsDataTable)(base.Clone()));\r
+                cln.InitVars();\r
+                return cln;\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public System.DateTime TimerTrigStop {\r
-                get {\r
-                    try {\r
-                        return ((global::System.DateTime)(this[this.tableHicorderSettings.TimerTrigStopColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TimerTrigStop\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.TimerTrigStopColumn] = value;\r
-                }\r
+            protected override global::System.Data.DataTable CreateInstance() {\r
+                return new HicorderTriggerSettingsDataTable();\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public System.TimeSpan TimerTrigInterval {\r
-                get {\r
-                    try {\r
-                        return ((global::System.TimeSpan)(this[this.tableHicorderSettings.TimerTrigIntervalColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TimerTrigInterval\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.TimerTrigIntervalColumn] = value;\r
-                }\r
+            internal void InitVars() {\r
+                this.columnLevel = base.Columns["Level"];\r
+                this.columnSlope = base.Columns["Slope"];\r
+                this.columnFilter = base.Columns["Filter"];\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public bool ManualTrig {\r
-                get {\r
-                    try {\r
-                        return ((bool)(this[this.tableHicorderSettings.ManualTrigColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'ManualTrig\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.ManualTrigColumn] = value;\r
-                }\r
+            private void InitClass() {\r
+                this.columnLevel = new global::System.Data.DataColumn("Level", typeof(string), null, global::System.Data.MappingType.Element);\r
+                base.Columns.Add(this.columnLevel);\r
+                this.columnSlope = new global::System.Data.DataColumn("Slope", typeof(string), null, global::System.Data.MappingType.Element);\r
+                base.Columns.Add(this.columnSlope);\r
+                this.columnFilter = new global::System.Data.DataColumn("Filter", typeof(string), null, global::System.Data.MappingType.Element);\r
+                base.Columns.Add(this.columnFilter);\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public bool ExtTrig {\r
-                get {\r
-                    try {\r
-                        return ((bool)(this[this.tableHicorderSettings.ExtTrigColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'ExtTrig\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
-                set {\r
-                    this[this.tableHicorderSettings.ExtTrigColumn] = value;\r
-                }\r
+            public HicorderTriggerSettingsRow NewHicorderTriggerSettingsRow() {\r
+                return ((HicorderTriggerSettingsRow)(this.NewRow()));\r
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public int UseChannel {\r
-                get {\r
-                    try {\r
-                        return ((int)(this[this.tableHicorderSettings.UseChannelColumn]));\r
-                    }\r
-                    catch (global::System.InvalidCastException e) {\r
-                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'UseChannel\' の値は DBNull です。", e);\r
-                    }\r
-                }\r
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {\r
+                return new HicorderTriggerSettingsRow(builder);\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected override global::System.Type GetRowType() {\r
+                return typeof(HicorderTriggerSettingsRow);\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {\r
+                base.OnRowChanged(e);\r
+                if ((this.HicorderTriggerSettingsRowChanged != null)) {\r
+                    this.HicorderTriggerSettingsRowChanged(this, new HicorderTriggerSettingsRowChangeEvent(((HicorderTriggerSettingsRow)(e.Row)), e.Action));\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {\r
+                base.OnRowChanging(e);\r
+                if ((this.HicorderTriggerSettingsRowChanging != null)) {\r
+                    this.HicorderTriggerSettingsRowChanging(this, new HicorderTriggerSettingsRowChangeEvent(((HicorderTriggerSettingsRow)(e.Row)), e.Action));\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {\r
+                base.OnRowDeleted(e);\r
+                if ((this.HicorderTriggerSettingsRowDeleted != null)) {\r
+                    this.HicorderTriggerSettingsRowDeleted(this, new HicorderTriggerSettingsRowChangeEvent(((HicorderTriggerSettingsRow)(e.Row)), e.Action));\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {\r
+                base.OnRowDeleting(e);\r
+                if ((this.HicorderTriggerSettingsRowDeleting != null)) {\r
+                    this.HicorderTriggerSettingsRowDeleting(this, new HicorderTriggerSettingsRowChangeEvent(((HicorderTriggerSettingsRow)(e.Row)), e.Action));\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public void RemoveHicorderTriggerSettingsRow(HicorderTriggerSettingsRow row) {\r
+                this.Rows.Remove(row);\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {\r
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();\r
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();\r
+                Hioki ds = new Hioki();\r
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();\r
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";\r
+                any1.MinOccurs = new decimal(0);\r
+                any1.MaxOccurs = decimal.MaxValue;\r
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;\r
+                sequence.Items.Add(any1);\r
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();\r
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";\r
+                any2.MinOccurs = new decimal(1);\r
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;\r
+                sequence.Items.Add(any2);\r
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();\r
+                attribute1.Name = "namespace";\r
+                attribute1.FixedValue = ds.Namespace;\r
+                type.Attributes.Add(attribute1);\r
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();\r
+                attribute2.Name = "tableTypeName";\r
+                attribute2.FixedValue = "HicorderTriggerSettingsDataTable";\r
+                type.Attributes.Add(attribute2);\r
+                type.Particle = sequence;\r
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();\r
+                if (xs.Contains(dsSchema.TargetNamespace)) {\r
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();\r
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();\r
+                    try {\r
+                        global::System.Xml.Schema.XmlSchema schema = null;\r
+                        dsSchema.Write(s1);\r
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {\r
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));\r
+                            s2.SetLength(0);\r
+                            schema.Write(s2);\r
+                            if ((s1.Length == s2.Length)) {\r
+                                s1.Position = 0;\r
+                                s2.Position = 0;\r
+                                for (; ((s1.Position != s1.Length) \r
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {\r
+                                    ;\r
+                                }\r
+                                if ((s1.Position == s1.Length)) {\r
+                                    return type;\r
+                                }\r
+                            }\r
+                        }\r
+                    }\r
+                    finally {\r
+                        if ((s1 != null)) {\r
+                            s1.Close();\r
+                        }\r
+                        if ((s2 != null)) {\r
+                            s2.Close();\r
+                        }\r
+                    }\r
+                }\r
+                xs.Add(dsSchema);\r
+                return type;\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///Represents the strongly named DataTable class.\r
+        ///</summary>\r
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]\r
+        [global::System.Serializable()]\r
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]\r
+        public partial class HicorderLogicChannelDataTable : global::System.Data.DataTable, global::System.Collections.IEnumerable {\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public HicorderLogicChannelDataTable() {\r
+                this.TableName = "HicorderLogicChannel";\r
+                this.BeginInit();\r
+                this.InitClass();\r
+                this.EndInit();\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            internal HicorderLogicChannelDataTable(global::System.Data.DataTable table) {\r
+                this.TableName = table.TableName;\r
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {\r
+                    this.CaseSensitive = table.CaseSensitive;\r
+                }\r
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {\r
+                    this.Locale = table.Locale;\r
+                }\r
+                if ((table.Namespace != table.DataSet.Namespace)) {\r
+                    this.Namespace = table.Namespace;\r
+                }\r
+                this.Prefix = table.Prefix;\r
+                this.MinimumCapacity = table.MinimumCapacity;\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected HicorderLogicChannelDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : \r
+                    base(info, context) {\r
+                this.InitVars();\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            [global::System.ComponentModel.Browsable(false)]\r
+            public int Count {\r
+                get {\r
+                    return this.Rows.Count;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public HicorderLogicChannelRow this[int index] {\r
+                get {\r
+                    return ((HicorderLogicChannelRow)(this.Rows[index]));\r
+                }\r
+            }\r
+            \r
+            public event HicorderLogicChannelRowChangeEventHandler HicorderLogicChannelRowChanging;\r
+            \r
+            public event HicorderLogicChannelRowChangeEventHandler HicorderLogicChannelRowChanged;\r
+            \r
+            public event HicorderLogicChannelRowChangeEventHandler HicorderLogicChannelRowDeleting;\r
+            \r
+            public event HicorderLogicChannelRowChangeEventHandler HicorderLogicChannelRowDeleted;\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public void AddHicorderLogicChannelRow(HicorderLogicChannelRow row) {\r
+                this.Rows.Add(row);\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public HicorderLogicChannelRow AddHicorderLogicChannelRow() {\r
+                HicorderLogicChannelRow rowHicorderLogicChannelRow = ((HicorderLogicChannelRow)(this.NewRow()));\r
+                object[] columnValuesArray = new object[0];\r
+                rowHicorderLogicChannelRow.ItemArray = columnValuesArray;\r
+                this.Rows.Add(rowHicorderLogicChannelRow);\r
+                return rowHicorderLogicChannelRow;\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public virtual global::System.Collections.IEnumerator GetEnumerator() {\r
+                return this.Rows.GetEnumerator();\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public override global::System.Data.DataTable Clone() {\r
+                HicorderLogicChannelDataTable cln = ((HicorderLogicChannelDataTable)(base.Clone()));\r
+                cln.InitVars();\r
+                return cln;\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected override global::System.Data.DataTable CreateInstance() {\r
+                return new HicorderLogicChannelDataTable();\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            internal void InitVars() {\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            private void InitClass() {\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public HicorderLogicChannelRow NewHicorderLogicChannelRow() {\r
+                return ((HicorderLogicChannelRow)(this.NewRow()));\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {\r
+                return new HicorderLogicChannelRow(builder);\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected override global::System.Type GetRowType() {\r
+                return typeof(HicorderLogicChannelRow);\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {\r
+                base.OnRowChanged(e);\r
+                if ((this.HicorderLogicChannelRowChanged != null)) {\r
+                    this.HicorderLogicChannelRowChanged(this, new HicorderLogicChannelRowChangeEvent(((HicorderLogicChannelRow)(e.Row)), e.Action));\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {\r
+                base.OnRowChanging(e);\r
+                if ((this.HicorderLogicChannelRowChanging != null)) {\r
+                    this.HicorderLogicChannelRowChanging(this, new HicorderLogicChannelRowChangeEvent(((HicorderLogicChannelRow)(e.Row)), e.Action));\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {\r
+                base.OnRowDeleted(e);\r
+                if ((this.HicorderLogicChannelRowDeleted != null)) {\r
+                    this.HicorderLogicChannelRowDeleted(this, new HicorderLogicChannelRowChangeEvent(((HicorderLogicChannelRow)(e.Row)), e.Action));\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {\r
+                base.OnRowDeleting(e);\r
+                if ((this.HicorderLogicChannelRowDeleting != null)) {\r
+                    this.HicorderLogicChannelRowDeleting(this, new HicorderLogicChannelRowChangeEvent(((HicorderLogicChannelRow)(e.Row)), e.Action));\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public void RemoveHicorderLogicChannelRow(HicorderLogicChannelRow row) {\r
+                this.Rows.Remove(row);\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {\r
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();\r
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();\r
+                Hioki ds = new Hioki();\r
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();\r
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";\r
+                any1.MinOccurs = new decimal(0);\r
+                any1.MaxOccurs = decimal.MaxValue;\r
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;\r
+                sequence.Items.Add(any1);\r
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();\r
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";\r
+                any2.MinOccurs = new decimal(1);\r
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;\r
+                sequence.Items.Add(any2);\r
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();\r
+                attribute1.Name = "namespace";\r
+                attribute1.FixedValue = ds.Namespace;\r
+                type.Attributes.Add(attribute1);\r
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();\r
+                attribute2.Name = "tableTypeName";\r
+                attribute2.FixedValue = "HicorderLogicChannelDataTable";\r
+                type.Attributes.Add(attribute2);\r
+                type.Particle = sequence;\r
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();\r
+                if (xs.Contains(dsSchema.TargetNamespace)) {\r
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();\r
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();\r
+                    try {\r
+                        global::System.Xml.Schema.XmlSchema schema = null;\r
+                        dsSchema.Write(s1);\r
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {\r
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));\r
+                            s2.SetLength(0);\r
+                            schema.Write(s2);\r
+                            if ((s1.Length == s2.Length)) {\r
+                                s1.Position = 0;\r
+                                s2.Position = 0;\r
+                                for (; ((s1.Position != s1.Length) \r
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {\r
+                                    ;\r
+                                }\r
+                                if ((s1.Position == s1.Length)) {\r
+                                    return type;\r
+                                }\r
+                            }\r
+                        }\r
+                    }\r
+                    finally {\r
+                        if ((s1 != null)) {\r
+                            s1.Close();\r
+                        }\r
+                        if ((s2 != null)) {\r
+                            s2.Close();\r
+                        }\r
+                    }\r
+                }\r
+                xs.Add(dsSchema);\r
+                return type;\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///Represents strongly named DataRow class.\r
+        ///</summary>\r
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]\r
+        public partial class HicorderSettingsRow : global::System.Data.DataRow {\r
+            \r
+            private HicorderSettingsDataTable tableHicorderSettings;\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            internal HicorderSettingsRow(global::System.Data.DataRowBuilder rb) : \r
+                    base(rb) {\r
+                this.tableHicorderSettings = ((HicorderSettingsDataTable)(this.Table));\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public string Model {\r
+                get {\r
+                    try {\r
+                        return ((string)(this[this.tableHicorderSettings.ModelColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'Model\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.ModelColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public string RomVersion {\r
+                get {\r
+                    try {\r
+                        return ((string)(this[this.tableHicorderSettings.RomVersionColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'RomVersion\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.RomVersionColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public string Function {\r
+                get {\r
+                    try {\r
+                        return ((string)(this[this.tableHicorderSettings.FunctionColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'Function\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.FunctionColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public string Shot {\r
+                get {\r
+                    try {\r
+                        return ((string)(this[this.tableHicorderSettings.ShotColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'Shot\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.ShotColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public System.DateTime TrigDate {\r
+                get {\r
+                    try {\r
+                        return ((global::System.DateTime)(this[this.tableHicorderSettings.TrigDateColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TrigDate\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.TrigDateColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public decimal TimePerDiv {\r
+                get {\r
+                    try {\r
+                        return ((decimal)(this[this.tableHicorderSettings.TimePerDivColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TimePerDiv\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.TimePerDivColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public int Expand {\r
+                get {\r
+                    try {\r
+                        return ((int)(this[this.tableHicorderSettings.ExpandColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'Expand\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.ExpandColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public string TrigMode {\r
+                get {\r
+                    try {\r
+                        return ((string)(this[this.tableHicorderSettings.TrigModeColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TrigMode\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.TrigModeColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public string TrigSource {\r
+                get {\r
+                    try {\r
+                        return ((string)(this[this.tableHicorderSettings.TrigSourceColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TrigSource\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.TrigSourceColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public double PreTrig {\r
+                get {\r
+                    try {\r
+                        return ((double)(this[this.tableHicorderSettings.PreTrigColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'PreTrig\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.PreTrigColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public System.DateTime TimerTrigStart {\r
+                get {\r
+                    try {\r
+                        return ((global::System.DateTime)(this[this.tableHicorderSettings.TimerTrigStartColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TimerTrigStart\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.TimerTrigStartColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public System.DateTime TimerTrigStop {\r
+                get {\r
+                    try {\r
+                        return ((global::System.DateTime)(this[this.tableHicorderSettings.TimerTrigStopColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TimerTrigStop\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.TimerTrigStopColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public System.TimeSpan TimerTrigInterval {\r
+                get {\r
+                    try {\r
+                        return ((global::System.TimeSpan)(this[this.tableHicorderSettings.TimerTrigIntervalColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'TimerTrigInterval\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.TimerTrigIntervalColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public bool ManualTrig {\r
+                get {\r
+                    try {\r
+                        return ((bool)(this[this.tableHicorderSettings.ManualTrigColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'ManualTrig\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.ManualTrigColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public bool ExtTrig {\r
+                get {\r
+                    try {\r
+                        return ((bool)(this[this.tableHicorderSettings.ExtTrigColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'ExtTrig\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderSettings.ExtTrigColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public int UseChannel {\r
+                get {\r
+                    try {\r
+                        return ((int)(this[this.tableHicorderSettings.UseChannelColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderSettings\' にある列 \'UseChannel\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
                 set {\r
                     this[this.tableHicorderSettings.UseChannelColumn] = value;\r
                 }\r
@@ -2223,10 +2756,10 @@ namespace Karinto.Xml {
             }\r
             \r
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-            public int Vernier {\r
+            public double Vernier {\r
                 get {\r
                     try {\r
-                        return ((int)(this[this.tableHicorderAnalogChannel.VernierColumn]));\r
+                        return ((double)(this[this.tableHicorderAnalogChannel.VernierColumn]));\r
                     }\r
                     catch (global::System.InvalidCastException e) {\r
                         throw new global::System.Data.StrongTypingException("テーブル \'HicorderAnalogChannel\' にある列 \'Vernier\' の値は DBNull です。", e);\r
@@ -2579,6 +3112,111 @@ namespace Karinto.Xml {
         }\r
         \r
         /// <summary>\r
+        ///Represents strongly named DataRow class.\r
+        ///</summary>\r
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]\r
+        public partial class HicorderTriggerSettingsRow : global::System.Data.DataRow {\r
+            \r
+            private HicorderTriggerSettingsDataTable tableHicorderTriggerSettings;\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            internal HicorderTriggerSettingsRow(global::System.Data.DataRowBuilder rb) : \r
+                    base(rb) {\r
+                this.tableHicorderTriggerSettings = ((HicorderTriggerSettingsDataTable)(this.Table));\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public string Level {\r
+                get {\r
+                    try {\r
+                        return ((string)(this[this.tableHicorderTriggerSettings.LevelColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderTriggerSettings\' にある列 \'Level\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderTriggerSettings.LevelColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public string Slope {\r
+                get {\r
+                    try {\r
+                        return ((string)(this[this.tableHicorderTriggerSettings.SlopeColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderTriggerSettings\' にある列 \'Slope\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderTriggerSettings.SlopeColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public string Filter {\r
+                get {\r
+                    try {\r
+                        return ((string)(this[this.tableHicorderTriggerSettings.FilterColumn]));\r
+                    }\r
+                    catch (global::System.InvalidCastException e) {\r
+                        throw new global::System.Data.StrongTypingException("テーブル \'HicorderTriggerSettings\' にある列 \'Filter\' の値は DBNull です。", e);\r
+                    }\r
+                }\r
+                set {\r
+                    this[this.tableHicorderTriggerSettings.FilterColumn] = value;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public bool IsLevelNull() {\r
+                return this.IsNull(this.tableHicorderTriggerSettings.LevelColumn);\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public void SetLevelNull() {\r
+                this[this.tableHicorderTriggerSettings.LevelColumn] = global::System.Convert.DBNull;\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public bool IsSlopeNull() {\r
+                return this.IsNull(this.tableHicorderTriggerSettings.SlopeColumn);\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public void SetSlopeNull() {\r
+                this[this.tableHicorderTriggerSettings.SlopeColumn] = global::System.Convert.DBNull;\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public bool IsFilterNull() {\r
+                return this.IsNull(this.tableHicorderTriggerSettings.FilterColumn);\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public void SetFilterNull() {\r
+                this[this.tableHicorderTriggerSettings.FilterColumn] = global::System.Convert.DBNull;\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///Represents strongly named DataRow class.\r
+        ///</summary>\r
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]\r
+        public partial class HicorderLogicChannelRow : global::System.Data.DataRow {\r
+            \r
+            private HicorderLogicChannelDataTable tableHicorderLogicChannel;\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            internal HicorderLogicChannelRow(global::System.Data.DataRowBuilder rb) : \r
+                    base(rb) {\r
+                this.tableHicorderLogicChannel = ((HicorderLogicChannelDataTable)(this.Table));\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
         ///Row event argument class\r
         ///</summary>\r
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]\r
@@ -2639,6 +3277,68 @@ namespace Karinto.Xml {
                 }\r
             }\r
         }\r
+        \r
+        /// <summary>\r
+        ///Row event argument class\r
+        ///</summary>\r
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]\r
+        public class HicorderTriggerSettingsRowChangeEvent : global::System.EventArgs {\r
+            \r
+            private HicorderTriggerSettingsRow eventRow;\r
+            \r
+            private global::System.Data.DataRowAction eventAction;\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public HicorderTriggerSettingsRowChangeEvent(HicorderTriggerSettingsRow row, global::System.Data.DataRowAction action) {\r
+                this.eventRow = row;\r
+                this.eventAction = action;\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public HicorderTriggerSettingsRow Row {\r
+                get {\r
+                    return this.eventRow;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public global::System.Data.DataRowAction Action {\r
+                get {\r
+                    return this.eventAction;\r
+                }\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///Row event argument class\r
+        ///</summary>\r
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]\r
+        public class HicorderLogicChannelRowChangeEvent : global::System.EventArgs {\r
+            \r
+            private HicorderLogicChannelRow eventRow;\r
+            \r
+            private global::System.Data.DataRowAction eventAction;\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public HicorderLogicChannelRowChangeEvent(HicorderLogicChannelRow row, global::System.Data.DataRowAction action) {\r
+                this.eventRow = row;\r
+                this.eventAction = action;\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public HicorderLogicChannelRow Row {\r
+                get {\r
+                    return this.eventRow;\r
+                }\r
+            }\r
+            \r
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+            public global::System.Data.DataRowAction Action {\r
+                get {\r
+                    return this.eventAction;\r
+                }\r
+            }\r
+        }\r
     }\r
 }\r
 \r

diff --git a/Karinto/Xml/Hioki.cs b/Karinto/Xml/Hioki.cs
index 0fdfc1b..3a16e10 100755 (executable)
--- a/Karinto/Xml/Hioki.cs
+++ b/Karinto/Xml/Hioki.cs
@@ -5,10 +5,20 @@
  *     See license.txt for more information.\r
  */\r
 \r
-namespace Karinto.Xml {\r
+namespace Karinto.Xml\r
+{\r
+\r
+\r
+    public partial class Hioki\r
+    {\r
+        partial class HicorderLogicChannelDataTable\r
+        {\r
+        }\r
     \r
+        partial class HicorderTriggerSettingsDataTable\r
+        {\r
+        }\r
     \r
-    public partial class Hioki {\r
         partial class HicorderAnalogChannelRow\r
         {\r
 \r
@@ -57,18 +67,19 @@ namespace Karinto.Xml {
             }\r
 \r
             public double[] GetArray(Range range)\r
-            { \r
-                int length = (int)range.Last - (int)range.First;\r
+            {\r
+                int first = (int)range.First;\r
+                int length = (int)range.Last - first;\r
                 length += range.ExcludesEnd ? 0 : 1;\r
-                return GetArray((int)range.First, length);\r
+                return GetArray(first, length);\r
             }\r
 \r
             public double[] GetArray(int start, int length)\r
             {\r
-                \r
+\r
                 double[] array = new double[length];\r
                 int src = start;\r
-                for(int i=0;i<length;++i)\r
+                for (int i = 0; i < length; ++i)\r
                 {\r
                     array[i] = converter((Data as short[])[src++]);\r
                 }\r

diff --git a/Karinto/Xml/Hioki.xsd b/Karinto/Xml/Hioki.xsd
index a7f4561..badcefc 100755 (executable)
--- a/Karinto/Xml/Hioki.xsd
+++ b/Karinto/Xml/Hioki.xsd
@@ -9,68 +9,81 @@
       </DataSource>\r
     </xs:appinfo>\r
   </xs:annotation>\r
-  <xs:element name="Hioki" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_DataSetName="Hioki" msprop:Generator_UserDSName="Hioki" msprop:EnableTableAdapterManager="true">\r
+  <xs:element name="Hioki" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="Hioki" msprop:Generator_DataSetName="Hioki" msprop:EnableTableAdapterManager="true">\r
     <xs:complexType>\r
       <xs:choice minOccurs="0" maxOccurs="unbounded">\r
-        <xs:element name="HicorderSettings" msdata:Locale="" msprop:Generator_UserTableName="HicorderSettings" msprop:Generator_RowDeletedName="HicorderSettingsRowDeleted" msprop:Generator_TableClassName="HicorderSettingsDataTable" msprop:Generator_RowChangedName="HicorderSettingsRowChanged" msprop:Generator_RowClassName="HicorderSettingsRow" msprop:Generator_RowChangingName="HicorderSettingsRowChanging" msprop:Generator_RowEvArgName="HicorderSettingsRowChangeEvent" msprop:Generator_RowEvHandlerName="HicorderSettingsRowChangeEventHandler" msprop:Generator_TablePropName="HicorderSettings" msprop:Generator_TableVarName="tableHicorderSettings" msprop:Generator_RowDeletingName="HicorderSettingsRowDeleting">\r
+        <xs:element name="HicorderSettings" msdata:Locale="" msprop:Generator_UserTableName="HicorderSettings" msprop:Generator_RowDeletedName="HicorderSettingsRowDeleted" msprop:Generator_RowChangedName="HicorderSettingsRowChanged" msprop:Generator_RowClassName="HicorderSettingsRow" msprop:Generator_RowChangingName="HicorderSettingsRowChanging" msprop:Generator_RowEvArgName="HicorderSettingsRowChangeEvent" msprop:Generator_RowEvHandlerName="HicorderSettingsRowChangeEventHandler" msprop:Generator_TableClassName="HicorderSettingsDataTable" msprop:Generator_TableVarName="tableHicorderSettings" msprop:Generator_RowDeletingName="HicorderSettingsRowDeleting" msprop:Generator_TablePropName="HicorderSettings">\r
           <xs:complexType>\r
             <xs:sequence>\r
-              <xs:element name="Model" msprop:Generator_UserColumnName="Model" msprop:Generator_ColumnPropNameInRow="Model" msprop:Generator_ColumnVarNameInTable="columnModel" msprop:Generator_ColumnPropNameInTable="ModelColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="RomVersion" msprop:Generator_UserColumnName="RomVersion" msprop:Generator_ColumnPropNameInRow="RomVersion" msprop:Generator_ColumnVarNameInTable="columnRomVersion" msprop:Generator_ColumnPropNameInTable="RomVersionColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="Function" msprop:Generator_UserColumnName="Function" msprop:Generator_ColumnPropNameInRow="Function" msprop:Generator_ColumnVarNameInTable="columnFunction" msprop:Generator_ColumnPropNameInTable="FunctionColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="Shot" msprop:Generator_UserColumnName="Shot" msprop:Generator_ColumnPropNameInRow="Shot" msprop:Generator_ColumnVarNameInTable="columnShot" msprop:Generator_ColumnPropNameInTable="ShotColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="TrigDate" msprop:Generator_UserColumnName="TrigDate" msprop:Generator_ColumnPropNameInRow="TrigDate" msprop:Generator_ColumnVarNameInTable="columnTrigDate" msprop:Generator_ColumnPropNameInTable="TrigDateColumn" type="xs:dateTime" minOccurs="0" />\r
-              <xs:element name="TimePerDiv" msdata:Caption="Time/Div" msprop:Generator_UserColumnName="TimePerDiv" msprop:Generator_ColumnPropNameInRow="TimePerDiv" msprop:Generator_ColumnVarNameInTable="columnTimePerDiv" msprop:Generator_ColumnPropNameInTable="TimePerDivColumn" type="xs:decimal" minOccurs="0" />\r
-              <xs:element name="Expand" msprop:Generator_UserColumnName="Expand" msprop:Generator_ColumnPropNameInRow="Expand" msprop:Generator_ColumnVarNameInTable="columnExpand" msprop:Generator_ColumnPropNameInTable="ExpandColumn" type="xs:int" minOccurs="0" />\r
-              <xs:element name="TrigMode" msprop:Generator_UserColumnName="TrigMode" msprop:Generator_ColumnPropNameInRow="TrigMode" msprop:Generator_ColumnVarNameInTable="columnTrigMode" msprop:Generator_ColumnPropNameInTable="TrigModeColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="TrigSource" msprop:Generator_UserColumnName="TrigSource" msprop:Generator_ColumnPropNameInRow="TrigSource" msprop:Generator_ColumnVarNameInTable="columnTrigSource" msprop:Generator_ColumnPropNameInTable="TrigSourceColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="PreTrig" msprop:Generator_UserColumnName="PreTrig" msprop:Generator_ColumnPropNameInRow="PreTrig" msprop:Generator_ColumnVarNameInTable="columnPreTrig" msprop:Generator_ColumnPropNameInTable="PreTrigColumn" type="xs:double" minOccurs="0" />\r
-              <xs:element name="TimerTrigStart" msprop:Generator_UserColumnName="TimerTrigStart" msprop:Generator_ColumnPropNameInRow="TimerTrigStart" msprop:Generator_ColumnVarNameInTable="columnTimerTrigStart" msprop:Generator_ColumnPropNameInTable="TimerTrigStartColumn" type="xs:dateTime" minOccurs="0" />\r
-              <xs:element name="TimerTrigStop" msprop:Generator_UserColumnName="TimerTrigStop" msprop:Generator_ColumnPropNameInRow="TimerTrigStop" msprop:Generator_ColumnVarNameInTable="columnTimerTrigStop" msprop:Generator_ColumnPropNameInTable="TimerTrigStopColumn" type="xs:dateTime" minOccurs="0" />\r
-              <xs:element name="TimerTrigInterval" msprop:Generator_UserColumnName="TimerTrigInterval" msprop:Generator_ColumnPropNameInRow="TimerTrigInterval" msprop:Generator_ColumnVarNameInTable="columnTimerTrigInterval" msprop:Generator_ColumnPropNameInTable="TimerTrigIntervalColumn" type="xs:duration" minOccurs="0" />\r
-              <xs:element name="ManualTrig" msprop:Generator_UserColumnName="ManualTrig" msprop:Generator_ColumnPropNameInRow="ManualTrig" msprop:Generator_ColumnVarNameInTable="columnManualTrig" msprop:Generator_ColumnPropNameInTable="ManualTrigColumn" type="xs:boolean" minOccurs="0" />\r
-              <xs:element name="ExtTrig" msprop:Generator_UserColumnName="ExtTrig" msprop:Generator_ColumnPropNameInRow="ExtTrig" msprop:Generator_ColumnVarNameInTable="columnExtTrig" msprop:Generator_ColumnPropNameInTable="ExtTrigColumn" type="xs:boolean" minOccurs="0" />\r
-              <xs:element name="UseChannel" msprop:Generator_UserColumnName="UseChannel" msprop:Generator_ColumnPropNameInRow="UseChannel" msprop:Generator_ColumnVarNameInTable="columnUseChannel" msprop:Generator_ColumnPropNameInTable="UseChannelColumn" type="xs:int" minOccurs="0" />\r
-              <xs:element name="TitleSetting" msprop:Generator_UserColumnName="TitleSetting" msprop:Generator_ColumnPropNameInRow="TitleSetting" msprop:Generator_ColumnVarNameInTable="columnTitleSetting" msprop:Generator_ColumnPropNameInTable="TitleSettingColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="Title" msprop:Generator_UserColumnName="Title" msprop:Generator_ColumnPropNameInRow="Title" msprop:Generator_ColumnVarNameInTable="columnTitle" msprop:Generator_ColumnPropNameInTable="TitleColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="CommentSetting" msprop:Generator_UserColumnName="CommentSetting" msprop:Generator_ColumnPropNameInRow="CommentSetting" msprop:Generator_ColumnVarNameInTable="columnCommentSetting" msprop:Generator_ColumnPropNameInTable="CommentSettingColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="SavedAnalogChannel" msprop:Generator_UserColumnName="SavedAnalogChannel" msprop:Generator_ColumnPropNameInRow="SavedAnalogChannel" msprop:Generator_ColumnVarNameInTable="columnSavedAnalogChannel" msprop:Generator_ColumnPropNameInTable="SavedAnalogChannelColumn" type="xs:int" minOccurs="0" />\r
-              <xs:element name="SavedLogicUnit" msprop:Generator_UserColumnName="SavedLogicUnit" msprop:Generator_ColumnPropNameInRow="SavedLogicUnit" msprop:Generator_ColumnVarNameInTable="columnSavedLogicUnit" msprop:Generator_ColumnPropNameInTable="SavedLogicUnitColumn" type="xs:int" minOccurs="0" />\r
+              <xs:element name="Model" msprop:Generator_UserColumnName="Model" msprop:Generator_ColumnVarNameInTable="columnModel" msprop:Generator_ColumnPropNameInRow="Model" msprop:Generator_ColumnPropNameInTable="ModelColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="RomVersion" msprop:Generator_UserColumnName="RomVersion" msprop:Generator_ColumnVarNameInTable="columnRomVersion" msprop:Generator_ColumnPropNameInRow="RomVersion" msprop:Generator_ColumnPropNameInTable="RomVersionColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Function" msprop:Generator_UserColumnName="Function" msprop:Generator_ColumnVarNameInTable="columnFunction" msprop:Generator_ColumnPropNameInRow="Function" msprop:Generator_ColumnPropNameInTable="FunctionColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Shot" msprop:Generator_UserColumnName="Shot" msprop:Generator_ColumnVarNameInTable="columnShot" msprop:Generator_ColumnPropNameInRow="Shot" msprop:Generator_ColumnPropNameInTable="ShotColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="TrigDate" msprop:Generator_UserColumnName="TrigDate" msprop:Generator_ColumnVarNameInTable="columnTrigDate" msprop:Generator_ColumnPropNameInRow="TrigDate" msprop:Generator_ColumnPropNameInTable="TrigDateColumn" type="xs:dateTime" minOccurs="0" />\r
+              <xs:element name="TimePerDiv" msdata:Caption="Time/Div" msprop:Generator_UserColumnName="TimePerDiv" msprop:Generator_ColumnVarNameInTable="columnTimePerDiv" msprop:Generator_ColumnPropNameInRow="TimePerDiv" msprop:Generator_ColumnPropNameInTable="TimePerDivColumn" type="xs:decimal" minOccurs="0" />\r
+              <xs:element name="Expand" msprop:Generator_UserColumnName="Expand" msprop:Generator_ColumnVarNameInTable="columnExpand" msprop:Generator_ColumnPropNameInRow="Expand" msprop:Generator_ColumnPropNameInTable="ExpandColumn" type="xs:int" minOccurs="0" />\r
+              <xs:element name="TrigMode" msprop:Generator_UserColumnName="TrigMode" msprop:Generator_ColumnVarNameInTable="columnTrigMode" msprop:Generator_ColumnPropNameInRow="TrigMode" msprop:Generator_ColumnPropNameInTable="TrigModeColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="TrigSource" msprop:Generator_UserColumnName="TrigSource" msprop:Generator_ColumnVarNameInTable="columnTrigSource" msprop:Generator_ColumnPropNameInRow="TrigSource" msprop:Generator_ColumnPropNameInTable="TrigSourceColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="PreTrig" msprop:Generator_UserColumnName="PreTrig" msprop:Generator_ColumnVarNameInTable="columnPreTrig" msprop:Generator_ColumnPropNameInRow="PreTrig" msprop:Generator_ColumnPropNameInTable="PreTrigColumn" type="xs:double" minOccurs="0" />\r
+              <xs:element name="TimerTrigStart" msprop:Generator_UserColumnName="TimerTrigStart" msprop:Generator_ColumnVarNameInTable="columnTimerTrigStart" msprop:Generator_ColumnPropNameInRow="TimerTrigStart" msprop:Generator_ColumnPropNameInTable="TimerTrigStartColumn" type="xs:dateTime" minOccurs="0" />\r
+              <xs:element name="TimerTrigStop" msprop:Generator_UserColumnName="TimerTrigStop" msprop:Generator_ColumnVarNameInTable="columnTimerTrigStop" msprop:Generator_ColumnPropNameInRow="TimerTrigStop" msprop:Generator_ColumnPropNameInTable="TimerTrigStopColumn" type="xs:dateTime" minOccurs="0" />\r
+              <xs:element name="TimerTrigInterval" msprop:Generator_UserColumnName="TimerTrigInterval" msprop:Generator_ColumnVarNameInTable="columnTimerTrigInterval" msprop:Generator_ColumnPropNameInRow="TimerTrigInterval" msprop:Generator_ColumnPropNameInTable="TimerTrigIntervalColumn" type="xs:duration" minOccurs="0" />\r
+              <xs:element name="ManualTrig" msprop:Generator_UserColumnName="ManualTrig" msprop:Generator_ColumnVarNameInTable="columnManualTrig" msprop:Generator_ColumnPropNameInRow="ManualTrig" msprop:Generator_ColumnPropNameInTable="ManualTrigColumn" type="xs:boolean" minOccurs="0" />\r
+              <xs:element name="ExtTrig" msprop:Generator_UserColumnName="ExtTrig" msprop:Generator_ColumnVarNameInTable="columnExtTrig" msprop:Generator_ColumnPropNameInRow="ExtTrig" msprop:Generator_ColumnPropNameInTable="ExtTrigColumn" type="xs:boolean" minOccurs="0" />\r
+              <xs:element name="UseChannel" msprop:Generator_UserColumnName="UseChannel" msprop:Generator_ColumnVarNameInTable="columnUseChannel" msprop:Generator_ColumnPropNameInRow="UseChannel" msprop:Generator_ColumnPropNameInTable="UseChannelColumn" type="xs:int" minOccurs="0" />\r
+              <xs:element name="TitleSetting" msprop:Generator_UserColumnName="TitleSetting" msprop:Generator_ColumnVarNameInTable="columnTitleSetting" msprop:Generator_ColumnPropNameInRow="TitleSetting" msprop:Generator_ColumnPropNameInTable="TitleSettingColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Title" msprop:Generator_UserColumnName="Title" msprop:Generator_ColumnVarNameInTable="columnTitle" msprop:Generator_ColumnPropNameInRow="Title" msprop:Generator_ColumnPropNameInTable="TitleColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="CommentSetting" msprop:Generator_UserColumnName="CommentSetting" msprop:Generator_ColumnVarNameInTable="columnCommentSetting" msprop:Generator_ColumnPropNameInRow="CommentSetting" msprop:Generator_ColumnPropNameInTable="CommentSettingColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="SavedAnalogChannel" msprop:Generator_UserColumnName="SavedAnalogChannel" msprop:Generator_ColumnVarNameInTable="columnSavedAnalogChannel" msprop:Generator_ColumnPropNameInRow="SavedAnalogChannel" msprop:Generator_ColumnPropNameInTable="SavedAnalogChannelColumn" type="xs:int" minOccurs="0" />\r
+              <xs:element name="SavedLogicUnit" msprop:Generator_UserColumnName="SavedLogicUnit" msprop:Generator_ColumnVarNameInTable="columnSavedLogicUnit" msprop:Generator_ColumnPropNameInRow="SavedLogicUnit" msprop:Generator_ColumnPropNameInTable="SavedLogicUnitColumn" type="xs:int" minOccurs="0" />\r
             </xs:sequence>\r
           </xs:complexType>\r
         </xs:element>\r
-        <xs:element name="HicorderAnalogChannel" msprop:Generator_UserTableName="HicorderAnalogChannel" msprop:Generator_RowDeletedName="HicorderAnalogChannelRowDeleted" msprop:Generator_TableClassName="HicorderAnalogChannelDataTable" msprop:Generator_RowChangedName="HicorderAnalogChannelRowChanged" msprop:Generator_RowClassName="HicorderAnalogChannelRow" msprop:Generator_RowChangingName="HicorderAnalogChannelRowChanging" msprop:Generator_RowEvArgName="HicorderAnalogChannelRowChangeEvent" msprop:Generator_RowEvHandlerName="HicorderAnalogChannelRowChangeEventHandler" msprop:Generator_TablePropName="HicorderAnalogChannel" msprop:Generator_TableVarName="tableHicorderAnalogChannel" msprop:Generator_RowDeletingName="HicorderAnalogChannelRowDeleting">\r
+        <xs:element name="HicorderAnalogChannel" msprop:Generator_UserTableName="HicorderAnalogChannel" msprop:Generator_RowDeletedName="HicorderAnalogChannelRowDeleted" msprop:Generator_RowChangedName="HicorderAnalogChannelRowChanged" msprop:Generator_RowClassName="HicorderAnalogChannelRow" msprop:Generator_RowChangingName="HicorderAnalogChannelRowChanging" msprop:Generator_RowEvArgName="HicorderAnalogChannelRowChangeEvent" msprop:Generator_RowEvHandlerName="HicorderAnalogChannelRowChangeEventHandler" msprop:Generator_TableClassName="HicorderAnalogChannelDataTable" msprop:Generator_TableVarName="tableHicorderAnalogChannel" msprop:Generator_RowDeletingName="HicorderAnalogChannelRowDeleting" msprop:Generator_TablePropName="HicorderAnalogChannel">\r
           <xs:complexType>\r
             <xs:sequence>\r
-              <xs:element name="Channel" msprop:Generator_UserColumnName="Channel" msprop:Generator_ColumnPropNameInRow="Channel" msprop:Generator_ColumnVarNameInTable="columnChannel" msprop:Generator_ColumnPropNameInTable="ChannelColumn" type="xs:int" />\r
-              <xs:element name="Unit" msprop:Generator_UserColumnName="Unit" msprop:Generator_ColumnPropNameInRow="Unit" msprop:Generator_ColumnVarNameInTable="columnUnit" msprop:Generator_ColumnPropNameInTable="UnitColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="Resolution" msprop:Generator_UserColumnName="Resolution" msprop:Generator_ColumnPropNameInRow="Resolution" msprop:Generator_ColumnVarNameInTable="columnResolution" msprop:Generator_ColumnPropNameInTable="ResolutionColumn" type="xs:int" minOccurs="0" />\r
-              <xs:element name="Mode" msprop:Generator_UserColumnName="Mode" msprop:Generator_ColumnPropNameInRow="Mode" msprop:Generator_ColumnVarNameInTable="columnMode" msprop:Generator_ColumnPropNameInTable="ModeColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="Range" msprop:Generator_UserColumnName="Range" msprop:Generator_ColumnPropNameInRow="Range" msprop:Generator_ColumnVarNameInTable="columnRange" msprop:Generator_ColumnPropNameInTable="RangeColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="Position" msprop:Generator_UserColumnName="Position" msprop:Generator_ColumnPropNameInRow="Position" msprop:Generator_ColumnVarNameInTable="columnPosition" msprop:Generator_ColumnPropNameInTable="PositionColumn" type="xs:int" minOccurs="0" />\r
-              <xs:element name="LPF" msprop:Generator_UserColumnName="LPF" msprop:Generator_ColumnPropNameInRow="LPF" msprop:Generator_ColumnVarNameInTable="columnLPF" msprop:Generator_ColumnPropNameInTable="LPFColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="AAF" msprop:Generator_UserColumnName="AAF" msprop:Generator_ColumnPropNameInRow="AAF" msprop:Generator_ColumnVarNameInTable="columnAAF" msprop:Generator_ColumnPropNameInTable="AAFColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="Coupling" msprop:Generator_UserColumnName="Coupling" msprop:Generator_ColumnPropNameInRow="Coupling" msprop:Generator_ColumnVarNameInTable="columnCoupling" msprop:Generator_ColumnPropNameInTable="CouplingColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="Trig" msprop:Generator_UserColumnName="Trig" msprop:Generator_ColumnPropNameInRow="Trig" msprop:Generator_ColumnVarNameInTable="columnTrig" msprop:Generator_ColumnPropNameInTable="TrigColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="TrigSetting" msprop:Generator_UserColumnName="TrigSetting" msprop:Generator_ColumnPropNameInRow="TrigSetting" msprop:Generator_ColumnVarNameInTable="columnTrigSetting" msprop:Generator_ColumnPropNameInTable="TrigSettingColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="Comment" msprop:Generator_UserColumnName="Comment" msprop:Generator_ColumnPropNameInRow="Comment" msprop:Generator_ColumnVarNameInTable="columnComment" msprop:Generator_ColumnPropNameInTable="CommentColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="Scaling" msprop:Generator_UserColumnName="Scaling" msprop:Generator_ColumnPropNameInRow="Scaling" msprop:Generator_ColumnVarNameInTable="columnScaling" msprop:Generator_ColumnPropNameInTable="ScalingColumn" type="xs:boolean" minOccurs="0" />\r
-              <xs:element name="ScalingEu" msdata:Caption="Scaling eu" msprop:Generator_UserColumnName="ScalingEu" msprop:Generator_ColumnPropNameInRow="ScalingEu" msprop:Generator_ColumnVarNameInTable="columnScalingEu" msprop:Generator_ColumnPropNameInTable="ScalingEuColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="ScalingEuPerV" msdata:Caption="Scaling EU/V" msprop:Generator_UserColumnName="ScalingEuPerV" msprop:Generator_ColumnPropNameInRow="ScalingEuPerV" msprop:Generator_ColumnVarNameInTable="columnScalingEuPerV" msprop:Generator_ColumnPropNameInTable="ScalingEuPerVColumn" type="xs:double" minOccurs="0" />\r
-              <xs:element name="ScalingOffset" msprop:Generator_UserColumnName="ScalingOffset" msprop:Generator_ColumnPropNameInRow="ScalingOffset" msprop:Generator_ColumnVarNameInTable="columnScalingOffset" msprop:Generator_ColumnPropNameInTable="ScalingOffsetColumn" type="xs:double" minOccurs="0" />\r
-              <xs:element name="Variable" msprop:Generator_UserColumnName="Variable" msprop:Generator_ColumnPropNameInRow="Variable" msprop:Generator_ColumnVarNameInTable="columnVariable" msprop:Generator_ColumnPropNameInTable="VariableColumn" type="xs:boolean" minOccurs="0" />\r
-              <xs:element name="VariableUpper" msprop:Generator_UserColumnName="VariableUpper" msprop:Generator_ColumnPropNameInRow="VariableUpper" msprop:Generator_ColumnVarNameInTable="columnVariableUpper" msprop:Generator_ColumnPropNameInTable="VariableUpperColumn" type="xs:double" minOccurs="0" />\r
-              <xs:element name="VariableLower" msprop:Generator_UserColumnName="VariableLower" msprop:Generator_ColumnPropNameInRow="VariableLower" msprop:Generator_ColumnVarNameInTable="columnVariableLower" msprop:Generator_ColumnPropNameInTable="VariableLowerColumn" type="xs:double" minOccurs="0" />\r
-              <xs:element name="Vernier" msprop:Generator_UserColumnName="Vernier" msprop:Generator_ColumnPropNameInRow="Vernier" msprop:Generator_ColumnVarNameInTable="columnVernier" msprop:Generator_ColumnPropNameInTable="VernierColumn" type="xs:int" minOccurs="0" />\r
-              <xs:element name="Expand" msprop:Generator_UserColumnName="Expand" msprop:Generator_ColumnPropNameInRow="Expand" msprop:Generator_ColumnVarNameInTable="columnExpand" msprop:Generator_ColumnPropNameInTable="ExpandColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="Graph" msprop:Generator_UserColumnName="Graph" msprop:Generator_ColumnPropNameInRow="Graph" msprop:Generator_ColumnVarNameInTable="columnGraph" msprop:Generator_ColumnPropNameInTable="GraphColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="Calcurate" msprop:Generator_UserColumnName="Calcurate" msprop:Generator_ColumnPropNameInRow="Calcurate" msprop:Generator_ColumnVarNameInTable="columnCalcurate" msprop:Generator_ColumnPropNameInTable="CalcurateColumn" type="xs:string" minOccurs="0" />\r
-              <xs:element name="MeasurementScale" msprop:Generator_UserColumnName="MeasurementScale" msprop:Generator_ColumnPropNameInRow="MeasurementScale" msprop:Generator_ColumnVarNameInTable="columnMeasurementScale" msprop:Generator_ColumnPropNameInTable="MeasurementScaleColumn" type="xs:double" minOccurs="0" />\r
-              <xs:element name="MeasurementOffset" msprop:Generator_UserColumnName="MeasurementOffset" msprop:Generator_ColumnPropNameInRow="MeasurementOffset" msprop:Generator_ColumnVarNameInTable="columnMeasurementOffset" msprop:Generator_ColumnPropNameInTable="MeasurementOffsetColumn" type="xs:double" minOccurs="0" />\r
-              <xs:element name="Data" msdata:DataType="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" msprop:Generator_UserColumnName="Data" msprop:Generator_ColumnPropNameInRow="Data" msprop:Generator_ColumnVarNameInTable="columnData" msprop:Generator_ColumnPropNameInTable="DataColumn" type="xs:anyType" minOccurs="0" />\r
+              <xs:element name="Channel" msprop:Generator_UserColumnName="Channel" msprop:Generator_ColumnVarNameInTable="columnChannel" msprop:Generator_ColumnPropNameInRow="Channel" msprop:Generator_ColumnPropNameInTable="ChannelColumn" type="xs:int" />\r
+              <xs:element name="Unit" msprop:Generator_UserColumnName="Unit" msprop:Generator_ColumnVarNameInTable="columnUnit" msprop:Generator_ColumnPropNameInRow="Unit" msprop:Generator_ColumnPropNameInTable="UnitColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Resolution" msprop:Generator_UserColumnName="Resolution" msprop:Generator_ColumnVarNameInTable="columnResolution" msprop:Generator_ColumnPropNameInRow="Resolution" msprop:Generator_ColumnPropNameInTable="ResolutionColumn" type="xs:int" minOccurs="0" />\r
+              <xs:element name="Mode" msprop:Generator_UserColumnName="Mode" msprop:Generator_ColumnVarNameInTable="columnMode" msprop:Generator_ColumnPropNameInRow="Mode" msprop:Generator_ColumnPropNameInTable="ModeColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Range" msprop:Generator_UserColumnName="Range" msprop:Generator_ColumnVarNameInTable="columnRange" msprop:Generator_ColumnPropNameInRow="Range" msprop:Generator_ColumnPropNameInTable="RangeColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Position" msprop:Generator_UserColumnName="Position" msprop:Generator_ColumnVarNameInTable="columnPosition" msprop:Generator_ColumnPropNameInRow="Position" msprop:Generator_ColumnPropNameInTable="PositionColumn" type="xs:int" minOccurs="0" />\r
+              <xs:element name="LPF" msprop:Generator_UserColumnName="LPF" msprop:Generator_ColumnVarNameInTable="columnLPF" msprop:Generator_ColumnPropNameInRow="LPF" msprop:Generator_ColumnPropNameInTable="LPFColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="AAF" msprop:Generator_UserColumnName="AAF" msprop:Generator_ColumnVarNameInTable="columnAAF" msprop:Generator_ColumnPropNameInRow="AAF" msprop:Generator_ColumnPropNameInTable="AAFColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Coupling" msprop:Generator_UserColumnName="Coupling" msprop:Generator_ColumnVarNameInTable="columnCoupling" msprop:Generator_ColumnPropNameInRow="Coupling" msprop:Generator_ColumnPropNameInTable="CouplingColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Trig" msprop:Generator_UserColumnName="Trig" msprop:Generator_ColumnVarNameInTable="columnTrig" msprop:Generator_ColumnPropNameInRow="Trig" msprop:Generator_ColumnPropNameInTable="TrigColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="TrigSetting" msprop:Generator_UserColumnName="TrigSetting" msprop:Generator_ColumnVarNameInTable="columnTrigSetting" msprop:Generator_ColumnPropNameInRow="TrigSetting" msprop:Generator_ColumnPropNameInTable="TrigSettingColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Comment" msprop:Generator_UserColumnName="Comment" msprop:Generator_ColumnVarNameInTable="columnComment" msprop:Generator_ColumnPropNameInRow="Comment" msprop:Generator_ColumnPropNameInTable="CommentColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Scaling" msprop:Generator_UserColumnName="Scaling" msprop:Generator_ColumnVarNameInTable="columnScaling" msprop:Generator_ColumnPropNameInRow="Scaling" msprop:Generator_ColumnPropNameInTable="ScalingColumn" type="xs:boolean" minOccurs="0" />\r
+              <xs:element name="ScalingEu" msdata:Caption="Scaling eu" msprop:Generator_UserColumnName="ScalingEu" msprop:Generator_ColumnVarNameInTable="columnScalingEu" msprop:Generator_ColumnPropNameInRow="ScalingEu" msprop:Generator_ColumnPropNameInTable="ScalingEuColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="ScalingEuPerV" msdata:Caption="Scaling EU/V" msprop:Generator_UserColumnName="ScalingEuPerV" msprop:Generator_ColumnVarNameInTable="columnScalingEuPerV" msprop:Generator_ColumnPropNameInRow="ScalingEuPerV" msprop:Generator_ColumnPropNameInTable="ScalingEuPerVColumn" type="xs:double" minOccurs="0" />\r
+              <xs:element name="ScalingOffset" msprop:Generator_UserColumnName="ScalingOffset" msprop:Generator_ColumnVarNameInTable="columnScalingOffset" msprop:Generator_ColumnPropNameInRow="ScalingOffset" msprop:Generator_ColumnPropNameInTable="ScalingOffsetColumn" type="xs:double" minOccurs="0" />\r
+              <xs:element name="Variable" msprop:Generator_UserColumnName="Variable" msprop:Generator_ColumnVarNameInTable="columnVariable" msprop:Generator_ColumnPropNameInRow="Variable" msprop:Generator_ColumnPropNameInTable="VariableColumn" type="xs:boolean" minOccurs="0" />\r
+              <xs:element name="VariableUpper" msprop:Generator_UserColumnName="VariableUpper" msprop:Generator_ColumnVarNameInTable="columnVariableUpper" msprop:Generator_ColumnPropNameInRow="VariableUpper" msprop:Generator_ColumnPropNameInTable="VariableUpperColumn" type="xs:double" minOccurs="0" />\r
+              <xs:element name="VariableLower" msprop:Generator_UserColumnName="VariableLower" msprop:Generator_ColumnVarNameInTable="columnVariableLower" msprop:Generator_ColumnPropNameInRow="VariableLower" msprop:Generator_ColumnPropNameInTable="VariableLowerColumn" type="xs:double" minOccurs="0" />\r
+              <xs:element name="Vernier" msprop:Generator_UserColumnName="Vernier" msprop:Generator_ColumnVarNameInTable="columnVernier" msprop:Generator_ColumnPropNameInRow="Vernier" msprop:Generator_ColumnPropNameInTable="VernierColumn" type="xs:double" minOccurs="0" />\r
+              <xs:element name="Expand" msprop:Generator_UserColumnName="Expand" msprop:Generator_ColumnVarNameInTable="columnExpand" msprop:Generator_ColumnPropNameInRow="Expand" msprop:Generator_ColumnPropNameInTable="ExpandColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Graph" msprop:Generator_UserColumnName="Graph" msprop:Generator_ColumnVarNameInTable="columnGraph" msprop:Generator_ColumnPropNameInRow="Graph" msprop:Generator_ColumnPropNameInTable="GraphColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Calcurate" msprop:Generator_UserColumnName="Calcurate" msprop:Generator_ColumnVarNameInTable="columnCalcurate" msprop:Generator_ColumnPropNameInRow="Calcurate" msprop:Generator_ColumnPropNameInTable="CalcurateColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="MeasurementScale" msprop:Generator_UserColumnName="MeasurementScale" msprop:Generator_ColumnVarNameInTable="columnMeasurementScale" msprop:Generator_ColumnPropNameInRow="MeasurementScale" msprop:Generator_ColumnPropNameInTable="MeasurementScaleColumn" type="xs:double" minOccurs="0" />\r
+              <xs:element name="MeasurementOffset" msprop:Generator_UserColumnName="MeasurementOffset" msprop:Generator_ColumnVarNameInTable="columnMeasurementOffset" msprop:Generator_ColumnPropNameInRow="MeasurementOffset" msprop:Generator_ColumnPropNameInTable="MeasurementOffsetColumn" type="xs:double" minOccurs="0" />\r
+              <xs:element name="Data" msprop:Generator_UserColumnName="Data" msprop:Generator_ColumnVarNameInTable="columnData" msprop:Generator_ColumnPropNameInRow="Data" msprop:Generator_ColumnPropNameInTable="DataColumn" type="xs:anyType" minOccurs="0" />\r
             </xs:sequence>\r
           </xs:complexType>\r
         </xs:element>\r
+        <xs:element name="HicorderTriggerSettings" msprop:Generator_UserTableName="HicorderTriggerSettings" msprop:Generator_RowDeletedName="HicorderTriggerSettingsRowDeleted" msprop:Generator_TableClassName="HicorderTriggerSettingsDataTable" msprop:Generator_RowChangedName="HicorderTriggerSettingsRowChanged" msprop:Generator_RowClassName="HicorderTriggerSettingsRow" msprop:Generator_RowChangingName="HicorderTriggerSettingsRowChanging" msprop:Generator_RowEvArgName="HicorderTriggerSettingsRowChangeEvent" msprop:Generator_RowEvHandlerName="HicorderTriggerSettingsRowChangeEventHandler" msprop:Generator_TablePropName="HicorderTriggerSettings" msprop:Generator_TableVarName="tableHicorderTriggerSettings" msprop:Generator_RowDeletingName="HicorderTriggerSettingsRowDeleting">\r
+          <xs:complexType>\r
+            <xs:sequence>\r
+              <xs:element name="Level" msprop:Generator_UserColumnName="Level" msprop:Generator_ColumnPropNameInRow="Level" msprop:Generator_ColumnVarNameInTable="columnLevel" msprop:Generator_ColumnPropNameInTable="LevelColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Slope" msprop:Generator_UserColumnName="Slope" msprop:Generator_ColumnPropNameInRow="Slope" msprop:Generator_ColumnVarNameInTable="columnSlope" msprop:Generator_ColumnPropNameInTable="SlopeColumn" type="xs:string" minOccurs="0" />\r
+              <xs:element name="Filter" msprop:Generator_UserColumnName="Filter" msprop:Generator_ColumnPropNameInRow="Filter" msprop:Generator_ColumnVarNameInTable="columnFilter" msprop:Generator_ColumnPropNameInTable="FilterColumn" type="xs:string" minOccurs="0" />\r
+            </xs:sequence>\r
+          </xs:complexType>\r
+        </xs:element>\r
+        <xs:element name="HicorderLogicChannel" msprop:Generator_UserTableName="HicorderLogicChannel" msprop:Generator_RowDeletedName="HicorderLogicChannelRowDeleted" msprop:Generator_TableClassName="HicorderLogicChannelDataTable" msprop:Generator_RowChangedName="HicorderLogicChannelRowChanged" msprop:Generator_RowClassName="HicorderLogicChannelRow" msprop:Generator_RowChangingName="HicorderLogicChannelRowChanging" msprop:Generator_RowEvArgName="HicorderLogicChannelRowChangeEvent" msprop:Generator_RowEvHandlerName="HicorderLogicChannelRowChangeEventHandler" msprop:Generator_TablePropName="HicorderLogicChannel" msprop:Generator_TableVarName="tableHicorderLogicChannel" msprop:Generator_RowDeletingName="HicorderLogicChannelRowDeleting">\r
+          <xs:complexType>\r
+          </xs:complexType>\r
+        </xs:element>\r
       </xs:choice>\r
     </xs:complexType>\r
     <xs:unique name="Constraint1" msdata:PrimaryKey="true">\r

diff --git a/Karinto/Xml/Hioki.xss b/Karinto/Xml/Hioki.xss
index 9c42c48..3c58641 100755 (executable)
--- a/Karinto/Xml/Hioki.xss
+++ b/Karinto/Xml/Hioki.xss
@@ -4,10 +4,12 @@
      Changes to this file may cause incorrect behavior and will be lost if\r
      the code is regenerated.\r
 </autogenerated>-->\r
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">\r
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="66" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">\r
   <Shapes>\r
-    <Shape ID="DesignTable:HicorderSettings" ZOrder="2" X="180" Y="259" Height="205" Width="182" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="201" />\r
-    <Shape ID="DesignTable:HicorderAnalogChannel" ZOrder="1" X="463" Y="212" Height="415" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="411" />\r
+    <Shape ID="DesignTable:HicorderSettings" ZOrder="4" X="21" Y="95" Height="341" Width="156" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="337" />\r
+    <Shape ID="DesignTable:HicorderAnalogChannel" ZOrder="3" X="198" Y="93" Height="415" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="411" />\r
+    <Shape ID="DesignTable:HicorderTriggerSettings" ZOrder="2" X="192" Y="531" Height="71" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="67" />\r
+    <Shape ID="DesignTable:HicorderLogicChannel" ZOrder="1" X="420" Y="95" Height="56" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="52" />\r
   </Shapes>\r
   <Connectors />\r
 </DiagramLayout>
\ No newline at end of file

diff --git a/KarintoTest/Resources/hioki.mem b/KarintoTest/Resources/hioki.mem
index a5b454a..cff3955 100755 (executable)
Binary files a/KarintoTest/Resources/hioki.mem and b/KarintoTest/Resources/hioki.mem differ