From 4e5cf7496d921bc621bb025f59d1be4d71fb0c9a Mon Sep 17 00:00:00 2001 From: Franklin Date: Sat, 19 Apr 2025 18:49:19 +0800 Subject: [PATCH] fix some bugs in MDL reading Signed-off-by: Franklin --- ComputerResourceConsole.csproj | 143 ++++++++++++++++++------- ComputerResourceConsole.suo | Bin 121344 -> 121344 bytes MDL/MDL.Class/EventPage.cs | 8 +- MDL/MDL.Properties/Settings.cs | 1 - NGIS.Model/ModelBehavior.cs | 44 ++++---- control/ModelServiceDebuggerControl.cs | 6 +- view/frm_packing.cs | 4 +- 7 files changed, 139 insertions(+), 67 deletions(-) diff --git a/ComputerResourceConsole.csproj b/ComputerResourceConsole.csproj index e72633d..88b327e 100644 --- a/ComputerResourceConsole.csproj +++ b/ComputerResourceConsole.csproj @@ -81,9 +81,6 @@ ..\NGIS_Solution\sdk\nxmodel.context.csharp\bin\x86\Debug\nxdat.csharp.dll - - ..\NGIS_Solution\sdk\nxmodel.mdl.csharp\bin\x86\Debug\nxmodel.mdl.csharp.dll - @@ -149,41 +146,111 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + Form diff --git a/ComputerResourceConsole.suo b/ComputerResourceConsole.suo index 771fc59e247f40936513a7c9534ddb36fc08a2e2..6ca383997ddee7c6726c6d719bae0d2fcfa355e3 100644 GIT binary patch delta 4990 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 delta 3782 zcmb_feNa?K5`Vos_JbhqBA_BM3n2&#!ipMAB(T7u7g1alOJg`oU{OI95SECDfJTjH zC=^;5V>n|XF=fh2h>zse8IxL#=V{^xNvyV3?{OnR9`m`$kW#Hl_j43+e9zpt-vB_8k@7dD-~o+GR#R1ww? znh0$K?D44&5cd4dmG|~#@F9Y&PO26UX+%CUIq!pJ!q{79UD?$9~P(;Mo*NM+O@u!IUP$d2M=m#1+csgvPftc(*Xg!b*DJzpbSCG6{`z25&+ zyxW@Pgoo48=Q~_4*Pcykcg=47LqYsI*~xxh+Tj^#^V4VIs_bVn(uGpNC6tl1ZnC;u zm`8mD(JJXZpWgX+i9#u+uXv(W5O+CIi-ZMdzCFFR?J~^alIs2!N%5qwLeW3E+PU-E z?#n52less!EF?!*7}7b(W4*5vx=o`gF-at2V(O4UD&f>G3%TTAyVyv-5}pz z4+jAcE?$h*oF}okbuoIJ@p8i^_ySnc4sc@fXA#)FO2i|1jdJe`5Dk*PAQaH^eZQ37 zt++$;3;DdUxb%u2tG@uEG;<}%-rNB1=@gmP+lkD!4OYl|cff~$J>|==yCy;^u5*$k zWuBQCp9fLyX@Qd((naEKhqCgIAw;EjyaZ9c@}*f21<}KI|QE5yy5A#xF%;92EE>m-Z^oSdB4SMS`d6I75p14Nz+#x+Ml$2 zpSEf42rN1A8FXRlnM~az3j4`IB0hDu4$mJ;G=D=X^9dCsm!A@!(~}|M$X3ii)1=~7n;gUO8MNb zczt_i)UR|d!cLbFYcE7&=S2~hT>1f8*u8a7flIDLqt{!6p34^4txWE{@)>Nw)J@Cr zaFUtCWZ{GxFM}%B;|xS|br8ni(BiSH$(S6M2JzT;^_0j@!v6%7w<}xB8BCGf*BUga zc`BQ1*(kW|nsfidfM+FzR@TrgNOO#)Y=tB={P)o%2lCtw*o^nqZo)fWEptag)f?rNpgHt|Z5SS^iN`z7Tkz~fEjc_- z?vIMZQb^|zAcMKG>pG~la z^;$sB;$vV6OVPv97C$%+Bt6nq2*I&#zt)PR*nCuQVI zMCI)l-%StJssyFyAz&uhRj*rPAtd;eGNN|R&_lV&u%lY?!|ecgf^nvh!9sZLnMkm| z#|^KSX(J*vm>}xG&Ziw_dlMj5w#C8wgWYGgK$aiZ&zoIR+&bVy_VXkNlK(j#dh{(% z!oN(;-S^*K_ijgn<<`vRCEtFzV-)R_96k-MY2>*JX1h#`93HxnA=Xb5V}_}x>r%;%%{P*Lm4uN zAw46}k9_+kjqt(sPlJmY(;-?uauUARFw+#sQ5GYTK7n0wY zOBO8vc&&Vl^ZasiW$r9!Ko)FgIfp5)9dp|;aaE)o>3}P~xMBEGdFgbp06UgK#qIR) z5JsO`*7z|6>aVmg+WnKP{T0y5-HX7is%EJH5DQ~?3?7G;D3TG;HIKQMK(@&5`U9(w zy-UEM(U%a7U&jaN%$=*c$Nx`cek6f6c6cl#u&Lp28QxX4k$EP8FFUvp(lqw=p_EuP ze3qy)sUPd9p`Kr%><84md1W{xs$Bf0uC`DQzajH8SPil&U;a1a|5MGWs_y#j`i+f- zC@h;7g0H;4$iomEKG}FFgHu@IdB_ zq%nSU+W(?t4m&dua!g+lL2Y9_C+TH1YlwmCJfGOM7}&`61W^+5l!Bv*!yZ|do9`|y zUz3wx>MAQODJXI0mzKE8ON;yIEZhRK4cwQH5R^>cz#b0y#mT{{F6zg5BB g.First()) // 从每个分组中选择第一个元素 .ToList(); ComboBox.Items.Clear(); - foreach (Dataset dataset in uniqueDatasets) + foreach (Dataset ds in uniqueDatasets) { - ComboBox.Items.Add(dataset.Name); + ComboBox.Items.Add(ds.Name); } } @@ -248,9 +248,9 @@ namespace MDL.Class ComboBox.Location = new Point(191, 315); ComboBox.Items.Clear(); - foreach (Dataset dataset in uniqueDatasets) + foreach (Dataset ds in uniqueDatasets) { - ComboBox.Items.Add(dataset.Name); + ComboBox.Items.Add(ds.Name); } ComboBox.DropDownStyle = ComboBoxStyle.DropDownList; // 禁止用户输入 ComboBox.Name = "comboBox3"; diff --git a/MDL/MDL.Properties/Settings.cs b/MDL/MDL.Properties/Settings.cs index a1d3727..5d60d7c 100644 --- a/MDL/MDL.Properties/Settings.cs +++ b/MDL/MDL.Properties/Settings.cs @@ -10,6 +10,5 @@ namespace MDL.Properties { private static Settings defaultInstance = (Settings)SettingsBase.Synchronized(new Settings()); - public static Settings Default => defaultInstance; } } diff --git a/NGIS.Model/ModelBehavior.cs b/NGIS.Model/ModelBehavior.cs index 074375f..a542f3a 100644 --- a/NGIS.Model/ModelBehavior.cs +++ b/NGIS.Model/ModelBehavior.cs @@ -54,11 +54,11 @@ namespace NGIS.Model addModelDatasetItem(ref pDataset); } } - XmlNodeList elementsByTagName2 = xmlElement.GetElementsByTagName("RelatedDatasets"); + XmlNodeList elementsByTagName2 = xmlElement.GetElementsByTagName("States"); if (elementsByTagName.Count > 0) { XmlElement xmlElement4 = (XmlElement)elementsByTagName2[0]; - XmlElement xmlElement5 = (XmlElement)xmlElement4.FirstChild; + XmlElement xmlElement5 = xmlElement4; for (int j = 0; j < xmlElement5.ChildNodes.Count; j++) { XmlElement xmlElement6 = (XmlElement)xmlElement5.ChildNodes[j]; @@ -75,6 +75,7 @@ namespace NGIS.Model { pState.stateType = EModelStateType.EMST_GROUP; } + pState.modelEvents = new List(); for (int k = 0; k < xmlElement6.ChildNodes.Count; k++) { XmlElement xmlElement7 = (XmlElement)xmlElement6.ChildNodes[k]; @@ -113,19 +114,21 @@ namespace NGIS.Model { item.optional = Convert.ToBoolean(attribute4); } - pState.modelEvents = new List(); pState.modelEvents.Add(item); } addModelState(ref pState); } XmlElement xmlElement9 = (XmlElement)xmlElement4.ChildNodes[1]; - for (int l = 0; l < xmlElement9.ChildNodes.Count; l++) - { - XmlElement xmlElement10 = (XmlElement)xmlElement9.ChildNodes[l]; - string attribute5 = xmlElement10.GetAttribute("from"); - string attribute6 = xmlElement10.GetAttribute("to"); - addModelStateTransition(attribute5, attribute6); - } + if (xmlElement9 != null) + { + for (int l = 0; l < xmlElement9.ChildNodes.Count; l++) + { + XmlElement xmlElement10 = (XmlElement)xmlElement9.ChildNodes[l]; + string attribute5 = xmlElement10.GetAttribute("from"); + string attribute6 = xmlElement10.GetAttribute("to"); + addModelStateTransition(attribute5, attribute6); + } + } } XmlNodeList elementsByTagName3 = xmlElement.GetElementsByTagName("RelatedDatasets"); if (elementsByTagName.Count > 0) @@ -140,15 +143,18 @@ namespace NGIS.Model item2.DefaultValue = childNode.GetAttribute("defaultValue"); mProcessParameters.Add(item2); } - XmlElement xmlElement14 = (XmlElement)xmlElement11.ChildNodes[1]; - foreach (XmlElement childNode2 in xmlElement14.ChildNodes) - { - ModelParameter item3 = default(ModelParameter); - item3.Key = childNode2.GetAttribute("key"); - item3.Description = childNode2.GetAttribute("description"); - item3.DefaultValue = childNode2.GetAttribute("defaultValue"); - mProcessParameters.Add(item3); - } + XmlElement xmlElement14 = (XmlElement)xmlElement11.ChildNodes[1]; + if (xmlElement14 != null) + { + foreach (XmlElement childNode2 in xmlElement14.ChildNodes) + { + ModelParameter item3 = default(ModelParameter); + item3.Key = childNode2.GetAttribute("key"); + item3.Description = childNode2.GetAttribute("description"); + item3.DefaultValue = childNode2.GetAttribute("defaultValue"); + mProcessParameters.Add(item3); + } + } } return true; } diff --git a/control/ModelServiceDebuggerControl.cs b/control/ModelServiceDebuggerControl.cs index 0bc378e..9b8899d 100644 --- a/control/ModelServiceDebuggerControl.cs +++ b/control/ModelServiceDebuggerControl.cs @@ -62,11 +62,11 @@ namespace ComputerResourceConsole.control public bool loadMDLFile(string mdlPath) { + this._mdl = new ModelClass(); + this._mdl.LoadFromXmlFile(mdlPath); + this._pDebuggerOpera.MDLPath = mdlPath; try { - this._mdl = new ModelClass(); - this._mdl.LoadFromXmlFile(mdlPath); - this._pDebuggerOpera.MDLPath = mdlPath; } catch (Exception ex) { diff --git a/view/frm_packing.cs b/view/frm_packing.cs index 6028160..0cd16ae 100644 --- a/view/frm_packing.cs +++ b/view/frm_packing.cs @@ -40,8 +40,8 @@ namespace ComputerResourceConsole.view InitializeComponent(); //! For test! - this.dgv_files.Rows.Add("E:\\GitCode\\ogms\\python\\ogms\\context\\yolov5s.pt"); - this.dgv_files.Rows.Add("E:\\GitCode\\ogms\\python\\ogms\\context\\yolov5\\"); + //this.dgv_files.Rows.Add("E:\\GitCode\\ogms\\python\\ogms\\context\\yolov5s.pt"); + //this.dgv_files.Rows.Add("E:\\GitCode\\ogms\\python\\ogms\\context\\yolov5\\"); } public string ProgrammingLanguage -- Gitee