Egalware/omagoffice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inserito Utensile e lavorazioni (NO ATTREZZAGGIO)

Browse Source
This commit is contained in:
NicolaP
2021-06-28 20:35:20 +02:00
parent f38cb79b3e
commit da6807881c
7 changed files with 194 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CurrMachWindow/CurrMachWindowV.xaml
+22 -13
View File
@@ -12,22 +12,23 @@
Width="270" ResizeMode="NoResize" SizeToContent="Height">
<StackPanel Margin="5,5,5,0">
<!--TAGLIO-->
<TextBlock Text="{Binding CurrSawingMsg}"
Margin="0,0,0,5"/>
<ComboBox ItemsSource="{Binding CurrSawingList}"
SelectedItem="{Binding SelCurrSawing}"
Margin="0,0,0,5"/>
<TextBlock Text="{Binding AuxMachTypeMsg}"
<!--<TextBlock Text="{Binding AuxMachTypeMsg}"
Visibility="{Binding AuxMachType_Visibility}"
Margin="0,0,0,5"/>
<ComboBox ItemsSource="{Binding AuxMachTypeList}"
SelectedItem="{Binding SelAuxMachType}"
DisplayMemberPath="sName"
Visibility="{Binding AuxMachType_Visibility}"
Margin="0,0,0,5"/>
Margin="0,0,0,5"/>-->
<!--FORATURA-->
<TextBlock Text="{Binding CurrDrillingMsg}"
Visibility="{Binding CurrDrilling_Visibility}"
Margin="0,0,0,5"/>
@@ -35,7 +36,7 @@
SelectedItem="{Binding SelCurrDrilling}"
Visibility="{Binding CurrDrilling_Visibility}"
Margin="0,0,0,5"/>
<!--FRESATURA-->
<TextBlock Text="{Binding CurrMillingMsg}"
Visibility="{Binding CurrMilling_Visibility}"
Margin="0,0,0,5"/>
@@ -43,14 +44,22 @@
SelectedItem="{Binding SelCurrMilling}"
Visibility="{Binding CurrMilling_Visibility}"
Margin="0,0,0,5"/>
<TextBlock Text="{Binding CurrWaterjettingMsg}"
Visibility="{Binding CurrWaterjetting_Visibility}"
Margin="0,0,0,5"/>
<ComboBox ItemsSource="{Binding CurrWaterjettingList}"
SelectedItem="{Binding SelCurrWaterjetting}"
Visibility="{Binding CurrWaterjetting_Visibility}"
Margin="0,0,0,5"/>
<!--SVUOTATURA-->
<TextBlock Text="{Binding CurrPocketingMsg}"
Visibility="{Binding CurrPocketing_Visibility}"
Margin="0,0,0,5"/>
<ComboBox ItemsSource="{Binding CurrPocketingList}"
SelectedItem="{Binding SelCurrPocketing}"
Visibility="{Binding CurrPocketing_Visibility}"
Margin="0,0,0,5"/>
<!--WATERJET-->
<TextBlock Text="{Binding CurrWaterjettingMsg}"
Visibility="{Binding CurrWaterjetting_Visibility}"
Margin="0,0,0,5"/>
<ComboBox ItemsSource="{Binding CurrWaterjettingList}"
SelectedItem="{Binding SelCurrWaterjetting}"
Visibility="{Binding CurrWaterjetting_Visibility}"
Margin="0,0,0,5"/>
<UniformGrid Columns="2"
Margin="0,0,0,5">
CurrMachWindow/CurrMachWindowVM.vb
+134 -3
View File
@@ -7,6 +7,8 @@ Public Class CurrMachWindowVM
#Region "FIELDS & PROPERTIES"
#Region " SAW "
Private m_CurrSawingList As New List(Of String)
Public Property CurrSawingList As List(Of String)
Get
@@ -30,6 +32,10 @@ Public Class CurrMachWindowVM
End Set
End Property
#End Region ' Saw
#Region " AUX MACHINING "
Private m_AuxMachTypeList As New List(Of StringIdCmBx)
Public Property AuxMachTypeList As List(Of StringIdCmBx)
Get
@@ -110,6 +116,10 @@ Public Class CurrMachWindowVM
End Set
End Property
#End Region ' Aux Machining
#Region " DRILLING "
Private m_CurrDrillingList As New List(Of String)
Public Property CurrDrillingList As List(Of String)
Get
@@ -144,6 +154,10 @@ Public Class CurrMachWindowVM
End Set
End Property
#End Region ' Drilling
#Region " MILLING "
Private m_CurrMillingList As New List(Of String)
Public Property CurrMillingList As List(Of String)
Get
@@ -178,6 +192,48 @@ Public Class CurrMachWindowVM
End Set
End Property
#End Region ' MILLING
#Region " SCASSO "
Private m_CurrPocketingList As New List(Of String)
Public Property CurrPocketingList As List(Of String)
Get
Return m_CurrPocketingList
End Get
Set(value As List(Of String))
m_CurrPocketingList = value
End Set
End Property
Private m_SelCurrPocketing As String
Public Property SelCurrPocketing As String
Get
Return m_SelCurrPocketing
End Get
Set(value As String)
If value <> m_SelCurrPocketing Then
m_SelCurrPocketing = value
CurrentMachine.sCurrPocketing = m_SelCurrPocketing
End If
End Set
End Property
Private m_CurrPocketing_Visibility As Visibility
Public Property CurrPocketing_Visibility As Visibility
Get
Return m_CurrPocketing_Visibility
End Get
Set(value As Visibility)
m_CurrPocketing_Visibility = value
NotifyPropertyChanged("CurrPocketing_Visibility")
End Set
End Property
#End Region ' Scasso
#Region " WATERJETTING "
Private m_CurrWaterjettingList As New List(Of String)
Public Property CurrWaterjettingList As List(Of String)
Get
@@ -212,6 +268,8 @@ Public Class CurrMachWindowVM
End Set
End Property
#End Region ' WaterJetting
Private m_AvailableSawList As New List(Of String)
Private m_AvailableMillList As New List(Of String)
Private m_AvailableDrillList As New List(Of String)
@@ -245,6 +303,11 @@ Public Class CurrMachWindowVM
Return EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 4)
End Get
End Property
Public ReadOnly Property CurrPocketingMsg As String
Get
Return EgtMsg(90550)
End Get
End Property
Public ReadOnly Property CurrWaterjettingMsg As String
Get
Return EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 10)
@@ -286,45 +349,74 @@ Public Class CurrMachWindowVM
Select Case CurrentMachine.MountedToolConfig
Case CurrentMachine.MountedToolConfigs.SAW
AuxMachType_Visibility = Visibility.Collapsed
Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL, CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGER
' Creo lista lavorazioni foretto e fresa
If CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL Then
' --- DRILL ---
CreateMachiningList(MCH_MY.DRILLING, m_AvailableDrillList, m_CurrDrillingList)
' Se la lista è vuota cancello la lavorazione corrente di questo tipo
If m_CurrDrillingList.Count = 0 Then
CurrentMachine.sCurrDrilling = String.Empty
End If
' --- MILL ---
CreateMachiningList(MCH_MY.MILLING, m_AvailableMillList, m_CurrMillingList)
' Se la lista è vuota cancello la lavorazione corrente di questo tipo
If m_CurrMillingList.Count = 0 Then
CurrentMachine.sCurrMilling = String.Empty
End If
' --- SCASSO ---
CreateMachiningList(MCH_MY.POCKETING, m_AvailableMillList, m_CurrPocketingList)
' Se la lista è vuota cancello la lavorazione corrente di questo tipo
If m_CurrPocketingList.Count = 0 Then
CurrentMachine.sCurrPocketing = String.Empty
End If
' --- WATERJET ---
CreateMachiningList(MCH_MY.WATERJETTING, m_AvailableWaterjetList, m_CurrWaterjettingList)
' Se la lista è vuota cancello la lavorazione corrente di questo tipo
If m_CurrWaterjettingList.Count = 0 Then
CurrentMachine.sCurrWaterJetting = String.Empty
End If
ElseIf CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER Or
CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGER Then
' --- DRILL ---
CreateMachiningList(MCH_MY.DRILLING, m_AvailableDrillList, m_CurrDrillingList)
' Se la lista è vuota cancello la lavorazione corrente di questo tipo
If m_CurrDrillingList.Count = 0 Then
CurrentMachine.sCurrDrilling = String.Empty
End If
' --- MILL ---
CreateMachiningList(MCH_MY.MILLING, m_AvailableMillList, m_CurrMillingList)
' Se la lista è vuota cancello la lavorazione corrente di questo tipo
If m_CurrMillingList.Count = 0 Then
CurrentMachine.sCurrMilling = String.Empty
End If
' --- SCASSO ---
CreateMachiningList(MCH_MY.POCKETING, m_AvailableMillList, m_CurrPocketingList)
' Se la lista è vuota cancello la lavorazione corrente di questo tipo
If m_CurrPocketingList.Count = 0 Then
CurrentMachine.sCurrPocketing = String.Empty
End If
' --- WATERJET ---
CreateMachiningList(MCH_MY.WATERJETTING, m_AvailableWaterjetList, m_CurrWaterjettingList)
' Se la lista è vuota cancello la lavorazione corrente di questo tipo
If m_CurrWaterjettingList.Count = 0 Then
CurrentMachine.sCurrWaterJetting = String.Empty
End If
End If
' Definizione di due righe della tabella con la giusta altezza
AuxMachType_Visibility = Visibility.Visible
' Nascondo la selezione dell'utensile ausiliario
AuxMachType_Visibility = Visibility.Hidden
End Select
If m_CurrSawingList.Count > 0 Then
If CurrentMachine.sCurrSawing <> String.Empty Then
SelCurrSawing = CurrentMachine.sCurrSawing
@@ -337,7 +429,45 @@ Public Class CurrMachWindowVM
CurrentMachine.sCurrSawing = String.Empty
End If
If Not CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.SAW Then
' rendo visibili le lavorazioni secondarie
If CurrentMachine.bDrilling And m_CurrDrillingList.Count > 1 Then
CurrDrilling_Visibility = Visibility.Visible
If CurrentMachine.sCurrDrilling <> String.Empty Then
SelCurrDrilling = CurrentMachine.sCurrDrilling
End If
Else
CurrDrilling_Visibility = Visibility.Collapsed
End If
If CurrentMachine.bMilling And m_CurrMillingList.Count > 1 Then
CurrMilling_Visibility = Visibility.Visible
If CurrentMachine.sCurrMilling <> String.Empty Then
SelCurrMilling = CurrentMachine.sCurrMilling
End If
Else
CurrMilling_Visibility = Visibility.Collapsed
End If
If CurrentMachine.bPocketing And CurrPocketingList.Count > 1 Then
CurrPocketing_Visibility = Visibility.Visible
If CurrentMachine.sCurrPocketing <> String.Empty Then
SelCurrPocketing = CurrentMachine.sCurrPocketing
End If
Else
CurrPocketing_Visibility = Visibility.Collapsed
End If
If CurrentMachine.bWaterJetting And CurrWaterjettingList.Count > 1 Then
CurrWaterjetting_Visibility = Visibility.Visible
If CurrentMachine.sCurrWaterJetting <> String.Empty Then
SelCurrWaterjetting = CurrentMachine.sCurrWaterJetting
End If
Else
CurrWaterjetting_Visibility = Visibility.Collapsed
End If
Dim ShowAuxMAchineCmBx As Boolean = False
If Not CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.SAW And ShowAuxMAchineCmBx Then
If CurrentMachine.bDrilling Then
m_AuxMachTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 6)))
If CurrentMachine.bMilling Then
@@ -375,6 +505,7 @@ Public Class CurrMachWindowVM
End If
End If
End If
End Sub
Private Sub CreateAvailableToolList()
EgtStoneLib/CurrentMachine.vb
+13 -1
View File
@@ -645,6 +645,16 @@ Public Module CurrentMachine
End Set
End Property
Friend Property sCurrMillNoTip As String
Get
Return m_sCurrMillNoTip
End Get
Set(value As String)
If WritePrivateProfileString(S_MACH_MACH, K_CURRMILLNOTIP, value, sMachIniFile) Then
m_sCurrMillNoTip = value
End If
End Set
End Property
Friend Property sCurrDripSaw As String
Get
Return m_sCurrDripSaw
@@ -1224,7 +1234,9 @@ Public Module CurrentMachine
' fresa
m_sCurrMilling = EstCalc.GetCurrMilling()
' svuotatura
GetPrivateProfileString(S_MACH_MACH, K_CURRPOCKETING, Nothing, m_sCurrPocketing, sMachIniFile)
m_sCurrPocketing = EstCalc.GetCurrPocketing()
'GetPrivateProfileString(S_MACH_MACH, K_CURRPOCKETING, Nothing, m_sCurrPocketing, sMachIniFile)
' sgrossatura con lama
GetPrivateProfileString(S_MACH_MACH, K_CURRSAWROUGHING, Nothing, m_sCurrSawRoughing, sMachIniFile)
' finitura con lama
MachinePanel/MyMachinePanelVM.vb
+15
View File
@@ -158,6 +158,14 @@ Public Class MyMachinePanelVM
bOkSetUp = bOkSetUp And SetUpUtility.IsToolInSetUp(sTUUID)
bOkMatThick = bOkMatThick And CurrMachWindowVM.VerifyMatThickCompatibility()
End If
' Scasso
If Not String.IsNullOrWhiteSpace(CurrentMachine.sCurrPocketing) Then
EgtMdbSetCurrMachining(CurrentMachine.sCurrPocketing)
sTUUID = String.Empty
EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sTUUID)
bOkSetUp = bOkSetUp And SetUpUtility.IsToolInSetUp(sTUUID)
bOkMatThick = bOkMatThick And CurrMachWindowVM.VerifyMatThickCompatibility()
End If
' Foretto
If Not String.IsNullOrWhiteSpace(CurrentMachine.sCurrDrilling) Then
EgtMdbSetCurrMachining(CurrentMachine.sCurrDrilling)
@@ -252,6 +260,13 @@ Public Class MyMachinePanelVM
EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sTUUID)
bOk = bOk And SetUpUtility.IsToolInSetUp(sTUUID)
End If
' Scasso
If Not String.IsNullOrWhiteSpace(CurrentMachine.sCurrPocketing) Then
EgtMdbSetCurrMachining(CurrentMachine.sCurrPocketing)
sTUUID = String.Empty
EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sTUUID)
bOk = bOk And SetUpUtility.IsToolInSetUp(sTUUID)
End If
' Foretto
If Not String.IsNullOrWhiteSpace(CurrentMachine.sCurrDrilling) Then
EgtMdbSetCurrMachining(CurrentMachine.sCurrDrilling)
MySetUpWindow/MySetUpWindowVM.vb
+7
View File
@@ -36,6 +36,13 @@ Public Class MySetUpWindowVM
EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sTuuid)
UsedToolList.Add(sTuuid)
End If
' Scasso
If Not String.IsNullOrWhiteSpace(CurrentMachine.sCurrPocketing) Then
EgtMdbSetCurrMachining(CurrentMachine.sCurrPocketing)
sTuuid = String.Empty
EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sTuuid)
UsedToolList.Add(sTuuid)
End If
' Waterjet
If Not String.IsNullOrWhiteSpace(CurrentMachine.sCurrWaterJetting) Then
EgtMdbSetCurrMachining(CurrentMachine.sCurrWaterJetting)
MyToolDbWindow/MyToolDbWindowV.xaml
+2 -1
View File
@@ -71,8 +71,9 @@
IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"/>
</UniformGrid>
<!--Elenco degli utensili-->
<TreeView Name="ToolsTreeView" Grid.Row="1"
ItemsSource="{Binding ToolsList}">
ItemsSource="{Binding ToolsList}">
<TreeView.ItemContainerStyle>
<Style TargetType="{x:Type TreeViewItem}">
MyToolDbWindow/MyToolDbWindowVM.vb
+1
View File
@@ -107,6 +107,7 @@ Public Class MyToolDbWindowVM
EgtTdbSetCurrToolParam(MCH_TP.THICK, 5.0)
EgtTdbSetCurrToolParam(MCH_TP.MAXMAT, 40.0)
ElseIf (nType And MCH_TF.MILL) <> 0 Then
' devo distinguere i casi di MILL_STD e MILL_NO_TIP
EgtTdbSetCurrToolParam(MCH_TP.LEN, 80.0)
EgtTdbSetCurrToolParam(MCH_TP.TOTLEN, 80.0)
EgtTdbSetCurrToolParam(MCH_TP.DIAM, 20.0)