EgtCAM5 2.6d1 :
- in Opzioni Macchina aggiunto parametro Tolleranza Lineare di Approssimazione.
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
</EgtWPFLib5:EgtCustomWindow.Resources>
|
||||
|
||||
<Grid Margin="10">
|
||||
<Grid.ColumnDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
@@ -27,6 +27,7 @@
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<UniformGrid Grid.Row="0" Columns="2" Margin="0,0,0,5">
|
||||
@@ -56,7 +57,12 @@
|
||||
</ComboBox>
|
||||
</UniformGrid>
|
||||
|
||||
<UniformGrid Grid.Row="4" Columns="2">
|
||||
<UniformGrid Grid.Row="4" Columns="2" Margin="0,0,0,5">
|
||||
<TextBlock Text="{Binding ApproxLinTolMsg}" VerticalAlignment="Center"/>
|
||||
<TextBox Text="{Binding ApproxLinTol}" Height="25" Margin="10,0,0,0"/>
|
||||
</UniformGrid>
|
||||
|
||||
<UniformGrid Grid.Row="5" Columns="2">
|
||||
<TextBlock Text="{Binding DefaultSetUpMsg}" VerticalAlignment="Center"/>
|
||||
<ComboBox ItemsSource="{Binding ArchivedSetUpList}" Height="25" Margin="10,0,0,0"
|
||||
SelectedItem="{Binding SelectedDefaultSetUp}" IsEnabled="{Binding IsActiveDefaultSetUp}"/>
|
||||
|
||||
@@ -48,6 +48,21 @@ Public Class MachOptionVM
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_sApproxLinTol As String
|
||||
Public Property ApproxLinTol As String
|
||||
Get
|
||||
Return m_sApproxLinTol
|
||||
End Get
|
||||
Set(value As String)
|
||||
Dim dApproxLinTol As Double = 0
|
||||
If StringToLen(value, dApproxLinTol) Then
|
||||
EgtMdbSetGeneralParam(MCH_GP.APPROXLINTOL, dApproxLinTol)
|
||||
EgtMdbSave()
|
||||
m_sApproxLinTol = value
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_SplitArcsList As New List(Of MCH_SA)({MCH_SA.NEVER, MCH_SA.GEN_PLANE, MCH_SA.NO_XY_PLANE, MCH_SA.ALWAYS})
|
||||
Public ReadOnly Property SplitArcsList As List(Of MCH_SA)
|
||||
Get
|
||||
@@ -106,6 +121,11 @@ Public Class MachOptionVM
|
||||
Return EgtMsg(MSG_MACHININGOPTIONPAGE + 9)
|
||||
End Get
|
||||
End Property
|
||||
Public ReadOnly Property ApproxLinTolMsg As String
|
||||
Get
|
||||
Return EgtMsg(6410) ' Tolleranza di approssimazione
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property SplitArcsMsg As String
|
||||
Get
|
||||
@@ -141,6 +161,10 @@ Public Class MachOptionVM
|
||||
Dim nVal As Integer = 0
|
||||
EgtMdbGetGeneralParam(MCH_GP.SPLITARCS, nVal)
|
||||
m_SelectedSplitArcs = DirectCast(nVal, MCH_SA)
|
||||
' Leggo tolleranza lineare di approssimazione
|
||||
dVal = 0
|
||||
EgtMdbGetGeneralParam(MCH_GP.APPROXLINTOL, dVal)
|
||||
m_sApproxLinTol = LenToString(dVal, 4)
|
||||
' Riempio lista attrezzaggi salvati
|
||||
m_ArchivedSetUpList.Add(String.Empty)
|
||||
If Directory.Exists(IniFile.m_sCurrMachSetUpDirPath) Then
|
||||
|
||||
@@ -388,8 +388,8 @@ Public Class MainWindowVM
|
||||
EgtSetLockId(sLockId)
|
||||
End If
|
||||
' Recupero livello e opzioni della chiave
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(3279, 2603, 1, IniFile.m_nKeyLevel) And
|
||||
EgtGetKeyOptions(3279, 2603, 1, IniFile.m_nKeyOptions)
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(3279, 2604, 1, IniFile.m_nKeyLevel) And
|
||||
EgtGetKeyOptions(3279, 2604, 1, IniFile.m_nKeyOptions)
|
||||
' Leggo e imposto livello utilizzatore
|
||||
IniFile.m_nUserLevel = Math.Min(IniFile.m_nKeyLevel, GetPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
|
||||
' Imposto abilitazione lavorazioni avanzate
|
||||
|
||||
@@ -70,6 +70,6 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.6.3.2")>
|
||||
<Assembly: AssemblyFileVersion("2.6.3.2")>
|
||||
<Assembly: AssemblyVersion("2.6.4.1")>
|
||||
<Assembly: AssemblyFileVersion("2.6.4.1")>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user