Egalware/TestEIn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TestEIn 1.8f4 :

Browse Source 
- aggiornamenti.
This commit is contained in:
Dario Sassi
2017-06-21 13:47:10 +00:00
parent bdf889127b
commit 1865a04cd5
7 changed files with 137 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controller.vb
+10 -8
View File
@@ -23,9 +23,9 @@ Public Class Controller
Public Event OnOpeningProject(ByVal sender As Object)
Public Event OnOpenProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean)
Public Event OnInsertedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean)
Public Event OnSavingProject(ByVal sender As Object)
Public Event OnSavingProject(ByVal sender As Object, ByVal sFile As String)
Public Event OnSavedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean)
Public Event OnSavingObject(ByVal sender As Object)
Public Event OnSavingObject(ByVal sender As Object, ByVal sFile As String)
Public Event OnSavedObject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean)
Public Event OnImportingProject(ByVal sender As Object, ByVal nType As Integer, ByRef nFlag As Integer)
Public Event OnImportedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean)
@@ -208,6 +208,7 @@ Public Class Controller
ResetStatus()
m_Scene.ResetStatus(False)
' eseguo
m_Scene.Cursor = Cursors.WaitCursor
EnableCommandLog()
Dim bOk As Boolean = EgtNewFile()
If bOk And bCreatePart Then
@@ -226,6 +227,7 @@ Public Class Controller
RaiseEvent UpdateUI(Me, True)
' Gestione risultato
RaiseEvent OnNewProject(Me, bOk)
m_Scene.Cursor = Cursors.Default
Return bOk
End Function
@@ -258,11 +260,11 @@ Public Class Controller
EnableCommandLog()
Dim bOk As Boolean = EgtOpenFile(sFile)
DisableCommandLog()
m_Scene.Cursor = Cursors.Default
' Aggiornamento
RaiseEvent UpdateUI(Me, True)
' Gestione risultato
RaiseEvent OnOpenProject(Me, sFile, bOk)
m_Scene.Cursor = Cursors.Default
Return bOk
End Function
@@ -300,11 +302,11 @@ Public Class Controller
EgtResetCurrPartLayer()
End If
DisableCommandLog()
m_Scene.Cursor = Cursors.Default
' Aggiornamento
RaiseEvent UpdateUI(Me, True)
' Gestione risultato
RaiseEvent OnInsertedProject(Me, sFile, bOk)
m_Scene.Cursor = Cursors.Default
Return bOk
End Function
@@ -314,7 +316,7 @@ Public Class Controller
Return SaveAsProject(sCurrFile, nType)
Else
' Prima del salvataggio
RaiseEvent OnSavingProject(Me)
RaiseEvent OnSavingProject(Me, sCurrFile)
' Salvataggio del progetto
m_Scene.Cursor = Cursors.WaitCursor
EnableCommandLog()
@@ -347,7 +349,7 @@ Public Class Controller
End If
Dim sFileName As String = SaveFileDialog.FileName
'Prima del salvataggio
RaiseEvent OnSavingProject(Me)
RaiseEvent OnSavingProject(Me, sFileName)
'Salvataggio del progetto
m_Scene.Cursor = Cursors.WaitCursor
EnableCommandLog()
@@ -400,7 +402,7 @@ Public Class Controller
End If
Dim sFileName As String = SaveFileDialog.FileName
'Prima del salvataggio
RaiseEvent OnSavingObject(Me)
RaiseEvent OnSavingObject(Me, sFileName)
'Salvataggio dell'oggetto con la sua ascendenza
m_Scene.Cursor = Cursors.WaitCursor
EnableCommandLog()
@@ -470,11 +472,11 @@ Public Class Controller
End If
EgtResetCurrPartLayer()
DisableCommandLog()
m_Scene.Cursor = Cursors.Default
' Aggiornamento
RaiseEvent UpdateUI(Me, True)
' Gestione risultato
RaiseEvent OnImportedProject(Me, sFile, bOk)
m_Scene.Cursor = Cursors.Default
Return bOk
End Function
EgtInterface.vb
+74
View File
@@ -8883,6 +8883,20 @@ End Function
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSpecialUpdateDisposition"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSpecialUpdateDisposition_32(nId As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSpecialUpdateDisposition"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSpecialUpdateDisposition_64(nId As Integer) As Boolean
End Function
Public Function EgtSpecialUpdateDisposition(nId As Integer) As Boolean
If IntPtr.Size = 4 Then
Return EgtSpecialUpdateDisposition_32(nId)
Else
Return EgtSpecialUpdateDisposition_64(nId)
End If
End Function
' Machinings
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtAddMachining"), SuppressUnmanagedCodeSecurity()>
Private Function EgtAddMachining_32(sName As String, sMachining As String) As Integer
@@ -9064,6 +9078,20 @@ End Function
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtUpdateMachining"), SuppressUnmanagedCodeSecurity()>
Private Function EgtUpdateMachining_32() As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtUpdateMachining"), SuppressUnmanagedCodeSecurity()>
Private Function EgtUpdateMachining_64() As Boolean
End Function
Public Function EgtUpdateMachining() As Boolean
If IntPtr.Size = 4 Then
Return EgtUpdateMachining_32()
Else
Return EgtUpdateMachining_64()
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetMachiningParamBool"), SuppressUnmanagedCodeSecurity()>
Private Function EgtGetMachiningParamBool_32(nType As Integer, ByRef bVal As Boolean) As Boolean
End Function
@@ -9157,6 +9185,52 @@ End Function
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtApplyAllMachinings"), SuppressUnmanagedCodeSecurity()>
Private Function EgtApplyAllMachinings_32(bStopOnFirstErr As Boolean, ByRef psErrList As IntPtr) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtApplyAllMachinings"), SuppressUnmanagedCodeSecurity()>
Private Function EgtApplyAllMachinings_64(bStopOnFirstErr As Boolean, ByRef psErrList As IntPtr) As Boolean
End Function
Public Function EgtApplyAllMachinings(bStopOnFirstErr As Boolean, ByRef sErrList As String) As Boolean
Dim psErrList As IntPtr
Dim bOk As Boolean
If IntPtr.Size = 4 Then
bOk = EgtApplyAllMachinings_32(bStopOnFirstErr, psErrList)
Else
bOk = EgtApplyAllMachinings_64(bStopOnFirstErr, psErrList)
End If
If bOk Then
sErrList = Marshal.PtrToStringUni(psErrList)
EgtFreeMemory(psErrList)
Else
sErrList = String.Empty
End If
Return bOk
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtUpdateAllMachinings"), SuppressUnmanagedCodeSecurity()>
Private Function EgtUpdateAllMachinings_32(bStopOnFirstErr As Boolean, ByRef psErrList As IntPtr) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtUpdateAllMachinings"), SuppressUnmanagedCodeSecurity()>
Private Function EgtUpdateAllMachinings_64(bStopOnFirstErr As Boolean, ByRef psErrList As IntPtr) As Boolean
End Function
Public Function EgtUpdateAllMachinings(bStopOnFirstErr As Boolean, ByRef sErrList As String) As Boolean
Dim psErrList As IntPtr
Dim bOk As Boolean
If IntPtr.Size = 4 Then
bOk = EgtUpdateAllMachinings_32(bStopOnFirstErr, psErrList)
Else
bOk = EgtUpdateAllMachinings_64(bStopOnFirstErr, psErrList)
End If
If bOk Then
sErrList = Marshal.PtrToStringUni(psErrList)
EgtFreeMemory(psErrList)
Else
sErrList = String.Empty
End If
Return bOk
End Function
' Simulation
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimStart"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimStart_32(bFirst As Boolean) As Boolean
Form1.Designer.vb
Generated
+2 -1
View File
@@ -1178,7 +1178,8 @@ Partial Class Form1
Me.ImageList1.Images.SetKeyName(11, "CCompo.ico")
Me.ImageList1.Images.SetKeyName(12, "STriMesh.ico")
Me.ImageList1.Images.SetKeyName(13, "SFlatRegion.ico")
Me.ImageList1.Images.SetKeyName(14, "text.ico")
Me.ImageList1.Images.SetKeyName(14, "VolZmap.ico")
Me.ImageList1.Images.SetKeyName(15, "text.ico")
'
'ImageList2
'
Form1.resx
+40 -38
View File
@@ -882,9 +882,9 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABk
DgAAAk1TRnQBSQFMAgEBDwEAAUgBEQFIAREBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAAUADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADS
DgAAAk1TRnQBSQFMAgEBEAEAAVABEQFQAREBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAAVADAAEBAQABCAYAARQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
@@ -911,40 +911,42 @@
AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/0MAC/wFAAv8JQAC/Af+
AvwFAAH8Cf4B/AcAB/wWAAH8Av4B/AX+AfwB/gH8BAAB/Ar+AfwJAAP8GAAB/AP+AfwD/gH8Av4B/AQA
AfwC/gb8Av4B/AkAA/wYAAH8BP4B/AH+AfwD/gH8BAAB/AL+AfwEAAH8Av4B/AkAA/wYAAH8BP4C/AT+
AfwEAAH8Av4B/AQAAfwC/gH8CQAD/BcAAfwB/gT8Af4C/AT+AfwCAAH8A/4B/AQAAfwD/gH8CAAD/BcA
AvwF/gH8Af4B/AP+AfwCAAL8Av4G/AP+AfwIAAP8GAAB/AX+AfwC/gH8Av4B/AMAAfwL/gH8CAAD/BkA
AfwD/gH8BP4B/AH+AfwEAAH8Cv4B/AgAA/waAAL8Af4B/AX+AvwFAAL8CP4B/AQAAfwDAAP8AwAB/BgA
AvwD/gT8BwAC/AP+BPwEAAH8AwAD/AMAAfwZAAT8DAAE/AgAC/zlAAL8IwAG/A8AAvwEAAL8IwAH/A0A
A/wEAAL8DQAC/BkAAvwMAAP8BQAC/A0AAvwaAAL8CgAD/AYAA/wMAAL8BQAF/BAAAvwJAAP8CAAC/AwA
AvwEAAf8AwAC/AoAAvwIAAP8CQAD/AsAA/wCAAP8AwAC/AMAAvwKAAL8BwAD/AsAA/wLAAb8BQAC/AIA
AvwKAAL8BgAD/AwAA/wMAAP8BwAC/AIAAvwKAAL8BQAD/A4ABPwUAAL8AgAC/AoAAvwEAAP8EAAF/BIA
AvwCAAL8CgAC/AMAA/wTAAf8EgAD/AgAA/wDAAL8FgAF/BMADPw1AAn8gAAB+T8AAvk3AAr5AgAI2QoA
AvwgAAr5CgAB2QkAA/weAAL6BgAC+QwAAdkJAAP8EAAC/AkAAvwD+gUAAfkEAAjZAgAB2QkAA/wOAAT8
CAAC/AEAA/oKAAjZAgAB2QkAA/wCAAL8CAAG/AcAAvwCAAP6CgAI2QIAAdkJAAP8AQAC/AgABvwHAAL8
AwAD+gEAAfoIAAjZAgAB2QkABfwJAAT8CAAC/AQABPoJAAjZDAAE/AoAAvwJAAL8BQAD+goACNkJAAb8
FQAC/AQABPoLAAjZCAAG/BMABvw7AAT8PQAC/I4AA/kD+gP7A/w0AAP5A/oD+wP8FwAE/AgACawIAAP5
A/oD+wP8CQAC+QsABPwCAAL5BQAJrAGFBwAD+QP6A/sD/AkAAvkKAAT8AQAD+QYACawChQYAA/kD+gP7
A/wWAAL8AQAC+QMAAgQDAAmsA4UFAAP5A/oD+wP8CQAC+QwAAvkCAAP6AgQDAAmsBIUEAAP5A/oD+wP8
CQAC+QsAAvkBAAT6AQACBAQACNkFhQMAA/kD+gP7A/wKAAL5CAAD+QT6AwACBAUACNkFhQIAA/kD+gP7
A/wLAAL5BgAC+QIAAvoFAAIEBgAI2QSFAgAD+QP6A/sD/AcAAvkCAAL5CQAC+gIAAwcKAAjZA4UCAAP5
A/oD+wP8BwAC+QIAAvkJAAL6AgADBwsACNkChQIAA/kD+gP7A/wIAAT5CwAB+hEACNkBhQIAA/kD+gP7
A/w0AAP5A/oD+wP8cgABQgFNAT4HAAE+AwABKAMAAUADAAFAAwABAQEAAQEGAAECFgAD/wEABv8CAAHA
AQcBwAEHAv8CAAHAAQcBwAEHAfABHwIAAYABBwGAAQcB/AF/AgABgAEHAYABBwH8AX8CAAGAAQcChwH8
AX8CAAGAAQcChwH8AX8DAAEDAQcBgwH8AX8DAAEDAQABAwH8AX8CAAGAAQMBgAEDAfwBfwIAAcABAwHA
AQMB/AF/AgAB4AEDAeABAwHcAXcCAAH4AQMB+AEDAdwBdwIAAfwBPwH8AT8BwAEHAgAG/wIABv8CAAr/
Ac8D/wH+AQcB/wHzAc8D/wH+AQMB/wHjAc8B/wGfAv8B8wH/AccBzwH/AZ8C/wH5Af8BjwHHAf8BnwEH
Af8B+QH/AR8B5wH/AZ4BAwGfAfkB/gE/AeMB/wGMAXMBnwH5AfwBfwHxAf8BwAH5AZ8B+QH4Af8B8QH/
AeMB+QGfAfkB8QH/AfgBfwH/AfkBnwH5AeMB/wH8AR8B/wH5AZ8B+QHHAv8BAQL/AY8B8QHPAv8BwQL/
AcABAwb/AeABDw//AfcG/wHPAfMG/wGAAQEBgAF/AecD/wGAAQEB/wG/AeMD/wHDAfMB/wHfAfEB/wH+
AX8BwQH3AYABbwH4Af8B/AE/AcgB/wHAATcB/AFnAfgBHwHMAX8B4AEbAf4BJwH4AR8BzgEvAfABDQH/
AQcB/AE/Ac8BDwH4AQcB/wGHAf4BfwHPAY8B/AEDAf4BBwL/Ac8BDwH+AQEB/gEHAv8BAwf/AYcH/wHP
Ef8BwAEDAv8B+AEfAv8BwAEDAv8B4AFnAYABPwHAAQMB/gF/AdABywGAAR8BwAEDAf4BfwGhAR0BgAEP
AcABAwL/AbIBcQGAAQcBwAEDAf4BfwF5AYIBgAEDAcABAwH+AX8BcgESAcABAQHAAQMB/wE/AUABcgHg
AQABwAEDAf8BnwEZARIB8AEAAcABAwH5AZ8BsgENAfgBAAHAAQMB+QGfAbIBDQH8AQABwAEDAfwBPwHb
ARsB/gEAAcABAwL/AucC/wHAAQMC/wH4AR8K/ws=
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8ARwAL/AUA
C/wlAAL8B/4C/AUAAfwJ/gH8FwAH/AYAAfwC/gH8Bf4B/AH+AfwEAAH8Cv4B/BkAA/wIAAH8A/4B/AP+
AfwC/gH8BAAB/AL+BvwC/gH8BQAM/AgAA/wIAAH8BP4B/AH+AfwD/gH8BAAB/AL+AfwEAAH8Av4B/AUA
AfwK/gH8CAAD/AgAAfwE/gL8BP4B/AQAAfwC/gH8BAAB/AL+AfwFAAH8Cv4B/AgAA/wHAAH8Af4E/AH+
AvwE/gH8AgAB/AP+AfwEAAH8A/4B/AQAAfwK/gH8CAAD/AcAAvwF/gH8Af4B/AP+AfwCAAL8Av4G/AP+
AfwEAAH8Av4D/AH+AvwC/gH8CAAD/AgAAfwF/gH8Av4B/AL+AfwDAAH8C/4B/AQAAfwC/gH8AQAC/AIA
AfwB/gH8CAAD/AkAAfwD/gH8BP4B/AH+AfwEAAH8Cv4B/AUAAfwB/gH8AQAC/AIAAfwB/gH8CAAD/AoA
AvwB/gH8Bf4C/AUAAvwI/gH8BgAC/AUAA/wEAAH8AwAD/AMAAfwIAAL8A/4E/AcAAvwD/gT8FAAB/AMA
A/wDAAH8CQAE/AwABPwYAAv81QAC/CMABvwPAAL8BAAC/CMAB/wNAAP8BAAC/A0AAvwZAAL8DAAD/AUA
AvwNAAL8GgAC/AoAA/wGAAP8DAAC/AUABfwQAAL8CQAD/AgAAvwMAAL8BAAH/AMAAvwKAAL8CAAD/AkA
A/wLAAP8AgAD/AMAAvwDAAL8CgAC/AcAA/wLAAP8CwAG/AUAAvwCAAL8CgAC/AYAA/wMAAP8DAAD/AcA
AvwCAAL8CgAC/AUAA/wOAAT8FAAC/AIAAvwKAAL8BAAD/BAABfwSAAL8AgAC/AoAAvwDAAP8EwAH/BIA
A/wIAAP8AwAC/BYABfwTAAz8NQAJ/IAAAfk/AAL5NwAK+QIACNkKAAL8IAAK+QoAAdkJAAP8HgAC+gYA
AvkMAAHZCQAD/BAAAvwJAAL8A/oFAAH5BAAI2QIAAdkJAAP8DgAE/AgAAvwBAAP6CgAI2QIAAdkJAAP8
AgAC/AgABvwHAAL8AgAD+goACNkCAAHZCQAD/AEAAvwIAAb8BwAC/AMAA/oBAAH6CAAI2QIAAdkJAAX8
CQAE/AgAAvwEAAT6CQAI2QwABPwKAAL8CQAC/AUAA/oKAAjZCQAG/BUAAvwEAAT6CwAI2QgABvwTAAb8
OwAE/D0AAvyOAAP5A/oD+wP8NAAD+QP6A/sD/BcABPwIAAmsCAAD+QP6A/sD/AkAAvkLAAT8AgAC+QUA
CawBhQcAA/kD+gP7A/wJAAL5CgAE/AEAA/kGAAmsAoUGAAP5A/oD+wP8FgAC/AEAAvkDAAIEAwAJrAOF
BQAD+QP6A/sD/AkAAvkMAAL5AgAD+gIEAwAJrASFBAAD+QP6A/sD/AkAAvkLAAL5AQAE+gEAAgQEAAjZ
BYUDAAP5A/oD+wP8CgAC+QgAA/kE+gMAAgQFAAjZBYUCAAP5A/oD+wP8CwAC+QYAAvkCAAL6BQACBAYA
CNkEhQIAA/kD+gP7A/wHAAL5AgAC+QkAAvoCAAMHCgAI2QOFAgAD+QP6A/sD/AcAAvkCAAL5CQAC+gIA
AwcLAAjZAoUCAAP5A/oD+wP8CAAE+QsAAfoRAAjZAYUCAAP5A/oD+wP8NAAD+QP6A/sD/HIAAUIBTQE+
BwABPgMAASgDAAFAAwABUAMAAQEBAAEBBQABgAECFgAD/4EACP8BwAEHAcABBwT/AcABBwHAAQcC/wHw
AR8BgAEHAYABBwL/AfwBfwGAAQcBgAEHAcABAwH8AX8BgAEHAocBwAEDAfwBfwGAAQcChwHAAQMB/AF/
AQABAwEHAYMBwAEDAfwBfwEAAQMBAAEDAcABAwH8AX8BgAEDAYABAwHCAWMB/AF/AcABAwHAAQMB4gFj
AfwBfwHgAQMB4AEDAfMB4wHcAXcB+AEDAfgBAwL/AdwBdwH8AT8B/AE/Av8BwAEHGv8BzwP/Af4BBwH/
AfMBzwP/Af4BAwH/AeMBzwH/AZ8C/wHzAf8BxwHPAf8BnwL/AfkB/wGPAccB/wGfAQcB/wH5Af8BHwHn
Af8BngEDAZ8B+QH+AT8B4wH/AYwBcwGfAfkB/AF/AfEB/wHAAfkBnwH5AfgB/wHxAf8B4wH5AZ8B+QHx
Af8B+AF/Af8B+QGfAfkB4wH/AfwBHwH/AfkBnwH5AccC/wEBAv8BjwHxAc8C/wHBAv8BwAEDBv8B4AEP
D/8B9wb/Ac8B8wb/AYABAQGAAX8B5wP/AYABAQH/Ab8B4wP/AcMB8wH/Ad8B8QH/Af4BfwHBAfcBgAFv
AfgB/wH8AT8ByAH/AcABNwH8AWcB+AEfAcwBfwHgARsB/gEnAfgBHwHOAS8B8AENAf8BBwH8AT8BzwEP
AfgBBwH/AYcB/gF/Ac8BjwH8AQMB/gEHAv8BzwEPAf4BAQH+AQcC/wEDB/8Bhwf/Ac8R/wHAAQMC/wH4
AR8C/wHAAQMC/wHgAWcBgAE/AcABAwH+AX8B0AHLAYABHwHAAQMB/gF/AaEBHQGAAQ8BwAEDAv8BsgFx
AYABBwHAAQMB/gF/AXkBggGAAQMBwAEDAf4BfwFyARIBwAEBAcABAwH/AT8BQAFyAeABAAHAAQMB/wGf
ARkBEgHwAQABwAEDAfkBnwGyAQ0B+AEAAcABAwH5AZ8BsgENAfwBAAHAAQMB/AE/AdsBGwH+AQABwAED
Av8C5wL/AcABAwL/AfgBHwr/Cw==
</value>
</data>
<metadata name="ImageList2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -955,7 +957,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADW
CAAAAk1TRnQBSQFMAgEBAgEAAWgBCAFoAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAXABCAFwAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Form1.vb
+7 -4
View File
@@ -542,6 +542,7 @@ Public Class Form1
End Sub
Private Sub OnNewProject(ByVal sender As Object, ByVal bOk As Boolean) Handles m_Controller.OnNewProject
EgtZoom(ZM.ALL)
If Not bOk Then
MessageBox.Show(EgtMsg(10002), EgtMsg(10001), MessageBoxButtons.OK, MessageBoxIcon.Error) ' Error on new file - Error
End If
@@ -567,10 +568,10 @@ Public Class Form1
EgtZoom(ZM.ALL)
End Sub
Private Sub OnSavingProject(ByVal sender As Object) Handles m_Controller.OnSavingProject
Private Sub OnSavingProject(sender As Object, sFile As String) Handles m_Controller.OnSavingProject
End Sub
Private Sub OnSavedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnSavedProject
Private Sub OnSavedProject(sender As Object, sFile As String, bOk As Boolean) Handles m_Controller.OnSavedProject
WritePrivateProfileString(S_GENERAL, K_LASTNGEDIR, Path.GetDirectoryName(sFile), m_sIniFile)
If bOk Then
m_MruFiles.Add(sFile)
@@ -581,7 +582,7 @@ Public Class Form1
End If
End Sub
Private Sub OnSavingObject(ByVal sender As Object) Handles m_Controller.OnSavingObject
Private Sub OnSavingObject(sender As Object, sFile As String) Handles m_Controller.OnSavingObject
End Sub
Private Sub OnSavedObject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnSavedObject
@@ -1667,8 +1668,10 @@ Public Class Form1
Return 12
Case GDB_TY.SRF_FRGN
Return 13
Case GDB_TY.EXT_TEXT
Case GDB_TY.VOL_ZMAP
Return 14
Case GDB_TY.EXT_TEXT
Return 15
End Select
Return 1
End Function
My Project/AssemblyInfo.vb
+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.8.6.2")>
<Assembly: AssemblyFileVersion("1.8.6.2")>
<Assembly: AssemblyVersion("1.8.6.4")>
<Assembly: AssemblyFileVersion("1.8.6.4")>
Scene.vb
+2
View File
@@ -1084,7 +1084,9 @@ Public Class Scene
Public Function SetSnapPointType(SnapPointType As SP) As Boolean
If IsNothing(SnapPointType) Then Return False
If SnapPointType = m_nSnapType Then Return True
m_nSnapType = If(SnapPointType >= SP.PT_NONE And SnapPointType <= SP.PT_MINDIST, SnapPointType, SP.PT_NONE)
RaiseEvent OnChangedSnapPointType(Me, m_nSnapType, True)
Return True
End Function