OmagCUR 1.9j1 :

- aggiunta visualizzazione messaggi da PP in simulazione
- aggiornato numero parametri della funzione EgtSurfTmFacetOppositeSide.
This commit is contained in:
Dario Sassi
2018-10-04 10:12:04 +00:00
parent 54ac5c21a7
commit 79a19febea
3 changed files with 23 additions and 5 deletions
+2 -1
View File
@@ -1056,7 +1056,8 @@ Friend Module CamAuto
End If
' Calcolo elevazione
Dim ptP1, ptP2 As Point3d
If Not EgtSurfTmFacetOppositeSide(nSurfId, nFacetInd, vtSide, GDB_ID.ROOT, ptP1, ptP2) Then Return False
Dim vtV1, vtV2 As Vector3d
If Not EgtSurfTmFacetOppositeSide(nSurfId, nFacetInd, vtSide, GDB_ID.ROOT, ptP1, ptP2, vtV1, vtV2) Then Return False
Dim ptPM As Point3d = Point3d.Media(ptP1, ptP2)
Dim vtElev As Vector3d = vtN ^ (vtSide ^ vtN)
If Not vtElev.Normalize() Then Return False
+2 -2
View File
@@ -62,5 +62,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.9.9.4")>
<Assembly: AssemblyFileVersion("1.9.9.4")>
<Assembly: AssemblyVersion("1.9.10.1")>
<Assembly: AssemblyFileVersion("1.9.10.1")>
+19 -2
View File
@@ -1,4 +1,5 @@
Imports EgtUILib
Imports System.Runtime.InteropServices
Imports EgtUILib
Public Class SimulationPageUC
' Riferimenti a pagine
@@ -7,6 +8,7 @@ Public Class SimulationPageUC
' Funzioni di callback per output in interfaccia da LUA
Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
Private m_OutTextCallback As New OutTextCallback(AddressOf ProcessOutText)
' Stato di visualizzazione della macchina
Private m_nMachLook As Integer = MCH_LOOK.ALL
@@ -161,6 +163,7 @@ Public Class SimulationPageUC
EgtZoom(ZM.ALL)
' Registro funzione su aggiornamento interfaccia da sotto
EgtSetProcessEvents(m_ProcEventsCallback)
EgtSetOutText(m_OutTextCallback)
' Avvio ambiente di simulazione
EgtSimInit()
EgtSimStart()
@@ -464,6 +467,7 @@ Public Class SimulationPageUC
EgtEnableModified()
' Reset funzione callback su evento aggiornamento interfaccia da sotto
EgtSetProcessEvents(Nothing)
EgtSetOutText(Nothing)
' Esco dalla pagina
m_MainWindow.m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Remove(Me)
m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Visible
@@ -480,7 +484,7 @@ Public Class SimulationPageUC
End Sub
Private Function ProcessEvents(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
Private Function ProcessEvents(nProg As Integer, nPause As Integer) As Integer
' Visualizzo assi
ShowCncData()
' Costringo ad aggiornare UI
@@ -488,4 +492,17 @@ Public Class SimulationPageUC
Return 0
End Function
Private Function ProcessOutText(ByRef psText As IntPtr) As Boolean
' Emetto stringa di testo
Dim sText As String = (Marshal.PtrToStringUni(psText))
If Not String.IsNullOrWhiteSpace(sText) Then
m_CurrProjPage.SetInfoMessage(sText)
Else
m_CurrProjPage.ClearMessage()
End If
' Costringo ad aggiornare UI
UpdateUI()
Return True
End Function
End Class