diff --git a/Controller.vb b/Controller.vb index fa4d8f5..7922e94 100644 --- a/Controller.vb +++ b/Controller.vb @@ -22,6 +22,7 @@ Public Class Controller Public Event OnNewProject(ByVal sender As Object, ByVal bOk As Boolean) 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 OnSavedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Public Event OnSavingObject(ByVal sender As Object) @@ -222,8 +223,6 @@ Public Class Controller EgtResetModified() End If DisableCommandLog() - ' aggiorno - EgtZoom(ZM.ALL) RaiseEvent UpdateUI(Me, True) ' Gestione risultato RaiseEvent OnNewProject(Me, bOk) @@ -259,11 +258,10 @@ Public Class Controller EnableCommandLog() Dim bOk As Boolean = EgtOpenFile(sFile) DisableCommandLog() - EgtZoom(ZM.ALL) m_Scene.Cursor = Cursors.Default ' Aggiornamento RaiseEvent UpdateUI(Me, True) - 'Gestione risultato + ' Gestione risultato RaiseEvent OnOpenProject(Me, sFile, bOk) Return bOk End Function @@ -302,10 +300,11 @@ Public Class Controller EgtResetCurrPartLayer() End If DisableCommandLog() - EgtZoom(ZM.ALL) m_Scene.Cursor = Cursors.Default ' Aggiornamento RaiseEvent UpdateUI(Me, True) + ' Gestione risultato + RaiseEvent OnInsertedProject(Me, sFile, bOk) Return bOk End Function @@ -471,11 +470,10 @@ Public Class Controller End If EgtResetCurrPartLayer() DisableCommandLog() - EgtZoom(ZM.ALL) m_Scene.Cursor = Cursors.Default ' Aggiornamento RaiseEvent UpdateUI(Me, True) - 'Gestione risultato + ' Gestione risultato RaiseEvent OnImportedProject(Me, sFile, bOk) Return bOk End Function @@ -546,7 +544,7 @@ Public Class Controller End If 'Ne verifico il tipo Dim sExt As String = UCase(IO.Path.GetExtension(sFile)) - If (sExt <> ".LUA" And sExt <> ".TSC") Then + If sExt <> ".LUA" And sExt <> ".TSC" Then MessageBox.Show("Script type unknow", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error) Return False End If @@ -556,20 +554,19 @@ Public Class Controller m_Scene.Cursor = Cursors.WaitCursor EnableCommandLog() Dim bOk As Boolean = False - If (sExt = ".LUA") Then + If sExt = ".LUA" Then bOk = EgtLuaExecFile(sFile) Else bOk = EgtTscExecFile(sFile) End If DisableCommandLog() - ' EgtZoom(ZM.ALL) m_Scene.Cursor = Cursors.Default ' Aggiornamento RaiseEvent UpdateUI(Me, True) 'Gestione risultato Dim sError As String = String.Empty If Not bOk Then - If (sExt = ".LUA") Then + If sExt = ".LUA" Then EgtLuaGetLastError(sError) Else sError = "Error executing script" diff --git a/EgtInterface.vb b/EgtInterface.vb index 23b7ab3..876d55c 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -3090,6 +3090,34 @@ Public Function EgtModifyCurveThickness(nId As Integer, dTh As Double) As Boolea End If End Function + +Private Function EgtTrimCurveStartAtLen_32(nId As Integer, dLen As Double) As Boolean +End Function + +Private Function EgtTrimCurveStartAtLen_64(nId As Integer, dLen As Double) As Boolean +End Function +Public Function EgtTrimCurveStartAtLen(nId As Integer, dLen As Double) As Boolean + If IntPtr.Size = 4 Then + Return EgtTrimCurveStartAtLen_32(nId, dLen) + Else + Return EgtTrimCurveStartAtLen_64(nId, dLen) + End If +End Function + + +Private Function EgtTrimCurveEndAtLen_32(nId As Integer, dLen As Double) As Boolean +End Function + +Private Function EgtTrimCurveEndAtLen_64(nId As Integer, dLen As Double) As Boolean +End Function +Public Function EgtTrimCurveEndAtLen(nId As Integer, dLen As Double) As Boolean + If IntPtr.Size = 4 Then + Return EgtTrimCurveEndAtLen_32(nId, dLen) + Else + Return EgtTrimCurveEndAtLen_64(nId, dLen) + End If +End Function + Private Function EgtExtendCurveStartByLen_32(nId As Integer, dLen As Double) As Boolean End Function @@ -4743,6 +4771,22 @@ Public Function EgtSetInfo(nId As Integer, sKey As String, ptP As Point3d) As Bo End If End Function + +Private Function EgtSetInfoBBox_32(nId As Integer, sKey As String, + ByRef PtMin As Point3d, ByRef PtMax As Point3d) As Boolean +End Function + +Private Function EgtSetInfoBBox_64(nId As Integer, sKey As String, + ByRef PtMin As Point3d, ByRef PtMax As Point3d) As Boolean +End Function +Public Function EgtSetInfo(nId As Integer, sKey As String, Box As BBox3d) As Boolean + If IntPtr.Size = 4 Then + Return EgtSetInfoBBox_32(nId, sKey, Box.Min(), Box.Max()) + Else + Return EgtSetInfoBBox_64(nId, sKey, Box.Min(), Box.Max()) + End If +End Function + Private Function EgtSetInfoFrame_32(nId As Integer, sKey As String, ByRef PtOrig As Point3d, ByRef VtX As Vector3d, ByRef VtY As Vector3d, ByRef VtZ As Vector3d) As Boolean @@ -4852,6 +4896,29 @@ Public Function EgtGetInfo(nId As Integer, sKey As String, ByRef ptP As Point3d) End If End Function + +Private Function EgtGetInfoBBox_32(nId As Integer, sKey As String, + ByRef PtMin As Point3d, ByRef PtMax As Point3d) As Boolean +End Function + +Private Function EgtGetInfoBBox_64(nId As Integer, sKey As String, + ByRef PtMin As Point3d, ByRef PtMax As Point3d) As Boolean +End Function +Public Function EgtGetInfo(nId As Integer, sKey As String, ByRef Box As BBox3d) As Boolean + Dim ptMin As Point3d + Dim ptMax As Point3d + If IntPtr.Size = 4 Then + If Not EgtGetInfoBBox_32(nId, sKey, ptMin, ptMax) Then + Return False + End If + Else + If Not EgtGetInfoBBox_64(nId, sKey, ptMin, ptMax) Then + Return False + End If + End If + Return Box.Setup(ptMin, ptMax) +End Function + Private Function EgtGetInfoFrame_32(nId As Integer, sKey As String, ByRef PtOrig As Point3d, ByRef VtX As Vector3d, ByRef VtY As Vector3d, ByRef VtZ As Vector3d) As Boolean diff --git a/Form1.vb b/Form1.vb index 800dcea..70bad19 100644 --- a/Form1.vb +++ b/Form1.vb @@ -552,6 +552,7 @@ Public Class Form1 End Sub Private Sub OnOpenProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnOpenProject + EgtZoom(ZM.ALL) WritePrivateProfileString(S_GENERAL, K_LASTNGEDIR, Path.GetDirectoryName(sFile), m_sIniFile) If bOk Then m_MruFiles.Add(sFile) @@ -562,6 +563,10 @@ Public Class Form1 End If End Sub + Private Sub OnInsertedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnInsertedProject + EgtZoom(ZM.ALL) + End Sub + Private Sub OnSavingProject(ByVal sender As Object) Handles m_Controller.OnSavingProject End Sub @@ -600,6 +605,7 @@ Public Class Form1 End Sub Private Sub OnImportedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnImportedProject + EgtZoom(ZM.ALL) WritePrivateProfileString(S_GENERAL, K_LASTIMPDIR, Path.GetDirectoryName(sFile), m_sIniFile) If Not bOk Then Dim sMsg As String = EgtMsg(10006) & " '" & sFile & "'" 'Error importing file diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index dfe40ea..787d636 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices ' utilizzando l'asterisco (*) come descritto di seguito: ' - - + +