EgtCAM5 + EgtWPFLib5 1.6t1 :

- Aggiunti controlli Floating (prima versione).
This commit is contained in:
Emmanuele Sassi
2016-08-29 07:31:52 +00:00
parent 45cbfa745f
commit 35eda772d0
16 changed files with 170 additions and 77 deletions
+37 -41
View File
@@ -2,6 +2,7 @@
Imports System.IO
Imports EgtUILib
Imports EgtWPFLib5
Imports EgtWPFLib5.EgtFloating
Namespace EgtCAM5
@@ -18,6 +19,9 @@ Namespace EgtCAM5
Private m_GridViewPanel As BaseWindowView
Private m_DrawPanel As BaseWindowView
Private m_DrawOptionPanel As BaseWindowView
'Private m_GridViewPanel As EgtFloatingPanel
'Private m_DrawPanel As EgtFloatingPanel
'Private m_DrawOptionPanel As EgtFloatingPanel
'PROJECT PAGE'S SCENE FIELDS AND PROPERTIES
' Reference to the ProjectScene
@@ -62,22 +66,22 @@ Namespace EgtCAM5
Sub New()
Me.sTabName = EgtMsg(MSG_MAINWINDOW + 1)
Dim WinPos As New WinPos
GetPrivateProfileWinPos(S_GENERAL, "Win1", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
m_GridViewPanel = New BaseWindowView
m_GridViewPanel.DataContext = New GridViewPanelViewModel
WinPosToWindow(m_GridViewPanel, WinPos)
m_GridViewPanel.Show()
GetPrivateProfileWinPos(S_GENERAL, "Win2", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
m_DrawPanel = New BaseWindowView
m_DrawPanel.DataContext = New DrawPanelViewModel
WinPosToWindow(m_DrawPanel, WinPos)
m_DrawPanel.Show()
GetPrivateProfileWinPos(S_GENERAL, "Win3", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
m_DrawOptionPanel = New BaseWindowView
m_DrawOptionPanel.DataContext = New DrawOptionPanelViewModel
WinPosToWindow(m_DrawOptionPanel, WinPos)
m_DrawOptionPanel.Show()
'Dim WinPos As New WinPos
'GetPrivateProfileWinPos(S_GENERAL, "Win1", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
'm_GridViewPanel = New BaseWindowView
'm_GridViewPanel.DataContext = New GridViewPanelViewModel
'WinPosToWindow(m_GridViewPanel, WinPos)
'm_GridViewPanel.Show()
'GetPrivateProfileWinPos(S_GENERAL, "Win2", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
'm_DrawPanel = New BaseWindowView
'm_DrawPanel.DataContext = New DrawPanelViewModel
'WinPosToWindow(m_DrawPanel, WinPos)
'm_DrawPanel.Show()
'GetPrivateProfileWinPos(S_GENERAL, "Win3", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
'm_DrawOptionPanel = New BaseWindowView
'm_DrawOptionPanel.DataContext = New OptionPanelViewModel
'WinPosToWindow(m_DrawOptionPanel, WinPos)
'm_DrawOptionPanel.Show()
' Funzione che contiene la registrazione alle funzioni che permettono di visualizzare e nascondere le finestre di disegno
ManagePanelVisibility()
ManageClosingApplication()
@@ -128,7 +132,7 @@ Namespace EgtCAM5
MsgBox(EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3), MsgBoxStyle.OkOnly, EgtMsg(MSG_MISSINGKEYWD + 1))
' Chiudo il programma
Application.Msn.NotifyColleagues(Application.CLOSEAPPLICATIONCOMMAND)
' Verifico abilitazione prodotto
' Verifico abilitazione prodotto
ElseIf (IniFile.m_nKeyOptions And KEY_OPT.BASE) = 0 Then
m_CloseProgram = True
MsgBox(EgtMsg(MSG_MISSINGKEYWD + 5), MsgBoxStyle.OkOnly, EgtMsg(MSG_MISSINGKEYWD + 1))
@@ -326,27 +330,27 @@ Namespace EgtCAM5
''' Method that manage the visibility of the ProjectPage's Panels
''' </summary>
Sub ManagePanelVisibility()
Application.Msn.Register(Application.PROJECTPAGE_SELECTED, Sub()
m_GridViewPanel.Visibility = Visibility.Visible
m_DrawPanel.Visibility = Visibility.Visible
m_DrawOptionPanel.Visibility = Visibility.Visible
End Sub)
Application.Msn.Register(Application.PROJECTPAGE_DESELECTED, Sub()
m_GridViewPanel.Visibility = Visibility.Hidden
m_DrawPanel.Visibility = Visibility.Hidden
m_DrawOptionPanel.Visibility = Visibility.Hidden
End Sub)
'Application.Msn.Register(Application.PROJECTPAGE_SELECTED, Sub()
' m_GridViewPanel.Visibility = Visibility.Visible
' m_DrawPanel.Visibility = Visibility.Visible
' m_DrawOptionPanel.Visibility = Visibility.Visible
' End Sub)
'Application.Msn.Register(Application.PROJECTPAGE_DESELECTED, Sub()
' m_GridViewPanel.Visibility = Visibility.Hidden
' m_DrawPanel.Visibility = Visibility.Hidden
' m_DrawOptionPanel.Visibility = Visibility.Hidden
' End Sub)
Application.Msn.Register(Application.PROJECTPAGE_DRAWMODE, Sub()
Me.sTabName = EgtMsg(MSG_MAINWINDOW + 1)
m_GridViewPanel.Visibility = Visibility.Visible
m_DrawPanel.Visibility = Visibility.Visible
m_DrawOptionPanel.Visibility = Visibility.Visible
'm_GridViewPanel.Visibility = Visibility.Visible
'm_DrawPanel.Visibility = Visibility.Visible
'm_DrawOptionPanel.Visibility = Visibility.Visible
End Sub)
Application.Msn.Register(Application.PROJECTPAGE_MACHININGMODE, Sub()
Me.sTabName = EgtMsg(MSG_MAINWINDOW + 2)
m_GridViewPanel.Visibility = Visibility.Visible
m_DrawPanel.Visibility = Visibility.Hidden
m_DrawOptionPanel.Visibility = Visibility.Visible
'm_GridViewPanel.Visibility = Visibility.Visible
'm_DrawPanel.Visibility = Visibility.Hidden
'm_DrawOptionPanel.Visibility = Visibility.Visible
End Sub)
End Sub
@@ -690,14 +694,6 @@ Namespace EgtCAM5
Private Sub ManageClosingApplication()
Application.Msn.Register(Application.CLOSEAPPLICATION, Sub()
' Salvo le posizioni di tutte le finestre
Dim WinPos As New WinPos
WindowToWinPos(m_GridViewPanel, WinPos)
WritePrivateProfileWinPos(S_GENERAL, "Win1", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
WindowToWinPos(m_DrawPanel, WinPos)
WritePrivateProfileWinPos(S_GENERAL, "Win2", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
WindowToWinPos(m_DrawOptionPanel, WinPos)
WritePrivateProfileWinPos(S_GENERAL, "Win3", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
' Salvo modo di visualizzazione
WritePrivateProfileString(S_SCENE, K_SHOWMODE, EgtGetShowMode().ToString)
' Salvo stato visualizzazione direzione curve