Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| df7bb978b8 | |||
| 088be26abf | |||
| 2e81f09a85 | |||
| 21692af684 |
@@ -838,7 +838,7 @@ Public Class NumericMachiningParam
|
||||
m_dValue = ReadMachiningParamDouble(nIndex, MAC_POSTFLOWDELAY, 0)
|
||||
m_bIsLen = False
|
||||
Case Params.SCREWBACK
|
||||
m_dValue = ReadMachiningParamDouble(nIndex, MAC_SCREWBACK, 0)
|
||||
m_dValue = ReadMachiningParamDouble(nIndex, MAC_SCREWBACK, 45)
|
||||
m_bIsLen = False
|
||||
Case Params.RIBSOVERLAP
|
||||
m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSOVERLAP, 0)
|
||||
|
||||
@@ -195,8 +195,8 @@ Public Class MainWindowM
|
||||
' Verifico abilitazione nesting automatico
|
||||
m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey)
|
||||
' Recupero livello e opzioni della chiave
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(5583, 2504, 1, m_nKeyLevel) And
|
||||
EgtGetKeyOptions(5583, 2504, 1, m_nKeyOptions)
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(5583, 2505, 1, m_nKeyLevel) And
|
||||
EgtGetKeyOptions(5583, 2505, 1, m_nKeyOptions)
|
||||
' Inizializzazione generale di EgtInterface
|
||||
m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
|
||||
m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
|
||||
|
||||
@@ -148,7 +148,7 @@ Public Class MainWindowVM
|
||||
End Sub
|
||||
|
||||
Private Function ProcessEvents(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
|
||||
If Map.refSliceManagerVM.bCalculating Then
|
||||
If Map.refSliceManagerVM.bCalculating OrElse Map.refSliceManagerVM.bCalcSolid Then
|
||||
Map.refSliceManagerVM.ProcessEvents(nProg, nPause)
|
||||
End If
|
||||
If Not IsNothing(Map.refImportLoadingWndVM) Then
|
||||
|
||||
@@ -70,5 +70,5 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.5.4.3")>
|
||||
<Assembly: AssemblyFileVersion("2.5.4.3")>
|
||||
<Assembly: AssemblyVersion("2.5.5.2")>
|
||||
<Assembly: AssemblyFileVersion("2.5.5.2")>
|
||||
|
||||
@@ -44,6 +44,11 @@ Public Class SliceManagerVM
|
||||
Private m_bCalcTFS As Boolean = False
|
||||
Private m_bGenerate As Boolean = False
|
||||
Private m_bCalcSolid As Boolean = False
|
||||
Friend ReadOnly Property bCalcSolid As Boolean
|
||||
Get
|
||||
Return m_bCalcSolid
|
||||
End Get
|
||||
End Property
|
||||
Friend Sub SetCalcSolid(value As Boolean)
|
||||
m_bCalcSolid = value
|
||||
End Sub
|
||||
|
||||
@@ -337,7 +337,7 @@ Public Class TFSEditorVM
|
||||
|
||||
Public ReadOnly Property Seconds_Msg As String
|
||||
Get
|
||||
Return "s"
|
||||
Return "min:s"
|
||||
End Get
|
||||
End Property
|
||||
|
||||
|
||||
Reference in New Issue
Block a user