TestEIn 1.6j3 :

- aggiornamento interfaccia EgtInterface
- aggiunta gestione eventi utente per Lua.
This commit is contained in:
Dario Sassi
2015-10-27 10:19:40 +00:00
parent 380a68dc36
commit 9e4ab11b93
5 changed files with 358 additions and 36 deletions
+275
View File
@@ -835,6 +835,21 @@ Public Function EgtOutLog(ByVal sMsg As String) As Boolean
End If
End Function
Public Delegate Function ProcessEventsCallback(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetProcessEvents")>
Private Function EgtSetProcessEvents_32(ByVal Callback As ProcessEventsCallback) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetProcessEvents")>
Private Function EgtSetProcessEvents_64(ByVal Callback As ProcessEventsCallback) As Boolean
End Function
Public Function EgtSetProcessEvents(ByVal Callback As ProcessEventsCallback) As Boolean
If IntPtr.Size = 4 Then
Return EgtSetProcessEvents_32(Callback)
Else
Return EgtSetProcessEvents_64(Callback)
End If
End Function
'---------- UiUnits ------------------------------------------------------------
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetUiUnits")>
@@ -5339,6 +5354,203 @@ Public Function EgtShowOnlyTable(ByVal bVal As Boolean) As Boolean
End If
End Function
' Tools Database
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbAddTool")>
Private Function EgtTdbAddTool_32(ByVal sName As String, ByVal nType As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbAddTool")>
Private Function EgtTdbAddTool_64(ByVal sName As String, ByVal nType As Integer) As Boolean
End Function
Public Function EgtTdbAddTool(ByVal sName As String, ByVal nType As Integer) As Boolean
If IntPtr.Size = 4 Then
Return EgtTdbAddTool_32(sName, nType)
Else
Return EgtTdbAddTool_64(sName, nType)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbCopyTool")>
Private Function EgtTdbCopyTool_32(ByVal sSource As String, ByVal sName As String) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbCopyTool")>
Private Function EgtTdbCopyTool_64(ByVal sSource As String, ByVal sName As String) As Boolean
End Function
Public Function EgtTdbCopyTool(ByVal sSource As String, ByVal sName As String) As Boolean
If IntPtr.Size = 4 Then
Return EgtTdbCopyTool_32(sSource, sName)
Else
Return EgtTdbCopyTool_64(sSource, sName)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbRemoveTool")>
Private Function EgtTdbRemoveTool_32(ByVal sName As String) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbRemoveTool")>
Private Function EgtTdbRemoveTool_64(ByVal sName As String) As Boolean
End Function
Public Function EgtTdbRemoveTool(ByVal sName As String) As Boolean
If IntPtr.Size = 4 Then
Return EgtTdbRemoveTool_32(sName)
Else
Return EgtTdbRemoveTool_64(sName)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbGetFirstTool")>
Private Function EgtTdbGetFirstTool_32(ByVal nFamily As Integer, ByRef psName As IntPtr, ByRef nType As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbGetFirstTool")>
Private Function EgtTdbGetFirstTool_64(ByVal nFamily As Integer, ByRef psName As IntPtr, ByRef nType As Integer) As Boolean
End Function
Public Function EgtTdbGetFirstTool(ByVal nFamily As Integer, ByRef sName As String, ByRef nType As Integer) As Boolean
Dim psName As IntPtr
Dim bOk As Boolean
If IntPtr.Size = 4 Then
bOk = EgtTdbGetFirstTool_32(nFamily, psName, nType)
Else
bOk = EgtTdbGetFirstTool_64(nFamily, psName, nType)
End If
If bOk Then
sName = Marshal.PtrToStringUni(psName)
EgtFreeMemory(psName)
Else
sName = String.Empty
End If
Return bOk
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbGetNextTool")>
Private Function EgtTdbGetNextTool_32(ByVal nFamily As Integer, ByRef psName As IntPtr, ByRef nType As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbGetNextTool")>
Private Function EgtTdbGetNextTool_64(ByVal nFamily As Integer, ByRef psName As IntPtr, ByRef nType As Integer) As Boolean
End Function
Public Function EgtTdbGetNextTool(ByVal nFamily As Integer, ByRef sName As String, ByRef nType As Integer) As Boolean
Dim psName As IntPtr
Dim bOk As Boolean
If IntPtr.Size = 4 Then
bOk = EgtTdbGetNextTool_32(nFamily, psName, nType)
Else
bOk = EgtTdbGetNextTool_64(nFamily, psName, nType)
End If
If bOk Then
sName = Marshal.PtrToStringUni(psName)
EgtFreeMemory(psName)
Else
sName = String.Empty
End If
Return bOk
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbSetToolParamInt")>
Private Function EgtTdbSetToolParamInt_32(ByVal sName As String, ByVal nType As Integer, ByVal nVal As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbSetToolParamInt")>
Private Function EgtTdbSetToolParamInt_64(ByVal sName As String, ByVal nType As Integer, ByVal nVal As Integer) As Boolean
End Function
Public Function EgtTdbSetToolParam(ByVal sName As String, ByVal nType As Integer, ByVal nVal As Integer) As Boolean
If IntPtr.Size = 4 Then
Return EgtTdbSetToolParamInt_32(sName, nType, nVal)
Else
Return EgtTdbSetToolParamInt_64(sName, nType, nVal)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbSetToolParamDouble")>
Private Function EgtTdbSetToolParamDouble_32(ByVal sName As String, ByVal nType As Integer, ByVal dVal As Double) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbSetToolParamDouble")>
Private Function EgtTdbSetToolParamDouble_64(ByVal sName As String, ByVal nType As Integer, ByVal dVal As Double) As Boolean
End Function
Public Function EgtTdbSetToolParam(ByVal sName As String, ByVal nType As Integer, ByVal dVal As Double) As Boolean
If IntPtr.Size = 4 Then
Return EgtTdbSetToolParamDouble_32(sName, nType, dVal)
Else
Return EgtTdbSetToolParamDouble_64(sName, nType, dVal)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbSetToolParamString")>
Private Function EgtTdbSetToolParamString_32(ByVal sName As String, ByVal nType As Integer, ByVal sVal As String) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbSetToolParamString")>
Private Function EgtTdbSetToolParamString_64(ByVal sName As String, ByVal nType As Integer, ByVal sVal As String) As Boolean
End Function
Public Function EgtTdbSetToolParam(ByVal sName As String, ByVal nType As Integer, ByVal sVal As String) As Boolean
If IntPtr.Size = 4 Then
Return EgtTdbSetToolParamString_32(sName, nType, sVal)
Else
Return EgtTdbSetToolParamString_64(sName, nType, sVal)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbGetToolParamInt")>
Private Function EgtTdbGetToolParamInt_32(ByVal sName As String, ByVal nType As Integer, ByRef nVal As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbGetToolParamInt")>
Private Function EgtTdbGetToolParamInt_64(ByVal sName As String, ByVal nType As Integer, ByRef nVal As Integer) As Boolean
End Function
Public Function EgtTdbGetToolParam(ByVal sName As String, ByVal nType As Integer, ByRef nVal As Integer) As Boolean
If IntPtr.Size = 4 Then
Return EgtTdbGetToolParamInt_32(sName, nType, nVal)
Else
Return EgtTdbGetToolParamInt_64(sName, nType, nVal)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbGetToolParamDouble")>
Private Function EgtTdbGetToolParamDouble_32(ByVal sName As String, ByVal nType As Integer, ByRef dVal As Double) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbGetToolParamDouble")>
Private Function EgtTdbGetToolParamDouble_64(ByVal sName As String, ByVal nType As Integer, ByRef dVal As Double) As Boolean
End Function
Public Function EgtTdbGetToolParam(ByVal sName As String, ByVal nType As Integer, ByRef dVal As Double) As Boolean
If IntPtr.Size = 4 Then
Return EgtTdbGetToolParamDouble_32(sName, nType, dVal)
Else
Return EgtTdbGetToolParamDouble_64(sName, nType, dVal)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbGetToolParamString")>
Private Function EgtTdbGetToolParamString_32(ByVal sName As String, ByVal nType As Integer, ByRef psVal As IntPtr) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbGetToolParamString")>
Private Function EgtTdbGetToolParamString_64(ByVal sName As String, ByVal nType As Integer, ByRef psVal As IntPtr) As Boolean
End Function
Public Function EgtTdbGetToolParam(ByVal sName As String, ByVal nType As Integer, ByRef sVal As String) As Boolean
Dim psVal As IntPtr
Dim bOk As Boolean
If IntPtr.Size = 4 Then
bOk = EgtTdbGetToolParamString_32(sName, nType, psVal)
Else
bOk = EgtTdbGetToolParamString_64(sName, nType, psVal)
End If
If bOk Then
sVal = Marshal.PtrToStringUni(psVal)
EgtFreeMemory(psVal)
Else
sVal = String.Empty
End If
Return bOk
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbSave")>
Private Function EgtTdbSave_32() As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbSave")>
Private Function EgtTdbSave_64() As Boolean
End Function
Public Function EgtTdbSave() As Boolean
If IntPtr.Size = 4 Then
Return EgtTdbSave_32()
Else
Return EgtTdbSave_64()
End If
End Function
' Simulation
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimStart")>
Private Function EgtSimStart_32() As Boolean
End Function
@@ -5367,6 +5579,20 @@ Public Function EgtSimMove() As Boolean
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimHome")>
Private Function EgtSimHome_32() As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimHome")>
Private Function EgtSimHome_64() As Boolean
End Function
Public Function EgtSimHome() As Boolean
If IntPtr.Size = 4 Then
Return EgtSimHome_32()
Else
Return EgtSimHome_64()
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimSetStep")>
Private Function EgtSimSetStep_32(ByVal dStep As Double) As Boolean
End Function
@@ -6934,5 +7160,54 @@ Public Enum MCH_CR As Integer
BL = 3
BR = 4
End Enum
'Costanti : famiglie di utensili
Public Enum MCH_TF As Integer
DRILLBIT = 256
SAWBLADE = 512
MILL = 1024
MORTISE = 2048
COMPO = 4096
End Enum
'Costanti : tipi di utensili
Public Enum MCH_TY As Integer
NONE = 0
DRILL_STD = 256
DRILL_LONG = 257
SAW_STD = 512
SAW_FLAT = 513
MILL_STD = 1024
MILL_NOTIP = 1025
MORTISE_STD = 2048
COMPO = 4096
End Enum
'Costanti : parametri degli utensili
Public Enum MCH_TP As Integer
CORR = 8192
EXIT_ = 8193
TYPE = 8194
CORNRAD = 16384
DIAM = 16385
TOTDIAM = 16386
FEED = 16387
ENDFEED = 16388
STARTFEED = 16389
TIPFEED = 16390
LEN = 16391
TOTLEN = 16392
MAXMAT = 16393
LONOFFSET = 16394
RADOFFSET = 16395
SPEED = 16396
SIDEANG = 16397
MAXSPEED = 16398
THICK = 16399
DRAW = 32768
HEAD = 32769
NAME = 32770
SYSNOTES = 32771
USERNOTES = 32772
TCPOS = 32773
UUID = 32774
End Enum
End Module
+37 -23
View File
@@ -25,7 +25,6 @@ Partial Class Form1
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1))
Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
Me.Scene1 = New TestEIn.Scene()
Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabFile = New System.Windows.Forms.TabPage()
Me.btnInsert = New System.Windows.Forms.Button()
@@ -137,7 +136,7 @@ Partial Class Form1
Me.btnFlatParts = New System.Windows.Forms.Button()
Me.btnCompo = New System.Windows.Forms.Button()
Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
Me.tsStatusOnL = New System.Windows.Forms.ToolStripStatusLabel()
Me.tsStatusStop = New System.Windows.Forms.ToolStripStatusLabel()
Me.tsStatusOutput = New System.Windows.Forms.ToolStripStatusLabel()
Me.tsStatusSnapPointType = New System.Windows.Forms.ToolStripStatusLabel()
Me.tsStatusGrid = New System.Windows.Forms.ToolStripStatusLabel()
@@ -185,6 +184,8 @@ Partial Class Form1
Me.MruSFile6 = New System.Windows.Forms.ToolStripMenuItem()
Me.MruSFile7 = New System.Windows.Forms.ToolStripMenuItem()
Me.MruSFile8 = New System.Windows.Forms.ToolStripMenuItem()
Me.tsStatusProgress = New System.Windows.Forms.ToolStripProgressBar()
Me.Scene1 = New TestEIn.Scene()
Me.TableLayoutPanel1.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabFile.SuspendLayout()
@@ -233,17 +234,6 @@ Partial Class Form1
Me.TableLayoutPanel1.Size = New System.Drawing.Size(1096, 645)
Me.TableLayoutPanel1.TabIndex = 0
'
'Scene1
'
Me.Scene1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
Me.Scene1.Cursor = System.Windows.Forms.Cursors.Default
Me.Scene1.Dock = System.Windows.Forms.DockStyle.Fill
Me.Scene1.Location = New System.Drawing.Point(89, 82)
Me.Scene1.Margin = New System.Windows.Forms.Padding(0)
Me.Scene1.Name = "Scene1"
Me.Scene1.Size = New System.Drawing.Size(787, 541)
Me.Scene1.TabIndex = 1
'
'TabControl1
'
Me.TableLayoutPanel1.SetColumnSpan(Me.TabControl1, 3)
@@ -1728,7 +1718,7 @@ Partial Class Form1
Me.TabEdit.Controls.Add(Me.btnDelete)
Me.TabEdit.Location = New System.Drawing.Point(23, 4)
Me.TabEdit.Name = "TabEdit"
Me.TabEdit.Size = New System.Drawing.Size(62, 529)
Me.TabEdit.Size = New System.Drawing.Size(62, 533)
Me.TabEdit.TabIndex = 3
Me.TabEdit.Text = "Edit"
'
@@ -1915,7 +1905,7 @@ Partial Class Form1
Me.TabTransform.Controls.Add(Me.btnMove)
Me.TabTransform.Location = New System.Drawing.Point(23, 4)
Me.TabTransform.Name = "TabTransform"
Me.TabTransform.Size = New System.Drawing.Size(62, 529)
Me.TabTransform.Size = New System.Drawing.Size(62, 533)
Me.TabTransform.TabIndex = 2
Me.TabTransform.Text = "Transform"
'
@@ -2012,7 +2002,7 @@ Partial Class Form1
Me.TabSpecial.Location = New System.Drawing.Point(23, 4)
Me.TabSpecial.Name = "TabSpecial"
Me.TabSpecial.Padding = New System.Windows.Forms.Padding(3)
Me.TabSpecial.Size = New System.Drawing.Size(62, 529)
Me.TabSpecial.Size = New System.Drawing.Size(62, 533)
Me.TabSpecial.TabIndex = 1
Me.TabSpecial.Text = "Special"
'
@@ -2059,7 +2049,7 @@ Partial Class Form1
Me.TableLayoutPanel1.SetColumnSpan(Me.StatusStrip1, 3)
Me.StatusStrip1.Dock = System.Windows.Forms.DockStyle.None
Me.StatusStrip1.GripMargin = New System.Windows.Forms.Padding(0)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsStatusOnL, Me.tsStatusOutput, Me.tsStatusSnapPointType, Me.tsStatusGrid, Me.tsStatusCurPosType, Me.tsStatusCursorPos, Me.tsStatusUnits, Me.tsStatusOnR, Me.tsStatusReg})
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsStatusProgress, Me.tsStatusStop, Me.tsStatusOutput, Me.tsStatusSnapPointType, Me.tsStatusGrid, Me.tsStatusCurPosType, Me.tsStatusCursorPos, Me.tsStatusUnits, Me.tsStatusOnR, Me.tsStatusReg})
Me.StatusStrip1.Location = New System.Drawing.Point(0, 623)
Me.StatusStrip1.MaximumSize = New System.Drawing.Size(0, 22)
Me.StatusStrip1.MinimumSize = New System.Drawing.Size(0, 22)
@@ -2068,11 +2058,16 @@ Partial Class Form1
Me.StatusStrip1.TabIndex = 6
Me.StatusStrip1.Text = "StatusStrip1"
'
'tsStatusOnL
'tsStatusStop
'
Me.tsStatusOnL.AutoSize = False
Me.tsStatusOnL.Name = "tsStatusOnL"
Me.tsStatusOnL.Size = New System.Drawing.Size(88, 17)
Me.tsStatusStop.AutoSize = False
Me.tsStatusStop.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _
Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _
Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides)
Me.tsStatusStop.BorderStyle = System.Windows.Forms.Border3DStyle.Raised
Me.tsStatusStop.Name = "tsStatusStop"
Me.tsStatusStop.Size = New System.Drawing.Size(17, 17)
Me.tsStatusStop.Text = "X"
'
'tsStatusOutput
'
@@ -2083,7 +2078,7 @@ Partial Class Form1
Me.tsStatusOutput.Margin = New System.Windows.Forms.Padding(1, 3, 0, 2)
Me.tsStatusOutput.MergeIndex = 1
Me.tsStatusOutput.Name = "tsStatusOutput"
Me.tsStatusOutput.Size = New System.Drawing.Size(356, 17)
Me.tsStatusOutput.Size = New System.Drawing.Size(324, 17)
Me.tsStatusOutput.Spring = True
Me.tsStatusOutput.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
@@ -2416,6 +2411,24 @@ Partial Class Form1
Me.MruSFile8.Size = New System.Drawing.Size(160, 22)
Me.MruSFile8.Text = "File8"
'
'tsStatusProgress
'
Me.tsStatusProgress.Margin = New System.Windows.Forms.Padding(0, 3, 0, 3)
Me.tsStatusProgress.Name = "tsStatusProgress"
Me.tsStatusProgress.Size = New System.Drawing.Size(72, 16)
Me.tsStatusProgress.Step = 5
'
'Scene1
'
Me.Scene1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
Me.Scene1.Cursor = System.Windows.Forms.Cursors.Default
Me.Scene1.Dock = System.Windows.Forms.DockStyle.Fill
Me.Scene1.Location = New System.Drawing.Point(89, 82)
Me.Scene1.Margin = New System.Windows.Forms.Padding(0)
Me.Scene1.Name = "Scene1"
Me.Scene1.Size = New System.Drawing.Size(787, 541)
Me.Scene1.TabIndex = 1
'
'Form1
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2583,7 +2596,7 @@ End Sub
Friend WithEvents InputCombo As System.Windows.Forms.ComboBox
Friend WithEvents FormTimer As System.Windows.Forms.Timer
Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
Friend WithEvents tsStatusOnL As System.Windows.Forms.ToolStripStatusLabel
Friend WithEvents tsStatusStop As System.Windows.Forms.ToolStripStatusLabel
Friend WithEvents tsStatusOutput As System.Windows.Forms.ToolStripStatusLabel
Friend WithEvents tsStatusOnR As System.Windows.Forms.ToolStripStatusLabel
Friend WithEvents tsStatusSnapPointType As System.Windows.Forms.ToolStripStatusLabel
@@ -2628,5 +2641,6 @@ End Sub
Friend WithEvents cmdSavePartLay As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents btnCompo As System.Windows.Forms.Button
Friend WithEvents btnFlatParts As System.Windows.Forms.Button
Friend WithEvents tsStatusProgress As System.Windows.Forms.ToolStripProgressBar
End Class
+11 -11
View File
@@ -883,7 +883,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABk
DgAAAk1TRnQBSQFMAgEBDwEAARgBEQEYAREBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DgAAAk1TRnQBSQFMAgEBDwEAATABEQEwAREBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAAUADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -955,7 +955,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADW
CAAAAk1TRnQBSQFMAgEBAgEAATgBCAE4AQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAVABCAFQAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1233,14 +1233,14 @@
</data>
<data name="btnPlane.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAHdElNRQffCRYLBS76KngDAAABP0lEQVRYR8WUTa4CIRCE
5wAeSe82iUsXHsiNN8OqFkzTNFFg0pJ81lD8VM0zvi2l9FdcMxLXjMQ1I3HNHhhnwIdpmjut0QOjhJ+9
9V/g+cazhgdDeZgq88vtvp0ezxHyPRBztzUsDOVBqsxL+PWRfma2AEN5iCrzmXAyU4ChPECV+Ww4GS3A
UG6mynwlnIwUYCg3UmW+Gk4GCxwbTkYLiB4VTqYKHBVO/laAd2T03ZpqIsYRBUowvkbv7sprjNUCJhij
/KqE4n/WG2OlgArH0MHyq/JojcUC+Y7qf4lF+94iBDpaoH57fnTDwV7WvQ0Q6ESBfF7ens+WvLbnZynh
bYIsFeBH7+0Zqgvs3iYIlAUG0ed7YHwKiOrFvACpvRG+ncf4XmAVe6cG4/2n7xWIxjUjcc1IXDMS14zE
NeNI2wtww9z9ngOVYQAAAABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAAAd0SU1FB98JFgsFLvoqeAMAAAE/SURBVFhHxZRNrgIhEITnAB5J7zaJSxceyI03
w6oWTNM0UWDSknzWUPxUzTO+LaX0V1wzEteMxDUjcc0eGGfAh2maO63RA6OEn731X+D5xrOGB0N5mCrz
y+2+nR7PEfI9EHO3NSwM5UGqzEv49ZF+ZrYAQ3mIKvOZcDJTgKE8QJX5bDgZLcBQbqbKfCWcjBRgKDdS
Zb4aTgYLHBtORguIHhVOpgocFU7+VoB3ZPTdmmoixhEFSjC+Ru/uymuM1QImGKP8qoTif9YbY6WACsfQ
wfKr8miNxQL5jup/iUX73iIEOlqgfnt+dMPBXta9DRDoRIF8Xt6ez5a8tudnKeFtgiwV4Efv7RmqC+ze
JgiUBQbR53tgfAqI6sW8AKm9Eb6dx/heYBV7pwbj/afvFYjGNSNxzUhcMxLXjMQ140jbC3DD3P2eA5Vh
AAAAAElFTkSuQmCC
</value>
</data>
<data name="btnChangeStartCurve.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1528,7 +1528,7 @@
<value>374, 49</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>97</value>
<value>74</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
+33
View File
@@ -40,6 +40,9 @@ Public Class Form1
Private WithEvents m_Controller As New Controller
Private m_MruFiles As New MruList
Private m_MruScripts As New MruList
Private m_bStopExec As Boolean = False
Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
Public Function GetInstance() As Integer
Return m_nInstance
@@ -262,6 +265,8 @@ Public Class Form1
m_Controller.NewProject(True)
' Impostazione Testi e ToolTips
SetMessages()
' Installo funzione gestione eventi per lua
EgtSetProcessEvents(m_ProcEventsCallback)
End Sub
Private Sub LoadGridData()
@@ -564,6 +569,10 @@ Public Class Form1
Private Sub OnExecutingScript(ByVal sender As Object) Handles m_Controller.OnExecutingScript
ClearObjTree()
' Abilito progress e bottone stop
m_bStopExec = False
tsStatusStop.Enabled = True
tsStatusProgress.Value = 0
End Sub
Private Sub OnExecutedScript(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean, ByVal sError As String) Handles m_Controller.OnExecutedScript
@@ -574,6 +583,9 @@ Public Class Form1
m_MruScripts.Remove(sFile)
MessageBox.Show(sError, EgtMsg(10001), MessageBoxButtons.OK, MessageBoxIcon.Error) ' Error
End If
' Disabilito progress e bottone stop
tsStatusStop.Enabled = False
tsStatusProgress.Value = 0
End Sub
Private Sub OnPrepareInputBox(ByVal sTitle As String, ByVal sLabel As String, ByVal sCheckLabel As String,
@@ -771,6 +783,23 @@ Public Class Form1
End If
End Sub
Public Function ProcessEvents(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
' Se previsto, imposto progress
If nProg > 0 Then
tsStatusProgress.Value = nProg
End If
' Costringo ad aggiornare
Application.DoEvents()
' Eventuale attesa
Thread.Sleep(nPause)
' Ritorno eventuale stop
If m_bStopExec Then
Return 0
Else
Return 1
End If
End Function
'-------------------------------- Top Commands ---------------------------------------------------
' ------ File -------
@@ -1826,6 +1855,10 @@ Public Class Form1
EgtSetUiUnits(m_bMmUnits)
End Sub
Private Sub ToolStripStatusStop_Click() Handles tsStatusStop.Click
m_bStopExec = True
End Sub
'-------------------------------- MRU Files Menu -------------------------------------------------
Private Sub ShowMenuMruFiles(ByVal control As Control, ByVal Pos As Point)
+2 -2
View File
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
' utilizzando l'asterisco (*) come descritto di seguito:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.6.10.2")>
<Assembly: AssemblyFileVersion("1.6.10.2")>
<Assembly: AssemblyVersion("1.6.10.3")>
<Assembly: AssemblyFileVersion("1.6.10.3")>