EgtCAM5 1.6w1 :
- in simulazione si gestisce la visualizzazione di fino a 8 assi macchina.
This commit is contained in:
Dario Sassi
+36
-21
@@ -20,36 +20,51 @@
|
||||
<RowDefinition Height="0.5*"/>
|
||||
<RowDefinition Height="0.5*"/>
|
||||
<RowDefinition Height="0.5*"/>
|
||||
<RowDefinition Height="0.5*"/>
|
||||
<RowDefinition Height="0.5*"/>
|
||||
<RowDefinition Height="0.5*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock Text="{Binding L1Name}" Grid.Column="0" Grid.Row="0" FontSize="15" HorizontalAlignment="Center"
|
||||
<TextBlock Text="{Binding A1Name}" Grid.Column="0" Grid.Row="0" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding L1Value}" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2"
|
||||
Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding L2Name}" Grid.Column="0" Grid.Row="1" FontSize="15" HorizontalAlignment="Center"
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding A1Value}" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2"
|
||||
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding A2Name}" Grid.Column="0" Grid.Row="1" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding L2Value}" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2"
|
||||
Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding L3Name}" Grid.Column="0" Grid.Row="2" FontSize="15" HorizontalAlignment="Center"
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding A2Value}" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2"
|
||||
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding A3Name}" Grid.Column="0" Grid.Row="2" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding L3Value}" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2"
|
||||
Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding R1Name}" Grid.Column="0" Grid.Row="3" FontSize="15" HorizontalAlignment="Center"
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding A3Value}" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2"
|
||||
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding A4Name}" Grid.Column="0" Grid.Row="3" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding R1Value}" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2"
|
||||
Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding R2Name}" Grid.Column="0" Grid.Row="4" FontSize="15" HorizontalAlignment="Center"
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding A4Value}" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2"
|
||||
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding A5Name}" Grid.Column="0" Grid.Row="4" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding R2Value}" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2"
|
||||
Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding GCode}" Grid.Column="0" Grid.Row="5" FontSize="15" HorizontalAlignment="Center"
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding A5Value}" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2"
|
||||
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding A6Name}" Grid.Column="0" Grid.Row="5" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Center" />
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding FValue}" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="2"
|
||||
Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding TName}" Grid.Column="0" Grid.Row="6" FontSize="13" HorizontalAlignment="Center"
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding A6Value}" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="2"
|
||||
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding A7Name}" Grid.Column="0" Grid.Row="6" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Center" />
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding A7Value}" Grid.Column="1" Grid.Row="6" Grid.ColumnSpan="2"
|
||||
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding A8Name}" Grid.Column="0" Grid.Row="7" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Center" />
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding A8Value}" Grid.Column="1" Grid.Row="7" Grid.ColumnSpan="2"
|
||||
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
|
||||
<TextBlock Text="{Binding GCode}" Grid.Column="0" Grid.Row="8" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2" />
|
||||
<TextBlock Text="{Binding SValue}" Grid.Column="2" Grid.Row="6" FontSize="13" HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,0" />
|
||||
<TextBlock Text="{Binding FValue}" Grid.Column="2" Grid.Row="8" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,5" />
|
||||
<TextBlock Text="{Binding TName}" Grid.Column="0" Grid.Row="9" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2" />
|
||||
<TextBlock Text="{Binding SValue}" Grid.Column="2" Grid.Row="9" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,5" />
|
||||
|
||||
</Grid>
|
||||
|
||||
|
||||
+149
-67
@@ -50,132 +50,210 @@ Namespace EgtCAM5
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_L1Name As String
|
||||
Public Property L1Name As String
|
||||
Private m_A1Name As String
|
||||
Public Property A1Name As String
|
||||
Get
|
||||
Return m_L1Name
|
||||
Return m_A1Name
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_L1Name Then
|
||||
m_L1Name = value
|
||||
OnPropertyChanged("L1Name")
|
||||
If value <> m_A1Name Then
|
||||
m_A1Name = value
|
||||
OnPropertyChanged("A1Name")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_L1Value As String
|
||||
Public Property L1Value As String
|
||||
Private m_A1Value As String
|
||||
Public Property A1Value As String
|
||||
Get
|
||||
Return m_L1Value
|
||||
Return m_A1Value
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_L1Value Then
|
||||
m_L1Value = value
|
||||
OnPropertyChanged("L1Value")
|
||||
If value <> m_A1Value Then
|
||||
m_A1Value = value
|
||||
OnPropertyChanged("A1Value")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_L2Name As String
|
||||
Public Property L2Name As String
|
||||
Private m_A2Name As String
|
||||
Public Property A2Name As String
|
||||
Get
|
||||
Return m_L2Name
|
||||
Return m_A2Name
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_L2Name Then
|
||||
m_L2Name = value
|
||||
OnPropertyChanged("L2Name")
|
||||
If value <> m_A2Name Then
|
||||
m_A2Name = value
|
||||
OnPropertyChanged("A2Name")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_L2Value As String
|
||||
Public Property L2Value As String
|
||||
Private m_A2Value As String
|
||||
Public Property A2Value As String
|
||||
Get
|
||||
Return m_L2Value
|
||||
Return m_A2Value
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_L2Value Then
|
||||
m_L2Value = value
|
||||
OnPropertyChanged("L2Value")
|
||||
If value <> m_A2Value Then
|
||||
m_A2Value = value
|
||||
OnPropertyChanged("A2Value")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_L3Name As String
|
||||
Public Property L3Name As String
|
||||
Private m_A3Name As String
|
||||
Public Property A3Name As String
|
||||
Get
|
||||
Return m_L3Name
|
||||
Return m_A3Name
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_L3Name Then
|
||||
m_L3Name = value
|
||||
OnPropertyChanged("L3Name")
|
||||
If value <> m_A3Name Then
|
||||
m_A3Name = value
|
||||
OnPropertyChanged("A3Name")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_L3Value As String
|
||||
Public Property L3Value As String
|
||||
Private m_A3Value As String
|
||||
Public Property A3Value As String
|
||||
Get
|
||||
Return m_L3Value
|
||||
Return m_A3Value
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_L3Value Then
|
||||
m_L3Value = value
|
||||
OnPropertyChanged("L3Value")
|
||||
If value <> m_A3Value Then
|
||||
m_A3Value = value
|
||||
OnPropertyChanged("A3Value")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_R1Name As String
|
||||
Public Property R1Name As String
|
||||
Private m_A4Name As String
|
||||
Public Property A4Name As String
|
||||
Get
|
||||
Return m_R1Name
|
||||
Return m_A4Name
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_R1Name Then
|
||||
m_R1Name = value
|
||||
OnPropertyChanged("R1Name")
|
||||
If value <> m_A4Name Then
|
||||
m_A4Name = value
|
||||
OnPropertyChanged("A4Name")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_R1Value As String
|
||||
Public Property R1Value As String
|
||||
Private m_A4Value As String
|
||||
Public Property A4Value As String
|
||||
Get
|
||||
Return m_R1Value
|
||||
Return m_A4Value
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_R1Value Then
|
||||
m_R1Value = value
|
||||
OnPropertyChanged("R1Value")
|
||||
If value <> m_A4Value Then
|
||||
m_A4Value = value
|
||||
OnPropertyChanged("A4Value")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_R2Name As String
|
||||
Public Property R2Name As String
|
||||
Private m_A5Name As String
|
||||
Public Property A5Name As String
|
||||
Get
|
||||
Return m_R2Name
|
||||
Return m_A5Name
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_R2Name Then
|
||||
m_R2Name = value
|
||||
OnPropertyChanged("R2Name")
|
||||
If value <> m_A5Name Then
|
||||
m_A5Name = value
|
||||
OnPropertyChanged("A5Name")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_R2Value As String
|
||||
Public Property R2Value As String
|
||||
Private m_A5Value As String
|
||||
Public Property A5Value As String
|
||||
Get
|
||||
Return m_R2Value
|
||||
Return m_A5Value
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_R2Value Then
|
||||
m_R2Value = value
|
||||
OnPropertyChanged("R2Value")
|
||||
If value <> m_A5Value Then
|
||||
m_A5Value = value
|
||||
OnPropertyChanged("A5Value")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_A6Name As String
|
||||
Public Property A6Name As String
|
||||
Get
|
||||
Return m_A6Name
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_A6Name Then
|
||||
m_A6Name = value
|
||||
OnPropertyChanged("A6Name")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_A6Value As String
|
||||
Public Property A6Value As String
|
||||
Get
|
||||
Return m_A6Value
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_A6Value Then
|
||||
m_A6Value = value
|
||||
OnPropertyChanged("A6Value")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_A7Name As String
|
||||
Public Property A7Name As String
|
||||
Get
|
||||
Return m_A7Name
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_A7Name Then
|
||||
m_A7Name = value
|
||||
OnPropertyChanged("A7Name")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_A7Value As String
|
||||
Public Property A7Value As String
|
||||
Get
|
||||
Return m_A7Value
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_A7Value Then
|
||||
m_A7Value = value
|
||||
OnPropertyChanged("A7Value")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_A8Name As String
|
||||
Public Property A8Name As String
|
||||
Get
|
||||
Return m_A8Name
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_A8Name Then
|
||||
m_A8Name = value
|
||||
OnPropertyChanged("A8Name")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_A8Value As String
|
||||
Public Property A8Value As String
|
||||
Get
|
||||
Return m_A8Value
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_A8Value Then
|
||||
m_A8Value = value
|
||||
OnPropertyChanged("A8Value")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
@@ -575,11 +653,14 @@ Namespace EgtCAM5
|
||||
Private Sub ShowCncData()
|
||||
' Assi
|
||||
Dim nInd As Integer = 0
|
||||
ShowAxisNameVal(nInd, L1Name, L1Value)
|
||||
ShowAxisNameVal(nInd, L2Name, L2Value)
|
||||
ShowAxisNameVal(nInd, L3Name, L3Value)
|
||||
ShowAxisNameVal(nInd, R1Name, R1Value)
|
||||
ShowAxisNameVal(nInd, R2Name, R2Value)
|
||||
ShowAxisNameVal(nInd, A1Name, A1Value)
|
||||
ShowAxisNameVal(nInd, A2Name, A2Value)
|
||||
ShowAxisNameVal(nInd, A3Name, A3Value)
|
||||
ShowAxisNameVal(nInd, A4Name, A4Value)
|
||||
ShowAxisNameVal(nInd, A5Name, A5Value)
|
||||
ShowAxisNameVal(nInd, A6Name, A6Value)
|
||||
ShowAxisNameVal(nInd, A7Name, A7Value)
|
||||
ShowAxisNameVal(nInd, A8Name, A8Value)
|
||||
' Tipo di movimento e feed
|
||||
ShowMoveTypeFeed()
|
||||
' Nome utensile e speed
|
||||
@@ -588,11 +669,12 @@ Namespace EgtCAM5
|
||||
|
||||
Private Function ShowAxisNameVal(ByRef nInd As Integer, ByRef sName As String, ByRef sVal As String) As Boolean
|
||||
Dim sInfo As String = String.Empty
|
||||
Dim bLinear As Boolean = True
|
||||
Dim dVal As Double = 0
|
||||
If EgtSimGetAxisInfoPos(nInd, sInfo, dVal) Then
|
||||
If EgtSimGetAxisInfoPos(nInd, sInfo, bLinear, dVal) Then
|
||||
If sInfo <> "**" Then
|
||||
sName = sInfo
|
||||
sVal = If(nInd < 3, LenToString(dVal, -3), DoubleToString(dVal, -3))
|
||||
sVal = If(bLinear, LenToString(dVal, -3), DoubleToString(dVal, -3))
|
||||
nInd += 1
|
||||
Return True
|
||||
Else
|
||||
|
||||
Reference in New Issue
Block a user