Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-20 14:08:12 +01:00
parent 49fea58664 619c93b1ba
commit e169ceea63
6 changed files with 81 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-MAN/IOBManPanel.Designer.cs
Generated
+12 -22
View File
@@ -33,14 +33,14 @@
this.btnClose = new System.Windows.Forms.Button();
this.childList = new System.Windows.Forms.ListBox();
this.MainTimer = new System.Windows.Forms.Timer(this.components);
this.btnStartChild = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// btnOpen
//
this.btnOpen.Location = new System.Drawing.Point(24, 74);
this.btnOpen.Location = new System.Drawing.Point(18, 60);
this.btnOpen.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnOpen.Name = "btnOpen";
this.btnOpen.Size = new System.Drawing.Size(75, 33);
this.btnOpen.Size = new System.Drawing.Size(56, 27);
this.btnOpen.TabIndex = 1;
this.btnOpen.Text = "Open";
this.btnOpen.UseVisualStyleBackColor = true;
@@ -48,9 +48,10 @@
//
// btnClose
//
this.btnClose.Location = new System.Drawing.Point(152, 74);
this.btnClose.Location = new System.Drawing.Point(114, 60);
this.btnClose.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(75, 33);
this.btnClose.Size = new System.Drawing.Size(56, 27);
this.btnClose.TabIndex = 70;
this.btnClose.Text = "Close";
this.btnClose.UseVisualStyleBackColor = true;
@@ -59,36 +60,26 @@
// childList
//
this.childList.FormattingEnabled = true;
this.childList.ItemHeight = 16;
this.childList.Location = new System.Drawing.Point(262, 74);
this.childList.Location = new System.Drawing.Point(196, 60);
this.childList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.childList.Name = "childList";
this.childList.Size = new System.Drawing.Size(220, 84);
this.childList.Size = new System.Drawing.Size(166, 69);
this.childList.TabIndex = 71;
//
// MainTimer
//
this.MainTimer.Tick += new System.EventHandler(this.MainTimer_Tick);
//
// btnStartChild
//
this.btnStartChild.Location = new System.Drawing.Point(24, 175);
this.btnStartChild.Name = "btnStartChild";
this.btnStartChild.Size = new System.Drawing.Size(111, 23);
this.btnStartChild.TabIndex = 72;
this.btnStartChild.Text = "Start Child";
this.btnStartChild.UseVisualStyleBackColor = true;
this.btnStartChild.Click += new System.EventHandler(this.btnStartChild_Click);
//
// IOBManPanel
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(993, 734);
this.Controls.Add(this.btnStartChild);
this.ClientSize = new System.Drawing.Size(745, 596);
this.Controls.Add(this.childList);
this.Controls.Add(this.btnClose);
this.Controls.Add(this.btnOpen);
this.IsMdiContainer = true;
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "IOBManPanel";
this.Text = "IOB MANAGER";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.IOBManPanel_FormClosing);
@@ -101,7 +92,6 @@
private System.Windows.Forms.Button btnClose;
private System.Windows.Forms.ListBox childList;
private System.Windows.Forms.Timer MainTimer;
private System.Windows.Forms.Button btnStartChild;
}
}
IOB-MAN/IOBManPanel.cs
-13
View File
@@ -1,12 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace IOB_MAN
@@ -184,14 +179,6 @@ namespace IOB_MAN
}
}
private void btnStartChild_Click(object sender, EventArgs e)
{
CForm child = new CForm();
child.MdiParent = this;
child.Show();
this.LayoutMdi(MdiLayout.TileHorizontal);
}
}
IOB-WIN.sln
+36 -2
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2003
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOB-WIN", "IOB-WIN\IOB-WIN.csproj", "{ADCB8028-79C4-4896-A9A7-E3C5140FC00B}"
EndProject
@@ -16,6 +16,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CncLib", "CncLib\CncLib.vbp
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CVCncLib", "CVCncLib\CVCncLib.vbproj", "{DC6B309E-F8E9-4BA2-A621-4F617C072533}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOB-MAN", "IOB-MAN\IOB-MAN.csproj", "{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CMS-FANUC|Any CPU = CMS-FANUC|Any CPU
@@ -196,6 +198,38 @@ Global
{DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|Any CPU.Build.0 = Release|Any CPU
{DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|x86.ActiveCfg = Release|x86
{DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|x86.Build.0 = Release|x86
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.CMS-FANUC|Any CPU.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.CMS-FANUC|Any CPU.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.CMS-FANUC|x86.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.CMS-FANUC|x86.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.CMS-OSAI|Any CPU.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.CMS-OSAI|Any CPU.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.CMS-OSAI|x86.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.CMS-OSAI|x86.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.CMS-SIEMENS|Any CPU.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.CMS-SIEMENS|Any CPU.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.CMS-SIEMENS|x86.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.CMS-SIEMENS|x86.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.Debug|x86.ActiveCfg = Debug|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.Debug|x86.Build.0 = Debug|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.FANUC|Any CPU.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.FANUC|Any CPU.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.FANUC|x86.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.FANUC|x86.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.Release|Any CPU.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.Release|x86.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.Release|x86.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.SCM-ESA|Any CPU.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.SCM-ESA|Any CPU.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.SCM-ESA|x86.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.SCM-ESA|x86.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.SIEMENS|Any CPU.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.SIEMENS|Any CPU.Build.0 = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.SIEMENS|x86.ActiveCfg = Release|Any CPU
{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}.SIEMENS|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
IOB-WIN/DATA/CONF/MAIN.ini
+2 -2
View File
@@ -51,8 +51,8 @@ CMDIOB2CALL=/IOB/getIob2call?GWIP=
;STARTLIST=IMI_50
; SIMULAZIONE verso server ufficio
;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04
STARTLIST=SIMUL_01
STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04
;STARTLIST=SIMUL_01
;STARTLIST=SIM_DP_01
;STARTLIST=TEST
IOB-WIN/MainForm.cs
+26 -1
View File
@@ -22,6 +22,10 @@ namespace IOB_WIN
{
#region variabili globali, utils ed helpers
/// <summary>
/// PArametri (opzionali) di avvio
/// </summary>
protected string[] myArgs;
/// <summary>
/// Ramo applicazione (x update)
/// </summary>
@@ -290,10 +294,31 @@ namespace IOB_WIN
#region init form
public MainForm()
/// <summary>
/// Init Main Form
/// </summary>
public MainForm(string[] args)
{
// salgo args di avvio
myArgs = args;
// continuo iNIT!!!
InitializeComponent();
myInit();
if (args != null)
{
if (args.Length > 0)
{
lgInfo("Argomenti di avvio:");
foreach (var item in myArgs)
{
lgInfo(item);
}
}
else
{
lgInfo("NESSUN Argomento di avvio trovato");
}
}
}
protected void myInit()
IOB-WIN/Program.cs
+5 -6
View File
@@ -1,5 +1,4 @@
using System;
using System.Runtime.InteropServices;
using System.Windows.Forms;
namespace IOB_WIN
@@ -8,19 +7,19 @@ namespace IOB_WIN
{
/// <summary>
/// Punto di ingresso principale dell'applicazione.
/// <paramref name="args">Parametri di avvio</paramref>
/// </summary>
[STAThread]
static void Main()
static void Main(string[] args)
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
try
{
Application.Run(new MainForm());
}
catch(Exception exc)
{
Application.Run(new MainForm(args));
}
catch
{ }
}
}
}