change- run运行问题处理

master
wangsr 2 years ago
parent 310c518435
commit 0b0b801b2d

@ -467,17 +467,17 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch
} }
catch (Exception ex) catch (Exception ex)
{ {
ICSharpCode.Core.LoggingService<FinishBatchHelper>.Error(String.Format("物料称量存盘异常:{1}", ex.Message), ex); ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("物料称量存盘异常:{1}", ex.Message), ex);
} }
#endregion #endregion
//存盘数据保存完成,写入反馈信号 //存盘数据保存完成,写入反馈信号
ICSharpCode.Core.LoggingService<FinishBatchHelper>.Debug("数据存盘_PLC物料数据写入数据库处理完毕!"); ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Debug("数据存盘_PLC物料数据写入数据库处理完毕!");
bool result = BasePlcHelper.Instance.PlcWriteByDataKey(BasePlcHelper.Instance.ChemicalWeighing_PC_RpSaved, new object[] { 1 }); bool result = BasePlcHelper.Instance.PlcWriteByDataKey(BasePlcHelper.Instance.ChemicalWeighing_PC_RpSaved, new object[] { 1 });
if (!result) if (!result)
{ {
ICSharpCode.Core.LoggingService<FinishBatchHelper>.Debug("数据存盘后写入反馈信号失败!"); ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Debug("数据存盘后写入反馈信号失败!");
} }
//将车次与计划表中的数量比对,更新计划数量中的完成数量 //将车次与计划表中的数量比对,更新计划数量中的完成数量
if (recordSaveDataInfo.PlanId != "") if (recordSaveDataInfo.PlanId != "")
@ -508,7 +508,7 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch
} }
catch (Exception ex) catch (Exception ex)
{ {
ICSharpCode.Core.LoggingService<FinishBatchHelper>.Error(String.Format("生产数据存盘异常:{1}", ex.Message), ex); ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("生产数据存盘异常:{1}", ex.Message), ex);
} }
} }
#endregion #endregion

@ -1,4 +1,6 @@
using Mesnac.Action.Base; using DevExpress.Utils.Drawing.Helpers;
using ICSharpCode.Core;
using Mesnac.Action.Base;
using Mesnac.Action.ChemicalWeighing.Entity.Report; using Mesnac.Action.ChemicalWeighing.Entity.Report;
using Mesnac.Action.ChemicalWeighing.Report.ProductionReport; using Mesnac.Action.ChemicalWeighing.Report.ProductionReport;
using Microsoft.Office.Interop.Excel; using Microsoft.Office.Interop.Excel;
@ -63,8 +65,20 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DryMixer
string fileName = sfd.FileName; string fileName = sfd.FileName;
if (!String.IsNullOrEmpty(fileName)) if (!String.IsNullOrEmpty(fileName))
{ {
//写入Excle try
DataTabletoExcel(fileName, dt, dryMixerDos); {
//写入Excle
DataTabletoExcel(fileName, dt, dryMixerDos);
string msg1 = "干混机报表导出成功"; //导出生产报表数据至Excel成功!
ICSharpCode.Core.LoggingService<ExportAction>.Info(msg1);
MessageBox.Show(msg1, Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information);
}
catch (Exception ex)
{
string msg1 = $"干混机报表导出异常:{ex.Message}";
ICSharpCode.Core.LoggingService<ExportAction>.Error(msg1);
MessageBox.Show(msg1, Mesnac.Basic.LanguageHelper.WarnCaption, MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
} }
} }
} }

@ -1,10 +1,9 @@
<MesnacPrj> <MesnacPrj>
<Node Name="SCWSProject2" Text="SCWSProject2" ToolTipText="SCWSProject2" Tag="小料称量" ImageIndex="0" SelectedImageIndex="0"> <Node Name="SCWSProject2" Text="SCWSProject2" ToolTipText="SCWSProject2" Tag="小料称量" ImageIndex="0" SelectedImageIndex="0">
<Node Name="nodeForm" Text="画面" ToolTipText="" Tag="nodeForm" ImageIndex="1" SelectedImageIndex="1"> <Node Name="nodeForm" Text="画面" ToolTipText="" Tag="nodeForm" ImageIndex="1" SelectedImageIndex="1">
<Node Name="FrmBasUser" Text="用户管理" ToolTipText="FrmBasUser" Tag="FrmBasUser" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="FrmMainScada" Text="小料主监控画面" ToolTipText="" Tag="FrmMainScada" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmBasRole" Text="角色管理" ToolTipText="FrmBasRole" Tag="FrmBasRole" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmRolePurview" Text="角色权限管理" ToolTipText="FrmRolePurview" Tag="FrmRolePurview" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmCurrentPlan" Text="生产计划" ToolTipText="" Tag="FrmCurrentPlan" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="FrmCurrentPlan" Text="生产计划" ToolTipText="" Tag="FrmCurrentPlan" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmScadaExtentScreen" Text="主监控画面(扩展屏)" ToolTipText="" Tag="FrmScadaExtentScreen" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmRecipe" Text="配方管理" ToolTipText="FrmRecipe" Tag="FrmRecipe" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="FrmRecipe" Text="配方管理" ToolTipText="FrmRecipe" Tag="FrmRecipe" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmMaterial" Text="物料管理" ToolTipText="FrmMaterial" Tag="FrmMaterial" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="FrmMaterial" Text="物料管理" ToolTipText="FrmMaterial" Tag="FrmMaterial" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmBin" Text="料仓管理" ToolTipText="FrmBin" Tag="FrmBin" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="FrmBin" Text="料仓管理" ToolTipText="FrmBin" Tag="FrmBin" ImageIndex="3" SelectedImageIndex="3" />
@ -12,39 +11,11 @@
<Node Name="FrmAlarmRecord" Text="报警日志" ToolTipText="FrmAlarmRecord" Tag="FrmAlarmRecord" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="FrmAlarmRecord" Text="报警日志" ToolTipText="FrmAlarmRecord" Tag="FrmAlarmRecord" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmProductionReport" Text="生产报表" ToolTipText="FrmProductionReport" Tag="FrmProductionReport" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="FrmProductionReport" Text="生产报表" ToolTipText="FrmProductionReport" Tag="FrmProductionReport" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmMaterialReport" Text="物料统计报表" ToolTipText="FrmMaterialReport" Tag="FrmMaterialReport" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="FrmMaterialReport" Text="物料统计报表" ToolTipText="FrmMaterialReport" Tag="FrmMaterialReport" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmBarcodeReport" Text="条码扫描报表" ToolTipText="FrmBarcodeReport" Tag="FrmBarcodeReport" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmAnalysisReport" Text="生产分析报表" ToolTipText="FrmAnalysisReport" Tag="FrmAnalysisReport" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="FrmAnalysisReport" Text="生产分析报表" ToolTipText="FrmAnalysisReport" Tag="FrmAnalysisReport" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmShift" Text="班次管理" ToolTipText="FrmShift" Tag="FrmShift" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="监控主界面" Text="监控主界面" ToolTipText="监控主界面" Tag="监控主界面" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="DeviceParamManage" Text="设备参数管理" ToolTipText="DeviceParamManage" Tag="DeviceParamManage" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="密炼回放" Text="密炼回放" ToolTipText="密炼回放" Tag="密炼回放" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmProjectDebug" Text="工程调试" ToolTipText="FrmProjectDebug" Tag="FrmProjectDebug" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmOperationRecord" Text="操作日志" ToolTipText="FrmOperationRecord" Tag="FrmOperationRecord" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmRecipeType" Text="配方类别" ToolTipText="FrmRecipeType" Tag="FrmRecipeType" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="Form1" Text="主要用来测试" ToolTipText="Form1" Tag="Form1" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormHu" Text="干混机" ToolTipText="FormHu" Tag="FormHu" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormFirst" Text="FormFirst" ToolTipText="FormFirst" Tag="FormFirst" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormMaterialInfoType" Text="物料大类" ToolTipText="FormMaterialInfoType" Tag="FormMaterialInfoType" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormAction" Text="榄菊动作" ToolTipText="FormAction" Tag="FormAction" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormTankNum" Text="日罐物料" ToolTipText="FormTankNum" Tag="FormTankNum" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormStock" Text="料仓物料" ToolTipText="FormStock" Tag="FormStock" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormDeliver" Text="榄菊输送节点" ToolTipText="FormDeliver" Tag="FormDeliver" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormDevice" Text="设备管理" ToolTipText="FormDevice" Tag="FormDevice" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormPressureSetting" Text="榄菊设备参数压力管理" ToolTipText="FormPressureSetting" Tag="FormPressureSetting" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormWeight" Text="榄菊设备参数重量管理" ToolTipText="FormWeight" Tag="FormWeight" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormProportionalSetting" Text="榄菊比例阀参数管理" ToolTipText="FormProportionalSetting" Tag="FormProportionalSetting" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormMetage" Text="榄菊称量参数管理" ToolTipText="FormMetage" Tag="FormMetage" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormElectrical" Text="榄菊变频电机手动速度" ToolTipText="FormElectrical" Tag="FormElectrical" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormDhj" Text="榄菊干混机显示" ToolTipText="FormDhj" Tag="FormDhj" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormStockMaterial" Text="大仓物料" ToolTipText="FormStockMaterial" Tag="FormStockMaterial" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormWeight" Text="称量配方管理" ToolTipText="FormWeight" Tag="FormWeight" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormMix" Text="混合配方管理" ToolTipText="FormMix" Tag="FormMix" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormProductLine" Text="榄菊产线管理" ToolTipText="FormProductLine" Tag="FormProductLine" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormDeviceMonitor" Text="榄菊设备监控" ToolTipText="FormDeviceMonitor" Tag="FormDeviceMonitor" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormdeviceDetail" Text="设备细节" ToolTipText="FormdeviceDetail" Tag="FormdeviceDetail" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormDeviceDetail2" Text="设备细节2" ToolTipText="FormDeviceDetail2" Tag="FormDeviceDetail2" ImageIndex="3" SelectedImageIndex="3" />
</Node> </Node>
<Node Name="nodeDevice" Text="设备" ToolTipText="" Tag="nodeDevice" ImageIndex="2" SelectedImageIndex="2"> <Node Name="nodeDevice" Text="设备" ToolTipText="" Tag="nodeDevice" ImageIndex="2" SelectedImageIndex="2">
<Node Name="ParametersWithPc" Text="ParametersWithPc" ToolTipText="" Tag="ParametersWithPc" ImageIndex="5" SelectedImageIndex="5" /> <Node Name="SanYuan" Text="SanYuan" ToolTipText="" Tag="SanYuan" ImageIndex="5" SelectedImageIndex="5" />
</Node> </Node>
<Node Name="nodeDataSource" Text="数据源" ToolTipText="" Tag="nodeDataSource" ImageIndex="6" SelectedImageIndex="6"> <Node Name="nodeDataSource" Text="数据源" ToolTipText="" Tag="nodeDataSource" ImageIndex="6" SelectedImageIndex="6">
<Node Name="DataSource1" Text="DataSource1" ToolTipText="" Tag="DataSource1" ImageIndex="7" SelectedImageIndex="7" /> <Node Name="DataSource1" Text="DataSource1" ToolTipText="" Tag="DataSource1" ImageIndex="7" SelectedImageIndex="7" />

@ -1,3 +1,3 @@
<DataSources> <DataSources>
<DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="10.11.41.62" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" /> <DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="127.0.0.1" UserName="sa" Password="123456" DataBase="CWSS_New" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
</DataSources> </DataSources>

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

@ -28,9 +28,9 @@
<Property name="AutoGenerateColumns">False</Property> <Property name="AutoGenerateColumns">False</Property>
<Property name="MultiSelect">False</Property> <Property name="MultiSelect">False</Property>
<Property name="Dock">Fill</Property> <Property name="Dock">Fill</Property>
<Property name="Location">0, 149</Property> <Property name="Location">0, 163</Property>
<Property name="Name">MCDataGridView1</Property> <Property name="Name">MCDataGridView1</Property>
<Property name="Size">1338, 411</Property> <Property name="Size">1338, 397</Property>
<Property name="TabIndex">20</Property> <Property name="TabIndex">20</Property>
</Object> </Object>
<Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls"> <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
@ -270,7 +270,7 @@
</Object> </Object>
<Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton10" children="Controls"> <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton10" children="Controls">
<Property name="ClickActionList"> <Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEFERDYzQzU2NzM0NzQ1REY5RDZDMjg4NTI2Nzk2NkQ3BgYAAAAG5p+l6K+iBgcAAAAS5p+l6K+i5oql6K2m5Y+C5pWwCw==</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEFERDYzQzU2NzM0NzQ1REY5RDZDMjg4NTI2Nzk2NkQ3BgYAAAAG5p+l6K+iBgcAAAAS5p+l6K+i5oql6K2m5Y+C5pWwCw==</Binary>
</Property> </Property>
<Property name="MCKey" /> <Property name="MCKey" />
<Property name="MCDataSourceID" /> <Property name="MCDataSourceID" />
@ -764,7 +764,7 @@
<Property name="Dock">Top</Property> <Property name="Dock">Top</Property>
<Property name="Location">0, 0</Property> <Property name="Location">0, 0</Property>
<Property name="Name">Panel1</Property> <Property name="Name">Panel1</Property>
<Property name="Size">1338, 149</Property> <Property name="Size">1338, 163</Property>
</Object> </Object>
<Property name="LoadActionList"> <Property name="LoadActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAKAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDNFNTg2QjE3MzVGMzQ1NTU4OUJGNUM4OUQ1MTczM0M0BgYAAAAP56qX5L2T5Yid5aeL5YyWBgcAAAAP56qX5L2T5Yid5aeL5YyWCw==</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAKAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDNFNTg2QjE3MzVGMzQ1NTU4OUJGNUM4OUQ1MTczM0M0BgYAAAAP56qX5L2T5Yid5aeL5YyWBgcAAAAP56qX5L2T5Yid5aeL5YyWCw==</Binary>

@ -330,7 +330,7 @@
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
</Property> </Property>
<Property name="RefreshDataActionList"> <Property name="RefreshDataActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs=</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs=</Binary>
</Property> </Property>
<Property name="BHaveAction">True</Property> <Property name="BHaveAction">True</Property>
<Property name="MCPurview">True</Property> <Property name="MCPurview">True</Property>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,516 +1,129 @@
<AddIn name = "密炼智能装备信息化平台" <AddIn name = "密炼智能装备信息化平台"
author = "郑立兵" author = "初风鸣"
copyright = "版权所有2018 软控股份有限公司" copyright = ""
url = "http://www.mesnac.com" url = "http://www.mesnac.com"
description = "密炼智能装备信息化平台" description = "密炼智能装备信息化平台"
addInManagerHidden = "true"> addInManagerHidden = "true">
<Manifest> <Manifest>
<Identity name = "MCEdit"/> <Identity name = "MCRun"/>
</Manifest> </Manifest>
<Runtime> <Runtime>
<!--<Import assembly="../Mesnac.Gui.dll"/>--> <Import assembly="../../Mesnac.Gui.dll"/>
<Import assembly="../../Mesnac.Gui.Edit.dll"> <Import assembly="../../Mesnac.Gui.Run.dll">
<ConditionEvaluator name="MCEditProjectState" class="Mesnac.Gui.Edit.ViewContent.MCEditProjectStateConditionEvaluator"/> <ConditionEvaluator name="MCRunSuper" class="Mesnac.Gui.Run.ViewContent.MCRunSuperConditionEvaluator"/>
<ConditionEvaluator name="MCEditEditState" class="Mesnac.Gui.Edit.ViewContent.MCEditEditStateConditionEvaluator"/>
<ConditionEvaluator name="MCEditDesignerExistsState" class="Mesnac.Gui.Edit.ViewContent.MCEditDesignerExistsStateConditionEvaluator"/>
<ConditionEvaluator name="MCEditUndoState" class="Mesnac.Gui.Edit.ViewContent.MCEditUndoStateConditionEvaluator"/>
<ConditionEvaluator name="MCEditRedoState" class="Mesnac.Gui.Edit.ViewContent.MCEditRedoStateConditionEvaluator"/>
<ConditionEvaluator name="MCEditLayoutEmpty" class="Mesnac.Gui.Edit.ViewContent.MCEditLayoutEmptyConditionEvaluator"/>
<ConditionEvaluator name="MCEditLayoutOnlyOne" class="Mesnac.Gui.Edit.ViewContent.MCEditLayoutOnlyOneConditionEvaluator"/>
<ConditionEvaluator name="MCEditLayoutSelectOne" class="Mesnac.Gui.Edit.ViewContent.MCEditLayoutSelectOneConditionEvaluator"/>
</Import> </Import>
</Runtime> </Runtime>
<!--系统面板 开始-->
<Path name = "/Mesnac/Workbench/Pads">
<Pad id = "pad_Solution"
category = "Tools"
title = "${res:Mesnac_MainMenu_mnuSolution}"
dockState = "DockRight"
icon = "Icons_16x16_Solution"
class = "Mesnac.Gui.Edit.Pad.ProjectWindow"/>
<Pad id = "pad_Event"
category = "Tools"
title = "${res:Mesnac_MainMenu_mnuEvent}"
dockState = "DockRight"
icon = "Icons_16x16_Event"
class = "Mesnac.Gui.Edit.Pad.EventWindow"/>
<Pad id = "pad_Property"
category = "Tools"
title = "${res:Mesnac_MainMenu_mnuProperty}"
dockState = "DockRight"
icon = "Icons_16x16_Property"
class = "Mesnac.Gui.Edit.Pad.PropertyWindow"/>
<Pad id = "pad_ToolBox"
category = "Tools"
title = "${res:Mesnac_MainMenu_mnuToolBox}"
dockState = "DockLeft"
icon = "Icons_16x16_ToolBox"
class = "Mesnac.Gui.Edit.Pad.ToolBoxWindow"/>
<Pad id = "pad_Action" <!--Pad Config-->
category = "Tools" <Path name = "/Mesnac/Workbench/Pads">
title = "${res:Mesnac_MainMenu_mnuAction}" <Pad id = "System_Function_Tree"
category = "Tools"
title = "${res:Mesnac_SystemFunctionTree}"
dockState = "DockLeft" dockState = "DockLeft"
icon = "Icons_16x16_Action" icon = "PadIcons.FileBrowser"
class = "Mesnac.Gui.Edit.Pad.ActionWindow"/> shortcut = "Control|Alt|F"
isVisible = "false"
class = "Mesnac.Gui.Run.Pad.FrmSysFunction"/>
<!--
<Pad id = "System_Message_Tree"
category = "Tools"
title = "${res:Mesnac_SystemMessage}"
dockState = "DockRight"
icon = "PadIcons.Output"
shortcut = "Control|Alt|M"
isVisible = "false"
class = "Mesnac.Gui.Run.Pad.FrmSysMessage"/>
-->
</Path> </Path>
<!--系统面板 结束-->
<!-- Main Menu --> <!-- Main Menu -->
<!--系统主菜单 开始-->
<Path name = "/Mesnac/Workbench/MainMenu"> <Path name = "/Mesnac/Workbench/MainMenu">
<!--文件 开始--> <!-- 文件开始 -->
<MenuItem id = "mnuFile" label = "${res:Mesnac_MainMenu_mnuFile}" type="Menu"> <MenuItem id = "File" label = "${res:Mesnac_MainMenu_File}" type="Menu">
<MenuItem id = "mnuNew" <Condition name="MCRunSuper" action="Disable">
label = "${res:Mesnac_MainMenu_mnuNew}" <MenuItem id = "RefreshPlugIn"
icon = "Icons_16x16_New" label = "${res:Mesnac_MainMenu_RefreshPlugIn}"
shortcut = "Control|N" icon = "Icons_16X16_Refresh"
class = "Mesnac.Gui.Edit.ViewContent.NewProjectCommand"/> class = "Mesnac.Gui.Run.ViewContent.RefreshPlugInCommand"/>
<MenuItem id = "SysConfig"
<MenuItem id = "mnuOpen" label = "${res:Mesnac_MainMenu_SysConfig}"
label = "${res:Mesnac_MainMenu_mnuOpen}" icon ="Icons_16X16_Wrench"
icon = "Icons_16x16_Open" class = "Mesnac.Gui.Run.ViewContent.SysConfigCommand"/>
shortcut = "Control|O"
class = "Mesnac.Gui.Edit.ViewContent.OpenProjectCommand"/>
<Condition name="MCEditProjectState" action="Disable">
<MenuItem id = "mnuSave"
label = "${res:Mesnac_MainMenu_mnuSave}"
icon = "Icons_16x16_Save"
shortcut = "Control|S"
class = "Mesnac.Gui.Edit.ViewContent.SaveProjectCommand"/>
<MenuItem id = "mnuClose"
label = "${res:Mesnac_MainMenu_mnuClose}"
icon = "Icons_16x16_Close"
shortcut = "Control|N"
class = "Mesnac.Gui.Edit.ViewContent.CloseProjectCommand"/>
</Condition> </Condition>
<MenuItem id = "mnuFileSeparator" type = "Separator" /> <MenuItem id = "FullScreen"
<MenuItem id = "mnuExit" label = "${res:Mesnac_MainMenu_FullScreen}"
label = "${res:Mesnac_MainMenu_mnuExit}"
shortcut = "Alt|F4"
class = "Mesnac.Gui.Edit.ViewContent.ExitCommand"/>
</MenuItem>
<!--文件 结束-->
<!--编辑 开始-->
<MenuItem id = "mnuEdit" label = "${res:Mesnac_MainMenu_mnuEdit}" type="Menu">
<Condition name="MCEditEditState" action="Disable">
<Condition name="MCEditUndoState" action="Disable">
<MenuItem id = "mnuUndo"
label = "${res:Mesnac_MainMenu_mnuUndo}"
icon = "Icons_16x16_Undo"
shortcut = "Control|Z"
class = "Mesnac.Gui.Edit.ViewContent.UndoCommand"/>
</Condition>
<Condition name="MCEditRedoState" action="Disable">
<MenuItem id = "mnuRedo"
label = "${res:Mesnac_MainMenu_mnuRedo}"
icon = "Icons_16x16_Redo"
shortcut = "Control|Y"
class = "Mesnac.Gui.Edit.ViewContent.RedoCommand"/>
</Condition>
<MenuItem id = "mnuEditSeparator" type = "Separator" />
<MenuItem id = "mnuCut"
label = "${res:Mesnac_MainMenu_mnuCut}"
icon = "Icons_16x16_Cut"
shortcut = "Control|X"
class = "Mesnac.Gui.Edit.ViewContent.CutCommand"/>
<MenuItem id = "mnuCopy"
label = "${res:Mesnac_MainMenu_mnuCopy}"
icon = "Icons_16x16_Copy"
shortcut = "Control|C"
class = "Mesnac.Gui.Edit.ViewContent.CopyCommand"/>
<MenuItem id = "mnuPaste"
label = "${res:Mesnac_MainMenu_mnuPaste}"
icon = "Icons_16x16_Paste"
shortcut = "Control|V"
class = "Mesnac.Gui.Edit.ViewContent.PasteCommand"/>
<!--<MenuItem id = "mnuDelete"
label = "${res:Mesnac_MainMenu_mnuDelete}"
shortcut = "Delete"
class = "Mesnac.Gui.Edit.ViewContent.DeleteCommand"/>-->
<MenuItem id = "mnuSelectAll"
label = "${res:Mesnac_MainMenu_mnuSelectAll}"
shortcut = "Control|A"
class = "Mesnac.Gui.Edit.ViewContent.SelectAllCommand"/>
</Condition>
</MenuItem>
<!--编辑 结束-->
<!--视图 开始-->
<MenuItem id = "mnuView" label = "${res:Mesnac_MainMenu_mnuView}" type="Menu">
<MenuItem id="mnuReport"
label="${res:Mesnac_MainMenu_ReportDesigner}"
icon = ""
class = "Mesnac.Gui.Edit.ViewContent.ReportDesigner"/>
<MenuItem id = "mnuViewCodeSeparator" type = "Separator" />
<MenuItem id = "mnuSolution"
label = "${res:Mesnac_MainMenu_mnuSolution}"
icon = "Icons_16x16_Solution"
class = "Mesnac.Gui.Edit.ViewContent.SolutionWindowCommand"/>
<MenuItem id = "mnuToolBox"
label = "${res:Mesnac_MainMenu_mnuToolBox}"
icon = "Icons_16x16_ToolBox"
class = "Mesnac.Gui.Edit.ViewContent.ToolBoxWindowCommand"/>
<MenuItem id = "mnuProperty"
label = "${res:Mesnac_MainMenu_mnuProperty}"
icon = "Icons_16x16_Property"
class = "Mesnac.Gui.Edit.ViewContent.PropertyWindowCommand"/>
<MenuItem id = "mnuAction"
label = "${res:Mesnac_MainMenu_mnuAction}"
icon = "Icons_16x16_Action"
class = "Mesnac.Gui.Edit.ViewContent.ActionWindowCommand"/>
<MenuItem id = "mnuEvent"
label = "${res:Mesnac_MainMenu_mnuEvent}"
icon = "Icons_16x16_Event"
class = "Mesnac.Gui.Edit.ViewContent.EventWindowCommand"/>
<MenuItem id = "mnuViewSeparator" type = "Separator" />
<MenuItem id = "mnuFullScreen"
label = "${res:Mesnac_MainMenu_mnuFullScreen}"
icon = "Icons.16x16.FullScreen" icon = "Icons.16x16.FullScreen"
shortcut = "F11" class = "Mesnac.Gui.Run.ViewContent.ToggleFullscreenCommand" />
class = "Mesnac.Gui.Edit.ViewContent.ToggleFullscreenCommand"/> <MenuItem id = "mnuFileSeparator" type = "Separator" />
</MenuItem> <MenuItem id = "Exit"
<!--视图 结束--> label = "${res:Mesnac_MainMenu_Exit}"
<!--布局 开始--> icon ="Icons_16X16_Exit"
class = "Mesnac.Gui.Run.ViewContent.ExitCommand"/>
<MenuItem id = "mnuLayout" label = "${res:Mesnac_MainMenu_mnuLayout}" type="Menu">
<Condition name="MCEditLayoutEmpty" action="Disable">
<Condition name="MCEditLayoutOnlyOne" action="Disable">
<Condition name="MCEditLayoutSelectOne" action="Disable">
<MenuItem id = "mnuAlignToGrid"
label = "${res:Mesnac_MainMenu_mnuAlignToGrid}"
icon = "Icons_16x16_AlignToGrid"
class = "Mesnac.Gui.Edit.ViewContent.AlignToGridCommand"/>
<MenuItem id = "mnuAlignLeft"
label = "${res:Mesnac_MainMenu_mnuAlignLeft}"
icon = "Icons_16x16_AlignLeft"
class = "Mesnac.Gui.Edit.ViewContent.AlignLeftCommand"/>
<MenuItem id = "mnuAlignHorizontalCenters"
label = "${res:Mesnac_MainMenu_mnuAlignHorizontalCenters}"
icon = "Icons_16x16_AlignHorizontalCenters"
class = "Mesnac.Gui.Edit.ViewContent.AlignHorizontalCentersCommand"/>
<MenuItem id = "mnuAlignRight"
label = "${res:Mesnac_MainMenu_mnuAlignRight}"
icon = "Icons_16x16_AlignRight"
class = "Mesnac.Gui.Edit.ViewContent.AlignRightCommand"/>
<MenuItem id = "mnuAlignTop"
label = "${res:Mesnac_MainMenu_mnuAlignTop}"
icon = "Icons_16x16_AlignTop"
class = "Mesnac.Gui.Edit.ViewContent.AlignTopCommand"/>
<MenuItem id = "mnuAlignVerticalCenters"
label = "${res:Mesnac_MainMenu_mnuAlignVerticalCenters}"
icon = "Icons_16x16_AlignVerticalCenters"
class = "Mesnac.Gui.Edit.ViewContent.AlignVerticalCentersCommand"/>
<MenuItem id = "mnuAlignBottom"
label = "${res:Mesnac_MainMenu_mnuAlignBottom}"
icon = "Icons_16x16_AlignBottom"
class = "Mesnac.Gui.Edit.ViewContent.AlignBottomCommand"/>
<MenuItem id = "mnuLayoutSeparator1" type = "Separator" />
<MenuItem id = "mnuSizeToControlWidth"
label = "${res:Mesnac_MainMenu_mnuSizeToControlWidth}"
icon = "Icons_16x16_SizeToControlWidth"
class = "Mesnac.Gui.Edit.ViewContent.SizeToControlWidthCommand"/>
<MenuItem id = "mnuSizeToControlHeight"
label = "${res:Mesnac_MainMenu_mnuSizeToControlHeight}"
icon = "Icons_16x16_SizeToControlHeight"
class = "Mesnac.Gui.Edit.ViewContent.SizeToControlHeightCommand"/>
<MenuItem id = "mnuSizeToControl"
label = "${res:Mesnac_MainMenu_mnuSizeToControl}"
icon = "Icons_16x16_SizeToControl"
class = "Mesnac.Gui.Edit.ViewContent.SizeToControlCommand"/>
<MenuItem id = "mnuSizeToGrid"
label = "${res:Mesnac_MainMenu_mnuSizeToGrid}"
icon = "Icons_16x16_SizeToGrid"
class = "Mesnac.Gui.Edit.ViewContent.SizeToGridCommand"/>
<MenuItem id = "mnuLayoutSeparator2" type = "Separator" />
<MenuItem id = "mnuHorizSpaceMakeEqual"
label = "${res:Mesnac_MainMenu_mnuHorizSpaceMakeEqual}"
icon = "Icons_16x16_HorizSpaceMakeEqual"
class = "Mesnac.Gui.Edit.ViewContent.HorizSpaceMakeEqualCommand"/>
<MenuItem id = "mnuHorizSpaceIncrease"
label = "${res:Mesnac_MainMenu_mnuHorizSpaceIncrease}"
icon = "Icons_16x16_HorizSpaceIncrease"
class = "Mesnac.Gui.Edit.ViewContent.HorizSpaceIncreaseCommand"/>
<MenuItem id = "mnuHorizSpaceDecrease"
label = "${res:Mesnac_MainMenu_mnuHorizSpaceDecrease}"
icon = "Icons_16x16_HorizSpaceDecrease"
class = "Mesnac.Gui.Edit.ViewContent.HorizSpaceDecreaseCommand"/>
<MenuItem id = "mnuHorizSpaceConcatenate"
label = "${res:Mesnac_MainMenu_mnuHorizSpaceConcatenate}"
icon = "Icons_16x16_HorizSpaceConcatenate"
class = "Mesnac.Gui.Edit.ViewContent.HorizSpaceConcatenateCommand"/>
<MenuItem id = "mnuLayoutSeparator3" type = "Separator" />
<MenuItem id = "mnuVertSpaceMakeEqual"
label = "${res:Mesnac_MainMenu_mnuVertSpaceMakeEqual}"
icon = "Icons_16x16_VertSpaceMakeEqual"
class = "Mesnac.Gui.Edit.ViewContent.VertSpaceMakeEqualCommand"/>
<MenuItem id = "mnuVertSpaceIncrease"
label = "${res:Mesnac_MainMenu_mnuVertSpaceIncrease}"
icon = "Icons_16x16_VertSpaceIncrease"
class = "Mesnac.Gui.Edit.ViewContent.VertSpaceIncreaseCommand"/>
<MenuItem id = "mnuVertSpaceDecrease"
label = "${res:Mesnac_MainMenu_mnuVertSpaceDecrease}"
icon = "Icons_16x16_VertSpaceDecrease"
class = "Mesnac.Gui.Edit.ViewContent.VertSpaceDecreaseCommand"/>
<MenuItem id = "mnuVertSpaceConcatenate"
label = "${res:Mesnac_MainMenu_mnuVertSpaceConcatenate}"
icon = "Icons_16x16_VertSpaceConcatenate"
class = "Mesnac.Gui.Edit.ViewContent.VertSpaceConcatenateCommand"/>
</Condition>
</Condition>
<MenuItem id = "mnuLayoutSeparator4" type = "Separator" />
<MenuItem id = "mnuCenterHorizontally"
label = "${res:Mesnac_MainMenu_mnuCenterHorizontally}"
icon = "Icons_16x16_CenterHorizontally"
class = "Mesnac.Gui.Edit.ViewContent.CenterHorizontallyCommand"/>
<MenuItem id = "mnuCenterVertically"
label = "${res:Mesnac_MainMenu_mnuCenterVertically}"
icon = "Icons_16x16_CenterVertically"
class = "Mesnac.Gui.Edit.ViewContent.CenterVerticallyCommand"/>
<MenuItem id = "mnuLayoutSeparator5" type = "Separator" />
<Condition name="MCEditLayoutEmpty" action="Disable">
<!--<MenuItem id = "mnuBringForward"
label = "${res:Mesnac_MainMenu_mnuBringForward}"
class = "Mesnac.Gui.Edit.ViewContent.BringForwardCommand"/>
<MenuItem id = "mnuSendBackward"
label = "${res:Mesnac_MainMenu_mnuSendBackward}"
class = "Mesnac.Gui.Edit.ViewContent.SendBackwardCommand"/>-->
<MenuItem id = "mnuBringToFront"
label = "${res:Mesnac_MainMenu_mnuBringToFront}"
icon = "Icons_16x16_BringToFront"
class = "Mesnac.Gui.Edit.ViewContent.BringToFrontCommand"/>
<MenuItem id = "mnuSendToBack"
label = "${res:Mesnac_MainMenu_mnuSendToBack}"
icon = "Icons_16x16_SendToBack"
class = "Mesnac.Gui.Edit.ViewContent.SendToBackCommand"/>
</Condition>
</Condition>
</MenuItem>
<!--布局 结束-->
<!--仿真 开始-->
<MenuItem id = "mnuSimulation" label = "${res:Mesnac_MainMenu_mnuSimulation}" type="Menu">
<Condition name="MCEditDesignerExistsState" action="Disable">
<MenuItem id = "mnuRun"
label = "${res:Mesnac_MainMenu_mnuRun}"
icon = "Icons_16x16_Run"
shortcut ="F5"
class = "Mesnac.Gui.Edit.ViewContent.RunCommand"/>
</Condition>
</MenuItem> </MenuItem>
<!--仿真 结束--> <!-- 文件 结束 -->
<!--语言 开始--> <!--语言 开始-->
<MenuItem id = "mnuLanguage" label = "${res:Mesnac_MainMenu_mnuLanguage}" type="Menu"> <MenuItem id = "mnuLanguage" label = "${res:Mesnac_MainMenu_mnuLanguage}" type="Menu">
<MenuItem id = "mnuChinese" <MenuItem id = "mnuChinese"
label = "${res:Mesnac_MainMenu_mnuChinese}" label = "${res:Mesnac_MainMenu_mnuChinese}"
class = "Mesnac.Gui.Edit.ViewContent.ChineseCommand"/> class = "Mesnac.Gui.Run.ViewContent.ChineseCommand"/>
<MenuItem id = "mnuEnglish" <MenuItem id = "mnuEnglish"
label = "${res:Mesnac_MainMenu_mnuEnglish}" label = "${res:Mesnac_MainMenu_mnuEnglish}"
class = "Mesnac.Gui.Edit.ViewContent.EnglishCommand"/> class = "Mesnac.Gui.Run.ViewContent.EnglishCommand"/>
</MenuItem> </MenuItem>
<!--语言 结束--> <!--语言 结束-->
<!--帮助 开始--> <!--帮助 开始-->
<MenuItem id = "mnuHelp" label = "${res:Mesnac_MainMenu_mnuHelp}" type="Menu"> <MenuItem id = "Help" label = "${res:Mesnac_MainMenu_Help}" type="Menu">
<MenuItem id = "mnuTest" <MenuItem id = "About"
label = "${res:Mesnac_MainMenu_mnuTest}" label = "${res:Mesnac_MainMenu_About}"
icon = "Icons_16x16_Help" icon ="Icons_16X16_About"
class = "Mesnac.Gui.Edit.ViewContent.TestCommand"/> class = "Mesnac.Gui.Run.ViewContent.AboutCommand"/>
</MenuItem> </MenuItem>
<!--帮助 结束--> <!--帮助 结束-->
</Path> </Path>
<!--系统主菜单 结束--> <!--
<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "Browser"
supportedformats = "Web Pages"
class = "SDUserInterface.GUI.ViewContent.BrowserDisplayBinding"/>
<DisplayBinding id = "Text"
insertafter = "Browser"
supportedformats = "Text Files,Source Files"
class = "SDUserInterface.GUI.ViewContent.TextViewDisplayBinding" />
</Path>
<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "Image"
insertbefore = "Text"
supportedformats = "图片"
class = "SDUserInterface.GUI.ViewContent.ImageDisplayBinding" />
</Path>
-->
<Path name = "/Workspace/Icons"> <Path name = "/Workspace/Icons">
<Icon id = "ResourceFileIcon" <Icon id = "ResourceFileIcon"
extensions = ".resources;.resx" extensions = ".resources;.resx"
resource = "Icons.16x16.ResourceFileIcon" /> resource = "Icons.16x16.ResourceFileIcon" />
</Path> </Path>
<!--工具栏 开始--> <!--工具栏-->
<Path name = "/Mesnac/Workbench/Toolbar"> <Path name = "/Mesnac/Workbench/Toolbar">
<!--文件 开始--> <Condition name="MCRunSuper" action="Disable">
<ToolbarItem id = "tsNew" <ToolbarItem id = "RefreshPlugIn"
icon = "Icons_16x16_New" icon = "Icons_16X16_Refresh"
tooltip = "${res:Mesnac_MainMenu_mnuNew}" tooltip = "${res:Mesnac_MainMenu_RefreshPlugIn}"
class = "Mesnac.Gui.Edit.ViewContent.NewProjectCommand"/> class = "Mesnac.Gui.Run.ViewContent.RefreshPlugInCommand"/>
<ToolbarItem id = "tsOpen" <ToolbarItem id = "SysConfig"
icon = "Icons_16x16_Open" icon = "Icons_16X16_Wrench"
tooltip = "${res:Mesnac_MainMenu_mnuOpen}" tooltip = "${res:Mesnac_MainMenu_SysConfig}"
class = "Mesnac.Gui.Edit.ViewContent.OpenProjectCommand"/> class = "Mesnac.Gui.Run.ViewContent.SysConfigCommand"/>
<Condition name="MCEditProjectState" action="Disable">
<ToolbarItem id = "tsSave"
icon = "Icons_16x16_Save"
tooltip = "${res:Mesnac_MainMenu_mnuSave}"
class = "Mesnac.Gui.Edit.ViewContent.SaveProjectCommand"/>
<ToolbarItem id = "tsClose"
icon = "Icons_16x16_Close"
tooltip = "${res:Mesnac_MainMenu_mnuClose}"
class = "Mesnac.Gui.Edit.ViewContent.CloseProjectCommand"/>
</Condition> </Condition>
<ToolbarItem id = "FullScreen"
icon = "Icons.16x16.FullScreen"
tooltip = "${res:Mesnac_MainMenu_FullScreen}"
class = "Mesnac.Gui.Run.ViewContent.ToggleFullscreenCommand"/>
<ToolbarItem id = "tsFileSeparator" type = "Separator"/> <ToolbarItem id = "tsFileSeparator" type = "Separator"/>
<!--编辑 开始--> <ToolbarItem id = "Exit"
<Condition name="MCEditEditState" action="Disable"> icon = "Icons_16X16_Exit"
<ToolbarItem id = "tsCut" tooltip = "${res:Mesnac_MainMenu_Exit}"
icon = "Icons_16x16_Cut" class = "Mesnac.Gui.Run.ViewContent.ExitCommand"/>
tooltip = "${res:Mesnac_MainMenu_mnuCut}"
class = "Mesnac.Gui.Edit.ViewContent.CutCommand"/>
<ToolbarItem id = "tsCopy"
icon = "Icons_16x16_Copy"
tooltip = "${res:Mesnac_MainMenu_mnuCopy}"
class = "Mesnac.Gui.Edit.ViewContent.CopyCommand"/>
<ToolbarItem id = "tsPaste"
icon = "Icons_16x16_Paste"
tooltip = "${res:Mesnac_MainMenu_mnuPaste}"
class = "Mesnac.Gui.Edit.ViewContent.PasteCommand"/>
<Condition name="MCEditUndoState" action="Disable">
<ToolbarItem id = "tsUndo"
icon = "Icons_16x16_Undo"
tooltip = "${res:Mesnac_MainMenu_mnuUndo}"
class = "Mesnac.Gui.Edit.ViewContent.UndoCommand"/>
</Condition>
<Condition name="MCEditRedoState" action="Disable">
<ToolbarItem id = "tsRedo"
icon = "Icons_16x16_Redo"
tooltip = "${res:Mesnac_MainMenu_mnuRedo}"
class = "Mesnac.Gui.Edit.ViewContent.RedoCommand"/>
</Condition>
</Condition>
<ToolbarItem id = "tsEditSeparator" type = "Separator"/>
<!--布局 开始-->
<Condition name="MCEditLayoutEmpty" action="Disable">
<Condition name="MCEditLayoutOnlyOne" action="Disable">
<Condition name="MCEditLayoutSelectOne" action="Disable">
<ToolbarItem id = "tsAlignLeft"
icon = "Icons_16x16_AlignLeft"
tooltip = "${res:Mesnac_MainMenu_mnuAlignLeft}"
class = "Mesnac.Gui.Edit.ViewContent.AlignLeftCommand"/>
<ToolbarItem id = "tsAlignHorizontalCenters"
icon = "Icons_16x16_AlignHorizontalCenters"
tooltip = "${res:Mesnac_MainMenu_mnuAlignHorizontalCenters}"
class = "Mesnac.Gui.Edit.ViewContent.AlignHorizontalCentersCommand"/>
<ToolbarItem id = "tsAlignRight"
icon = "Icons_16x16_AlignRight"
tooltip = "${res:Mesnac_MainMenu_mnuAlignRight}"
class = "Mesnac.Gui.Edit.ViewContent.AlignRightCommand"/>
<ToolbarItem id = "tsAlignTop"
icon = "Icons_16x16_AlignTop"
tooltip = "${res:Mesnac_MainMenu_mnuAlignTop}"
class = "Mesnac.Gui.Edit.ViewContent.AlignTopCommand"/>
<ToolbarItem id = "tsAlignVerticalCenters"
icon = "Icons_16x16_AlignVerticalCenters"
tooltip = "${res:Mesnac_MainMenu_mnuAlignVerticalCenters}"
class = "Mesnac.Gui.Edit.ViewContent.AlignVerticalCentersCommand"/>
<ToolbarItem id = "tsAlignBottom"
icon = "Icons_16x16_AlignBottom"
tooltip = "${res:Mesnac_MainMenu_mnuAlignBottom}"
class = "Mesnac.Gui.Edit.ViewContent.AlignBottomCommand"/>
<ToolbarItem id = "tsSizeToControlWidth"
icon = "Icons_16x16_SizeToControlWidth"
tooltip = "${res:Mesnac_MainMenu_mnuSizeToControlWidth}"
class = "Mesnac.Gui.Edit.ViewContent.SizeToControlWidthCommand"/>
<ToolbarItem id = "tsSizeToControlHeight"
icon = "Icons_16x16_SizeToControlHeight"
tooltip = "${res:Mesnac_MainMenu_mnuSizeToControlHeight}"
class = "Mesnac.Gui.Edit.ViewContent.SizeToControlHeightCommand"/>
<ToolbarItem id = "tsSizeToControl"
icon = "Icons_16x16_SizeToControl"
tooltip = "${res:Mesnac_MainMenu_mnuSizeToControl}"
class = "Mesnac.Gui.Edit.ViewContent.SizeToControlCommand"/>
<ToolbarItem id = "tsSizeToGrid"
icon = "Icons_16x16_SizeToGrid"
tooltip = "${res:Mesnac_MainMenu_mnuSizeToGrid}"
class = "Mesnac.Gui.Edit.ViewContent.SizeToGridCommand"/>
<ToolbarItem id = "tsHorizSpaceMakeEqual"
icon = "Icons_16x16_HorizSpaceMakeEqual"
tooltip = "${res:Mesnac_MainMenu_mnuHorizSpaceMakeEqual}"
class = "Mesnac.Gui.Edit.ViewContent.HorizSpaceMakeEqualCommand"/>
<ToolbarItem id = "tsHorizSpaceIncrease"
icon = "Icons_16x16_HorizSpaceIncrease"
tooltip = "${res:Mesnac_MainMenu_mnuHorizSpaceIncrease}"
class = "Mesnac.Gui.Edit.ViewContent.HorizSpaceIncreaseCommand"/>
<ToolbarItem id = "tsHorizSpaceDecrease"
icon = "Icons_16x16_HorizSpaceDecrease"
tooltip = "${res:Mesnac_MainMenu_mnuHorizSpaceDecrease}"
class = "Mesnac.Gui.Edit.ViewContent.HorizSpaceDecreaseCommand"/>
<ToolbarItem id = "tsHorizSpaceConcatenate"
icon = "Icons_16x16_HorizSpaceConcatenate"
tooltip = "${res:Mesnac_MainMenu_mnuHorizSpaceConcatenate}"
class = "Mesnac.Gui.Edit.ViewContent.HorizSpaceConcatenateCommand"/>
<ToolbarItem id = "tsVertSpaceMakeEqual"
icon = "Icons_16x16_VertSpaceMakeEqual"
tooltip = "${res:Mesnac_MainMenu_mnuVertSpaceMakeEqual}"
class = "Mesnac.Gui.Edit.ViewContent.VertSpaceMakeEqualCommand"/>
<ToolbarItem id = "tsVertSpaceIncrease"
icon = "Icons_16x16_VertSpaceIncrease"
tooltip = "${res:Mesnac_MainMenu_mnuVertSpaceIncrease}"
class = "Mesnac.Gui.Edit.ViewContent.VertSpaceIncreaseCommand"/>
<ToolbarItem id = "tsVertSpaceDecrease"
icon = "Icons_16x16_VertSpaceDecrease"
tooltip = "${res:Mesnac_MainMenu_mnuVertSpaceDecrease}"
class = "Mesnac.Gui.Edit.ViewContent.VertSpaceDecreaseCommand"/>
<ToolbarItem id = "tsVertSpaceConcatenate"
icon = "Icons_16x16_VertSpaceConcatenate"
tooltip = "${res:Mesnac_MainMenu_mnuVertSpaceConcatenate}"
class = "Mesnac.Gui.Edit.ViewContent.VertSpaceConcatenateCommand"/>
</Condition>
<ToolbarItem id = "tsBringToFront"
icon = "Icons_16x16_BringToFront"
tooltip = "${res:Mesnac_MainMenu_mnuBringToFront}"
class = "Mesnac.Gui.Edit.ViewContent.BringToFrontCommand"/>
<ToolbarItem id = "tsSendToBack"
icon = "Icons_16x16_SendToBack"
tooltip = "${res:Mesnac_MainMenu_mnuSendToBack}"
class = "Mesnac.Gui.Edit.ViewContent.SendToBackCommand"/>
</Condition>
<ToolbarItem id = "tsCenterHorizontally"
icon = "Icons_16x16_CenterHorizontally"
tooltip = "${res:Mesnac_MainMenu_mnuCenterHorizontally}"
class = "Mesnac.Gui.Edit.ViewContent.CenterHorizontallyCommand"/>
<ToolbarItem id = "tsCenterVertically"
icon = "Icons_16x16_CenterVertically"
tooltip = "${res:Mesnac_MainMenu_mnuCenterVertically}"
class = "Mesnac.Gui.Edit.ViewContent.CenterVerticallyCommand"/>
</Condition>
<ToolbarItem id = "tsLayoutSeparator" type = "Separator"/>
<!--视图 开始-->
<ToolbarItem id = "tsSolution"
icon = "Icons_16x16_Solution"
tooltip = "${res:Mesnac_MainMenu_mnuSolution}"
class = "Mesnac.Gui.Edit.ViewContent.SolutionWindowCommand"/>
<ToolbarItem id = "tsToolBox"
icon = "Icons_16x16_ToolBox"
tooltip = "${res:Mesnac_MainMenu_mnuToolBox}"
class = "Mesnac.Gui.Edit.ViewContent.ToolBoxWindowCommand"/>
<ToolbarItem id = "tsProperty"
icon = "Icons_16x16_Property"
tooltip = "${res:Mesnac_MainMenu_mnuProperty}"
class = "Mesnac.Gui.Edit.ViewContent.PropertyWindowCommand"/>
<ToolbarItem id = "tsAction"
icon = "Icons_16x16_Action"
tooltip = "${res:Mesnac_MainMenu_mnuAction}"
class = "Mesnac.Gui.Edit.ViewContent.ActionWindowCommand"/>
<ToolbarItem id = "tsEvent"
icon = "Icons_16x16_Event"
tooltip = "${res:Mesnac_MainMenu_mnuEvent}"
class = "Mesnac.Gui.Edit.ViewContent.EventWindowCommand"/>
<ToolbarItem id = "tsFullScreen"
icon = "Icons.16x16.FullScreen"
tooltip = "${res:Mesnac_MainMenu_mnuFullScreen}"
class = "Mesnac.Gui.Edit.ViewContent.ToggleFullscreenCommand"/>
<ToolbarItem id = "tsViewSeparator" type = "Separator"/>
<!--仿真 开始-->
<Condition name="MCEditDesignerExistsState" action="Disable">
<ToolbarItem id = "tsRun"
icon = "Icons_16x16_Run"
tooltip = "${res:Mesnac_MainMenu_mnuRun}"
class = "Mesnac.Gui.Edit.ViewContent.RunCommand"/>
</Condition>
</Path> </Path>
<!--工具栏 结束-->
</AddIn> </AddIn>

@ -1,8 +1,11 @@
using System; using System;
using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using System.Text;
using System.IO; using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.Core.Services;
using Mesnac.Gui.Run.Global; using Mesnac.Gui.Run.Global;
namespace MCRun namespace MCRun
{ {
@ -10,7 +13,10 @@ namespace MCRun
using Mesnac.DoUtils; using Mesnac.DoUtils;
using Mesnac.Gui.Workbench; using Mesnac.Gui.Workbench;
using Mesnac.PlcUtils; using Mesnac.PlcUtils;
using Mesnac.PlcUtils.common;
using Mesnac.PlcUtils.enumInfo; using Mesnac.PlcUtils.enumInfo;
using Mesnac.PlcUtils.Impl;
using System.Drawing.Drawing2D;
class Program class Program
{ {

Loading…
Cancel
Save