Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev

OTSIncAMeasureApp/0-OTSModel/OTSDataType/otsdataconst.cs

@@ -9,8 +9,6 @@ namespace OTSDataType
 {
     public class otsdataconst
     {
-
-
         // minimum double enter
         public const double MIN_ENTER_VALUE = 0.000001;
 
@@ -69,11 +67,11 @@ namespace OTSDataType
         public const int RESOLUTION_ID_FIRST_TIE = 0;
         //const CSize RESOLUTION_VALUE[RESOLUTION_ID_MAX] = { CSize(1024, 704), CSize(2048, 1408), CSize(3072, 2048),
         //CSize(1024,884), CSize(2048, 1768), CSize(1024, 640),CSize(1024,768) };
-        //const CString RESOLUTION_STRINGS[RESOLUTION_ID_MAX] = { _T("1024 X 704"), _T("2048 X 1408"), _T("3072 X 2048"),
+        //const CString RESOLUTION_STRINGS[RESOLUTION_ID_MAX] = { _T("1024 X 704"), _T("2048 X 1408"), _T("3072 X 2048"),256192
         //_T("1024 X 884"), _T("2048 X 1768"), _T("1024 X 640") ,_T("1024 X 768")};
-        public static readonly Size[] RESOLUTION_VALUE = { new Size(1024, 704), new Size(2048, 1408), new Size(3072, 2048), new Size(512, 384), new Size(1024, 768), new Size(2048, 1536), new Size(4096, 3072) };
+        public static readonly Size[] RESOLUTION_VALUE = { new Size(512, 384), new Size(1024, 704), new Size(1024, 768), new Size(2048, 1408), new Size(2048, 1536), new Size(3072, 2048),new Size(4096, 3072) };
 
-        public static readonly string[] RESOLUTION_STRINGS = { "1024 X 704", "2048 X 1408", "3072 X 2048", "512 X 384", "1024 X 768", "2048 X 1536", "4096 X 3072" };
+        public static readonly string[] RESOLUTION_STRINGS = { "512 X 384", "1024 X 704", "1024 X 768", "2048 X 1408",  "2048 X 1536", "3072 X 2048",  "4096 X 3072" };
 
         // image parameter
         public const int STOP_PARAM_PARTICLE_MIN = 0;
@@ -256,7 +254,9 @@ namespace OTSDataType
             TIE3 = 2,
             TIE4 = 3,
             TIE5 = 4,
-            MAX = 4
+            TIE6 = 5,
+            TIE7=6,
+            MAX = 6
         }
 
 

OTSIncAReportApp/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -314,77 +314,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     dr["ColName6"] = list_max_elementname[5];
                     dr["ColVal6"] = list_max_elementvale[5].ToString();
 
-                    ////找第1个元素
-                    //if (str_element.Split(';').Count() > 0 && str_element.Split(';')[0] != "")
-                    //{
-                    //    dr["ColName1"] = str_element.Split(';')[0].Split('-')[0];
-                    //    dr["ColVal1"] = Math.Round(Convert.ToDouble(str_element.Split(';')[0].Split('-')[1]), 3);
-                    //}
-                    //else
-                    //{
-                    //    dr["ColName1"] = "";
-                    //    dr["ColVal1"] = "";
-                    //}
-
-                    ////找第2个元素
-                    //if (str_element.Split(';').Count() > 1 && str_element.Split(';')[1] != "")
-                    //{
-                    //    dr["ColName2"] = str_element.Split(';')[1].Split('-')[0];
-                    //    dr["ColVal2"] = Math.Round(Convert.ToDouble(str_element.Split(';')[1].Split('-')[1]), 3);
-                    //}
-                    //else
-                    //{
-                    //    dr["ColName2"] = "";
-                    //    dr["ColVal2"] = "";
-                    //}
-
-                    ////找第3个元素
-                    //if (str_element.Split(';').Count() > 2 && str_element.Split(';')[2] != "")
-                    //{
-                    //    dr["ColName3"] = str_element.Split(';')[2].Split('-')[0];
-                    //    dr["ColVal3"] = Math.Round(Convert.ToDouble(str_element.Split(';')[2].Split('-')[1]), 3);
-                    //}
-                    //else
-                    //{
-                    //    dr["ColName3"] = "";
-                    //    dr["ColVal3"] = "";
-                    //}
-
-                    ////找第4个元素
-                    //if (str_element.Split(';').Count() > 3 && str_element.Split(';')[3] != "")
-                    //{
-                    //    dr["ColName4"] = str_element.Split(';')[3].Split('-')[0];
-                    //    dr["ColVal4"] = Math.Round(Convert.ToDouble(str_element.Split(';')[3].Split('-')[1]), 3);
-                    //}
-                    //else
-                    //{
-                    //    dr["ColName4"] = "";
-                    //    dr["ColVal4"] = "";
-                    //}
-
-                    ////找第5个元素
-                    //if (str_element.Split(';').Count() > 4 && str_element.Split(';')[4] != "")
-                    //{
-                    //    dr["ColName5"] = str_element.Split(';')[4].Split('-')[0];
-                    //    dr["ColVal5"] = Math.Round(Convert.ToDouble(str_element.Split(';')[4].Split('-')[1]), 3);
-                    //}
-                    //else
-                    //{
-                    //    dr["ColName5"] = "";
-                    //    dr["ColVal5"] = "";
-                    //}
-
-                    ////找第6个元素
-                    //if (str_element.Split(';').Count() > 5 && str_element.Split(';')[5] != "")
-                    //{
-                    //    dr["ColName6"] = str_element.Split(';')[5].Split('-')[0];
-                    //    dr["ColVal6"] = Math.Round(Convert.ToDouble(str_element.Split(';')[5].Split('-')[1]), 3);
-                    //}
-                    //else
-                    //{
-                    //    dr["ColName6"] = "";
-                    //    dr["ColVal6"] = "";
-                    //}
+                   
                     DT_Largest20.Rows.Add(dr);
                 }
             }
@@ -514,77 +444,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 dr["ColName6"] = list_max_elementname[5];
                 dr["ColVal6"] = list_max_elementvale[5].ToString();
 
-                ////找第1个元素
-                //if (str_element.Split(';').Count() > 0 && str_element.Split(';')[0] != "")
-                //{
-                //    dr["ColName1"] = str_element.Split(';')[0].Split('-')[0];
-                //    dr["ColVal1"] = Math.Round(Convert.ToDouble(str_element.Split(';')[0].Split('-')[1]), 3);
-                //}
-                //else
-                //{
-                //    dr["ColName1"] = "";
-                //    dr["ColVal1"] = "";
-                //}
-
-                ////找第2个元素
-                //if (str_element.Split(';').Count() > 1 && str_element.Split(';')[1] != "")
-                //{
-                //    dr["ColName2"] = str_element.Split(';')[1].Split('-')[0];
-                //    dr["ColVal2"] = Math.Round(Convert.ToDouble(str_element.Split(';')[1].Split('-')[1]), 3);
-                //}
-                //else
-                //{
-                //    dr["ColName2"] = "";
-                //    dr["ColVal2"] = "";
-                //}
-
-                ////找第3个元素
-                //if (str_element.Split(';').Count() > 2 && str_element.Split(';')[2] != "")
-                //{
-                //    dr["ColName3"] = str_element.Split(';')[2].Split('-')[0];
-                //    dr["ColVal3"] = Math.Round(Convert.ToDouble(str_element.Split(';')[2].Split('-')[1]), 3);
-                //}
-                //else
-                //{
-                //    dr["ColName3"] = "";
-                //    dr["ColVal3"] = "";
-                //}
-
-                ////找第4个元素
-                //if (str_element.Split(';').Count() > 3 && str_element.Split(';')[3] != "")
-                //{
-                //    dr["ColName4"] = str_element.Split(';')[3].Split('-')[0];
-                //    dr["ColVal4"] = Math.Round(Convert.ToDouble(str_element.Split(';')[3].Split('-')[1]), 3);
-                //}
-                //else
-                //{
-                //    dr["ColName4"] = "";
-                //    dr["ColVal4"] = "";
-                //}
-
-                ////找第5个元素
-                //if (str_element.Split(';').Count() > 4 && str_element.Split(';')[4] != "")
-                //{
-                //    dr["ColName5"] = str_element.Split(';')[4].Split('-')[0];
-                //    dr["ColVal5"] = Math.Round(Convert.ToDouble(str_element.Split(';')[4].Split('-')[1]), 3);
-                //}
-                //else
-                //{
-                //    dr["ColName5"] = "";
-                //    dr["ColVal5"] = "";
-                //}
-
-                ////找第6个元素
-                //if (str_element.Split(';').Count() > 5 && str_element.Split(';')[5] != "")
-                //{
-                //    dr["ColName6"] = str_element.Split(';')[5].Split('-')[0];
-                //    dr["ColVal6"] = Math.Round(Convert.ToDouble(str_element.Split(';')[5].Split('-')[1]), 3);
-                //}
-                //else
-                //{
-                //    dr["ColName6"] = "";
-                //    dr["ColVal6"] = "";
-                //}
+               
                 DT_Largest_frame.Rows.Add(dr);
             }
             #endregion

OTSIncAReportApp/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.Designer.cs

@@ -607,6 +607,7 @@
             this.button5.TabIndex = 56;
             this.button5.Text = "...";
             this.button5.UseVisualStyleBackColor = true;
+            this.button5.Visible = false;
             this.button5.Click += new System.EventHandler(this.button5_Click);
             // 
             // tb_yscf_ysxx
@@ -617,6 +618,7 @@
             this.tb_yscf_ysxx.ReadOnly = true;
             this.tb_yscf_ysxx.Size = new System.Drawing.Size(173, 21);
             this.tb_yscf_ysxx.TabIndex = 54;
+            this.tb_yscf_ysxx.Visible = false;
             // 
             // ck_yscf_xsmk
             // 
@@ -688,6 +690,7 @@
             this.label24.Size = new System.Drawing.Size(53, 12);
             this.label24.TabIndex = 41;
             this.label24.Text = "元素信息";
+            this.label24.Visible = false;
             // 
             // groupBox6
             // 

OTSIncAReportApp/frmReportApp.cs

@@ -11,6 +11,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
+using System.Diagnostics;
 using System.Windows.Forms;
 
 namespace OTSIncAReportApp
@@ -1186,6 +1187,7 @@ namespace OTSIncAReportApp
 
         private void frmReportApp_FormClosed(object sender, FormClosedEventArgs e)
         {
+            Process.GetCurrentProcess().Kill();
             this.Hide();//打开EChar图后，回收浏览器资源暂卡，为达到操作流畅性，先隐藏窗体再回收资源
             //m_DataMgrFun.DisposeCppObject();
             this.Invoke(new Action(() =>
@@ -1193,6 +1195,8 @@ namespace OTSIncAReportApp
                 if (Cef.IsInitialized)
                     Cef.Shutdown();
             }));
+
+            
         }
 
 

OTSSysMgrApp/ControllerSettingForm.cs

@@ -266,6 +266,7 @@ namespace OTSSysMgrApp
                     {
                         MessageBox.Show(str2, "Tip");
                     }
+                    log.Info("Image capture success!\nImage resolution:"+ tbRWidth.Text+"X"+ tbRHeight.Text+";");
                 }
                 catch (Exception ex)
                 {
@@ -334,6 +335,7 @@ namespace OTSSysMgrApp
 
                     }
                 }
+                log.Info("Single point collection succeeded!");
             }
             catch (Exception ex)
             {
@@ -906,6 +908,7 @@ namespace OTSSysMgrApp
                         lbXrayCount.Text = nXrayCount.ToString();
                     }
                 }
+                log.Info("Multipoint collection succeeded!");
             }
             catch (Exception ex)
             {
@@ -980,6 +983,7 @@ namespace OTSSysMgrApp
                         lbXrayCount.Text = nXrayCount.ToString();
                     }
                 }
+                log.Info("Area collection successful!");
             }
             catch (Exception ex)
             {
@@ -1041,6 +1045,7 @@ namespace OTSSysMgrApp
                 chartXRay.Refresh();
                 //EDS过程结束
                 cfun.EDSFinishedInstance();
+                log.Info("Cleared successfully!");
             }
             catch (Exception ex)
             {
@@ -1107,6 +1112,7 @@ namespace OTSSysMgrApp
                         showXRayElementResultForm.ShowDialog();
                     }
                 }
+                log.Info("Element analysis success!");
             }
             catch (Exception ex)
             {

OTSSysMgrApp/OTSSystemManagerForms.cs

@@ -327,6 +327,7 @@ namespace OTSSysMgrApp
                 {
                     bool result = WriteXMLFileVersion(selectVersion);
                 }
+                log.Info("The current energy spectrum selection version is " + selectVersion);
             }
             catch (Exception ex)
             {

OTSSysMgrApp/SemTestForms.cs

@@ -484,13 +484,15 @@ namespace OTSSysMgrApp
                 if (!ConnectionState)
                 {
                     ShowMessage(2);
+                    log.Error(table["message3"].ToString());
                 }
                 else
                 {
                     string str = table["str1"].ToString();
-                  
+                    
                     BtnConnect.Text = str;
                     GetBtnState(true);
+                    log.Info("The energy spectrum is connected");
                 }
             }
             else
@@ -499,6 +501,7 @@ namespace OTSSysMgrApp
                 //断开电镜连接
                 if (cfun.DisConnectSem())
                 {
+                    log.Info(table["message10"].ToString());
                 }
                 else
                 {
@@ -518,6 +521,7 @@ namespace OTSSysMgrApp
                 cfun.DisConnectSem();
                 //释放DLL内存
                 cfun.FreeHardware();
+                
             }
             catch (Exception ex)
             {
@@ -542,11 +546,13 @@ namespace OTSSysMgrApp
                     tbPositionX.Text = Convert.ToDouble(PositionX).ToString();
                     tbPositionY.Text = Convert.ToDouble(PositionY).ToString();
                     tbPositionR.Text = Convert.ToDouble(PositionR).ToString();
+                    log.Info("X,Y-axis coordinates:(" + tbPositionX.Text + "," + tbPositionY.Text+")");
                 }
                 else
                 {
                     //配置结果提示
                     ShowMessage(6);
+                    log.Error("Failed to obtain the X and Y coordinates");
                 }
             }
             catch (Exception ex)
@@ -600,10 +606,12 @@ namespace OTSSysMgrApp
                 {
                     //配置结果提示
                     ShowMessage(3);
+                    log.Info("Set successfully, current X and Y coordinates should be:(" + PositionX.ToString() + "," + PositionY.ToString() + ")");
                 }
                 else
                 {
                     ShowMessage(4);
+                    log.Error("Failed to set X and Y coordinates!");
                 }
             }
             catch (Exception ex)
@@ -672,11 +680,13 @@ namespace OTSSysMgrApp
                 {
                     //赋值 显示
                     tbBeamBlank.Text = Convert.ToString(a_nBeamBlank);
+                    log.Info("Beam baffle:" + tbBeamBlank.Text);
                 }
                 else
                 {
                     //配置结果提示
                     ShowMessage(6);
+                    log.Error("Failed to obtain the Beam baffle!");
                 }
             }
             catch (Exception ex)
@@ -709,10 +719,12 @@ namespace OTSSysMgrApp
                 {
                     //配置结果提示
                     ShowMessage(3);
+                    log.Info("etting successful!The current beam baffle should be:" + tbSBeamBlank.Text);
                 }
                 else
                 {
                     ShowMessage(4);
+                    log.Error("Beam baffle setting failed!");
                 }
             }
             catch (Exception ex)
@@ -733,11 +745,13 @@ namespace OTSSysMgrApp
                 {
                     //赋值 显示
                     tbBrightness.Text = Convert.ToString(a_dBrightness);
+                    log.Info("Brightness:" + tbBrightness.Text);
                 }
                 else
                 {
                     //配置结果提示
                     ShowMessage(6);
+                    log.Error("Failed to obtain the Brightness");
                 }
             }
             catch (Exception ex)
@@ -771,10 +785,12 @@ namespace OTSSysMgrApp
                 {
                     //配置结果提示
                     ShowMessage(3);
+                    log.Info("Setting successful!, the current brightness should be:" + tbSBrightness.Text);
                 }
                 else
                 {
                     ShowMessage(4);
+                    log.Error("Brightness setting failed!");
                 }
             }
             catch (Exception ex)
@@ -795,11 +811,13 @@ namespace OTSSysMgrApp
                 {
                     //赋值 显示
                     tbContrast.Text = Convert.ToString(a_dContrast);
+                    log.Info("Contrast:" + tbContrast.Text);
                 }
                 else
                 {
                     //配置结果提示
                     ShowMessage(6);
+                    log.Error("Failed to obtain contrast!");
                 }
             }
             catch (Exception ex)
@@ -833,10 +851,12 @@ namespace OTSSysMgrApp
                 {
                     //配置结果提示
                     ShowMessage(3);
+                    log.Info("Set successfully, the current contrast should be:" + tbSContrast.Text);
                 }
                 else
                 {
                     ShowMessage(4);
+                    log.Error("Contrast setting failed!");
                 }
             }
             catch (Exception ex)
@@ -857,11 +877,13 @@ namespace OTSSysMgrApp
                 {
                     //赋值 显示
                     tbFWD.Text = Convert.ToString(a_dWorkingDistance);
+                    log.Info("WorkingDistance:" + tbFWD.Text);
                 }
                 else
                 {
                     //配置结果提示
                     ShowMessage(6);
+                    log.Error("Fail to obtain the WorkingDistance!");
                 }
             }
             catch (Exception ex)
@@ -895,10 +917,12 @@ namespace OTSSysMgrApp
                 {
                     //配置结果提示
                     ShowMessage(3);
+                    log.Info("Setting successful!, the current working distance should be:"+ tbSFWD.Text);
                 }
                 else
                 {
                     ShowMessage(4);
+                    log.Error("Working distance setting failed!");
                 }
             }
             catch (Exception ex)
@@ -919,11 +943,13 @@ namespace OTSSysMgrApp
                 {
                     //赋值 显示
                     tbKV.Text = Convert.ToString(a_dKV);
+                    log.Info("Electron microscope voltage:" + tbKV.Text);
                 }
                 else
                 {
                     //配置结果提示
                     ShowMessage(6);
+                    log.Error("Failed to obtain electron microscope voltage value!");
                 }
             }
             catch (Exception ex)
@@ -957,10 +983,12 @@ namespace OTSSysMgrApp
                 {
                     //配置结果提示
                     ShowMessage(3);
+                    log.Info("Setting successful!, the current voltage value should be:" + tbSKV.Text);
                 }
                 else
                 {
                     ShowMessage(4);
+                    log.Error("Voltage setting failed!");
                 }
             }
             catch (Exception ex)
@@ -981,11 +1009,13 @@ namespace OTSSysMgrApp
                 {
                     //赋值 显示
                     tbMagnification.Text = Convert.ToString(a_dMagnification);
+                    log.Info("SemMagnification:" + tbMagnification.Text);
                 }
                 else
                 {
                     //配置结果提示
                     ShowMessage(6);
+                    log.Error("Fail to obtain the SemMagnification!");
                 }
             }
             catch (Exception ex)
@@ -1019,11 +1049,12 @@ namespace OTSSysMgrApp
                 {
                     //配置结果提示
                     ShowMessage(3);
-                    MessageBox.Show(cfun.GetMagnification().ToString());
+                    log.Info("Setting successful!, the current magnification should be:");
                 }
                 else
                 {
                     ShowMessage(4);
+                    log.Error("Magnification setting failed!");
                 }
             }
             catch (Exception ex)
@@ -1045,6 +1076,7 @@ namespace OTSSysMgrApp
                 {
                     //赋值 显示
                     tbSpotSize.Text = Convert.ToString(a_dSpotSize);
+                    log.Info("Spot size:" + tbSpotSize.Text);
                 }
                 else
                 {
@@ -1083,10 +1115,12 @@ namespace OTSSysMgrApp
                 {
                     //配置结果提示
                     ShowMessage(3);
+                    log.Info("Setting successful!, the current spot size should be:");
                 }
                 else
                 {
                     ShowMessage(4);
+                    log.Error("Spot size setting failed!");
                 }
             }
             catch (Exception ex)
@@ -1107,11 +1141,13 @@ namespace OTSSysMgrApp
                 {
                     //赋值 显示
                     cbHT.Checked = Convert.ToBoolean(a_bHTValue);
+                    log.Info("HT:" + cbHT.Checked.ToString());
                 }
                 else
                 {
                     //配置结果提示
                     ShowMessage(6);
+                    log.Error("Fail to obtain the HT!");
                 }
             }
             catch (Exception ex)
@@ -1134,10 +1170,12 @@ namespace OTSSysMgrApp
                 {
                     //配置结果提示
                     ShowMessage(3);
+                    log.Info("Setting successful!, the current voltage should be:" + cbSHT.Checked.ToString());
                 }
                 else
                 {
                     ShowMessage(4);
+                    log.Error("Voltage setting failed!");
                 }
             }
             catch (Exception ex)
@@ -1158,11 +1196,13 @@ namespace OTSSysMgrApp
                     //赋值 显示
                     tbGSemScanFieldX.Text = Convert.ToDouble(result.Width).ToString();
                     tbSemScanFieldY.Text = Convert.ToDouble(result.Height).ToString();
+                    log.Info("SemScanFieldX,SemScanFieldY:(" + tbGSemScanFieldX.Text + "," + tbSemScanFieldY.Text + ")");
                 }
                 else
                 {
                     //配置结果提示
                     ShowMessage(6);
+                    log.Error("Fail to obtain the SemScanFieldX,SemScanFieldY!");
                 }
             }
             catch (Exception ex)
@@ -1192,6 +1232,7 @@ namespace OTSSysMgrApp
                 cfun.SetSemScanField100(xySize);
                 //配置结果提示
                 ShowMessage(3);
+                log.Info("etting successful!, the current scanning matrix X, the Y-axis should be:(" + tbGSemScanFieldX.Text + "," + tbSemScanFieldY.Text + ")");
             }
             catch (Exception ex)
             {

XMLData/ResourceForCpp/ResourceForCpp-EN.xml

@@ -480,13 +480,13 @@
         <member itemKey="12275" itemName="" itemText="space"/>
         <member itemKey="12276" itemName="" itemText="space"/>
         <member itemKey="12277" itemName="" itemText="space"/>
-        <member itemKey="12278" itemName="" itemText="256x192"/>
-        <member itemKey="12279" itemName="" itemText="512x384"/>
+        <member itemKey="12278" itemName="" itemText="512x384"/>
+        <member itemKey="12279" itemName="" itemText="1024x704"/>
         <member itemKey="12280" itemName="" itemText="1024x768"/>
-        <member itemKey="12281" itemName="" itemText="2046x1536"/>
-        <member itemKey="12282" itemName="" itemText="4096x3072"/>
-        <member itemKey="12283" itemName="" itemText="space"/>
-        <member itemKey="12284" itemName="" itemText="space"/>
+        <member itemKey="12281" itemName="" itemText="2048x1408"/>
+        <member itemKey="12282" itemName="" itemText="2048x1536"/>
+        <member itemKey="12283" itemName="" itemText="3072x2048"/>
+        <member itemKey="12284" itemName="" itemText="4096x3072"/>
         <member itemKey="12285" itemName="" itemText="space"/>
         <member itemKey="12286" itemName="" itemText="space"/>
         <member itemKey="12287" itemName="" itemText="space"/>

XMLData/ResourceForCpp/ResourceForCpp-ZH.xml

@@ -515,13 +515,13 @@
         <member itemKey="12275" itemName="" itemText="空"/>
         <member itemKey="12276" itemName="" itemText="空"/>
         <member itemKey="12277" itemName="" itemText="空"/>
-        <member itemKey="12278" itemName="" itemText="256x192"/>
-        <member itemKey="12279" itemName="" itemText="512x384"/>
+        <member itemKey="12278" itemName="" itemText="512x384"/>
+        <member itemKey="12279" itemName="" itemText="1024x704"/>
         <member itemKey="12280" itemName="" itemText="1024x768"/>
-        <member itemKey="12281" itemName="" itemText="2046x1536"/>
-        <member itemKey="12282" itemName="" itemText="4096x3072"/>
-        <member itemKey="12283" itemName="" itemText="空"/>
-        <member itemKey="12284" itemName="" itemText="空"/>
+        <member itemKey="12281" itemName="" itemText="2048x1408"/>
+        <member itemKey="12282" itemName="" itemText="2048x1536"/>
+        <member itemKey="12283" itemName="" itemText="3072x2048"/>
+        <member itemKey="12284" itemName="" itemText="4096x3072"/>
         <member itemKey="12285" itemName="" itemText="空"/>
         <member itemKey="12286" itemName="" itemText="空"/>
         <member itemKey="12287" itemName="" itemText="空"/>