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

-cambiato messaggi

Browse Source
This commit is contained in:
Demetrio Cassarino
2024-08-06 09:28:11 +02:00
parent ca00c134e9
commit 05b2b1d73f
36 changed files with 444 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml
+5 -2
View File
@@ -88,10 +88,13 @@
Margin="0,0,2.5,0"/>
<Button Grid.Column="1"
Content="..."
Width="18"
Foreground="{StaticResource BeamWall_White}"
Width="20"
Height="20"
Command="{Binding ChooseExternalBackupFolderPath_Command}"
IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
Margin="2.5,0,0,0"/>
Margin="2.5,0,0,0"
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
</Grid>
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
+7
View File
@@ -158,6 +158,9 @@
<DependentUpon>LoadingWndV.xaml</DependentUpon>
</Compile>
<Compile Include="LoadingWnd\LoadingWndVM.vb" />
<Compile Include="LoadingWnd\OnlyProdLoadingWndV.xaml.vb">
<DependentUpon>OnlyProdLoadingWndV.xaml</DependentUpon>
</Compile>
<Compile Include="MachinePanel\OnlyProdMachinePanelV.xaml.vb">
<DependentUpon>OnlyProdMachinePanelV.xaml</DependentUpon>
</Compile>
@@ -314,6 +317,10 @@
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Include="LoadingWnd\OnlyProdLoadingWndV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MachinePanel\OnlyProdMachinePanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb
+4 -4
View File
@@ -215,9 +215,9 @@ Public Class NewMachGroupPanelVM
If MachGroupVMList.Count = 1 Then
'chiedo conferma prima di resettare il gruppo di lavorazione
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
End If
Select Case m_MessageBoxResult
Case MessageBoxResult.Yes
@@ -233,9 +233,9 @@ Public Class NewMachGroupPanelVM
Else
'chiedo conferma prima di cancellare il gruppo di lavorazione
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
End If
Select Case m_MessageBoxResult
Case MessageBoxResult.Yes
EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb
+6 -1
View File
@@ -59,7 +59,12 @@ Public Module LoadingWndHelper
m_thread = New Thread(Sub()
m_LoadingWndVM = New Core.LoadingWndVM(nSteps, TotText, AddressOf LoadingCallback)
m_LoadingWndVM.UpdateProgress(m_CurrStep, m_StepText, m_nProgress, m_nNextProgress)
Dim LoadingWnd As New LoadingWndV(Nothing, m_LoadingWndVM)
Dim LoadingWnd As Object
If bOnlyProd Then
LoadingWnd = New OnlyProdLoadingWndV(Nothing, m_LoadingWndVM)
Else
LoadingWnd = New LoadingWndV(Nothing, m_LoadingWndVM)
End If
' posiziono la finestra
If WindowStartupLocation = Windows.WindowStartupLocation.CenterScreen Then
LoadingWnd.WindowStartupLocation = Windows.WindowStartupLocation.CenterScreen
EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml
+55
View File
@@ -0,0 +1,55 @@
<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdLoadingWndV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
Style="{StaticResource OnlyProd_EgtCustomWindow}"
Height="200" Width="300"
TitleBarHeight="0"
ResizeMode="NoResize" WindowStyle="None"
IsClosable="False" IsMinimizable="False"
WindowStartupLocation="Manual" ShowInTaskbar="False">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="1"
Text="{Binding TotText_Msg}"
TextAlignment="Center"/>
<TextBlock Grid.Row="2"
Text="{Binding StepText_Msg}"
TextAlignment="Center"
Visibility="{Binding StepText_Visibility}"/>
<Grid Grid.Row="3"
Visibility="{Binding StepProgress_Visibility}">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Grid Height="20"/>
<ProgressBar Grid.Row="1"
Minimum="0"
Maximum="100"
Value="{Binding StepProgress_Value}"
Height="20"
Margin="40,0,40,0"/>
</Grid>
<ProgressBar Grid.Row="5"
Minimum="0"
Maximum="100"
Value="{Binding TotProgress_Value}"
Height="20"
Margin="40,0,40,0"/>
<TextBlock Grid.Row="7"
Text="{Binding TotProgress_Msg}"
TextAlignment="Center"/>
</Grid>
</EgtWPFLib5:EgtCustomWindow>
EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml.vb
+36
View File
@@ -0,0 +1,36 @@
Imports System.Windows.Input
Imports System.Windows
Public Class OnlyProdLoadingWndV
Private WithEvents m_LoadingWndVM As LoadingWndVM
Sub New(Owner As Window, LoadingWndVM As LoadingWndVM)
MyBase.New(Owner)
' This call is required by the designer.
InitializeComponent()
Me.DataContext = LoadingWndVM
' Assegno al riferimento locale al VM il VM preso dal DataContext
m_LoadingWndVM = LoadingWndVM
End Sub
Private Sub CloseWindow(bDialogResult As Boolean) Handles m_LoadingWndVM.m_CloseWindow
Me.Close()
End Sub
Private Sub ActivateWindow() Handles m_LoadingWndVM.m_ActivateWindow
Me.Activate()
End Sub
Private Sub Me_ContentRendered() Handles Me.ContentRendered
m_LoadingWndVM.StartFunction()
End Sub
Private Sub ToolsDbView_Closing(sender As Object, e As ComponentModel.CancelEventArgs) Handles Me.Closing
If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
e.Cancel = True
Return
End If
End Sub
End Class
EgtBEAMWALL.Core/Utility/Configuration.vb
+55 -1
View File
@@ -1,5 +1,10 @@
Public Module Configuration
Imports EgtWPFLib5
Public Module Configuration
''' <summary>
''' Flag per impostare la visualizzazione con la singola pagina
''' </summary>
Private m_bOnlyProd As Boolean
Public ReadOnly Property bOnlyProd As Boolean
Get
@@ -10,6 +15,9 @@
m_bOnlyProd = value
End Sub
''' <summary>
''' Flag per visualizzare il pulsante Db Attrezzaggi
''' </summary>
Private m_bModifySetup As Boolean
Public ReadOnly Property bModifySetup As Boolean
Get
@@ -20,6 +28,9 @@
m_bModifySetup = value
End Sub
''' <summary>
''' Flag per salvare correttamente i dati nel file lua corretto
''' </summary>
Private m_bMachConfig As Boolean
Public ReadOnly Property bMachConfig As Boolean
Get
@@ -30,4 +41,47 @@
m_bMachConfig = value
End Sub
''' <summary>
''' Funzione che recupera la directory del file INI
''' </summary>
Public Sub GetIniFileDirectory()
' Impostazione path radice per i dati
Dim m_sDataRoot As String = System.AppDomain.CurrentDomain.BaseDirectory
If EgtUILib.GetPrivateProfileString(ConstGen.S_DATA, ConstGen.K_DATAROOT, "", m_sDataRoot, m_sDataRoot & "\" & ConstGen.DAT_FILE_NAME) = 0 Then
m_sDataRoot = System.AppDomain.CurrentDomain.BaseDirectory
End If
' Impostazione direttorio di configurazione
Dim m_sConfigDir As String = m_sDataRoot & "\" & ConstGen.CONF_DIR
' Impostazione path Ini file
IniFile.m_sIniFile = m_sConfigDir & "\" & Core.ConstIni.INI_FILE_NAME
End Sub
''' <summary>
''' Funzione per recuperare bOnlyProd
''' </summary>
''' <param name="Section">Sezione dove si trova la variabile che devo cercare</param>
''' <param name="Key">Variabile che sto cercando</param>
''' <param name="Path">Cartella dove e' presente il file ini</param>
''' <param name="Default_Value">Valore di defaul opzionabile</param>
''' <returns></returns>
Public Function Read_Value(Section As String, Key As String, Path As String, Optional Default_Value As String = "") As String
Dim Reader_Lines As String() = System.IO.File.ReadAllLines(Path)
Dim Current_Section As String = ""
For Each Reader_Line As String In Reader_Lines
If Reader_Line.StartsWith("[") AndAlso Reader_Line.EndsWith("]") Then
Current_Section = Reader_Line
ElseIf Current_Section.Equals($"[{Section}]") Then
Dim lineParts As String() = Reader_Line.Split({"="c}, 2)
If lineParts.Length >= 1 AndAlso lineParts(0) = Key Then
Return If(lineParts.Length >= 2, lineParts(1), Default_Value)
End If
End If
Next
Return Default_Value
End Function
End Module
EgtBEAMWALL.Supervisor/Application.xaml.vb
+11 -1
View File
@@ -1,4 +1,6 @@
Imports EgtUILib
Imports EgtBEAMWALL.Core
Imports EgtWPFLib5
Class Application
@@ -7,8 +9,16 @@ Class Application
Protected Overrides Sub OnStartup(e As StartupEventArgs)
MyBase.OnStartup(e)
ShutdownMode = System.Windows.ShutdownMode.OnMainWindowClose
' Recupero directory file INI
GetIniFileDirectory()
' Recupero bOnlyProd per selezione MainWindow
Dim bOnlyProd As Boolean = Read_Value(EgtWPFLib5.ConstIni.S_GENERAL, EgtBEAMWALL.Core.ConstIni.K_ONLYPROD, IniFile.m_sIniFile)
' Creo la View principale
Me.MainWindow = New MainWindowV
If bOnlyProd Then
Me.MainWindow = New OnlyProdMainWindowV
Else
Me.MainWindow = New MainWindowV
End If
' Mostro la View principale
Me.MainWindow.Show()
End Sub
EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb
+2 -2
View File
@@ -93,9 +93,9 @@ Public Class CALCPanelVM
If e.End_ <> CalcEndEventArgs.Results.OK Then
'MessageBox.Show("Execution error (all processes are disabled)")
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Execution error (all processes are disabled)")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Execution error (all processes are disabled)")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
End If
End If
' ciclo sui pezzi
EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb
+4 -4
View File
@@ -476,16 +476,16 @@ Public Class NUMAxiumComm
If errorCode <> 0 Then
'MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
If EgtBEAMWALL.Core.Configuration.bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Error from VariableWritten:" & " " & errorCode.ToString())
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Error from VariableWritten:" & " " & errorCode.ToString())
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
End If
Else
'MessageBox.Show("VariableWritten successfully")
If EgtBEAMWALL.Core.Configuration.bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "VariableWritten successfully")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "VariableWritten successfully")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
End If
End If
End Sub
EgtBEAMWALL.Supervisor/Comms/NUMAxiumPcToolkitComm.vb
+4 -4
View File
@@ -743,16 +743,16 @@ Public Class NUMAxiumPcToolkitComm
If errorCode <> 0 Then
'MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Error from VariableWritten:" & " " & errorCode.ToString())
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Error from VariableWritten:" & " " & errorCode.ToString())
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
End If
Else
'MessageBox.Show("VariableWritten successfully")
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "VariableWritten successfully")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "VariableWritten successfully")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
End If
End If
End Sub
EgtBEAMWALL.Supervisor/Comms/NUMFlexiumComm.vb
+4 -4
View File
@@ -448,16 +448,16 @@ Public Class NUMFlexiumComm
If errorCode <> 0 Then
'MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Error from VariableWritten:" & " " & errorCode.ToString())
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Error from VariableWritten:" & " " & errorCode.ToString())
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
End If
Else
'MessageBox.Show("VariableWritten successfully")
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "VariableWritten successfully")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "VariableWritten successfully")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
End If
End If
End Sub
EgtBEAMWALL.Supervisor/Comms/TPAComm.vb
+3 -3
View File
@@ -194,12 +194,12 @@ Public Class TPAComm
End Sub
Private Sub RemoteObject_ServerError(ByVal sender As Object, ByVal seEA As ISOCNC.Remoting.ServerErrorEventArgs)
m_ResultCallbackDlg(CommandTypes.ERROR_, CommandStates.ERROR_, ResultTypes.RESULT, "Server Error: " & seEA.[Error])
m_ResultCallbackDlg(CommandTypes.ERROR_, CommandStates.ERROR_, ResultTypes.RESULT, EgtUILib.EgtMsg(62543) & seEA.[Error])
Dim dr As MessageBoxResult
If EgtBEAMWALL.Core.Configuration.bOnlyProd Then
dr = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Server Error: " & seEA.[Error])
dr = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62543) & seEA.[Error])
Else
dr = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Server Error: " & seEA.[Error])
dr = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62543) & seEA.[Error])
End If
End Sub
EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
+14
View File
@@ -361,6 +361,12 @@
<DependentUpon>OnlyProdMachineLogPageV.xaml</DependentUpon>
</Compile>
<Compile Include="MachinePanel\MachinePanelVM.vb" />
<Compile Include="MainMenu\OnlyProdMainMenuV.xaml.vb">
<DependentUpon>OnlyProdMainMenuV.xaml</DependentUpon>
</Compile>
<Compile Include="MainWindow\OnlyProdMainWindowV.xaml.vb">
<DependentUpon>OnlyProdMainWindowV.xaml</DependentUpon>
</Compile>
<Compile Include="MDIPage\MDIPageV.xaml.vb">
<DependentUpon>MDIPageV.xaml</DependentUpon>
</Compile>
@@ -525,6 +531,14 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MainMenu\OnlyProdMainMenuV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MainWindow\OnlyProdMainWindowV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MDIPage\MDIPageV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb
+4 -4
View File
@@ -748,9 +748,9 @@ Public Class LeftPanelVM
If SelMachGroup.dtStartTime <> Date.MinValue OrElse SelMachGroup.dtEndTime <> Date.MinValue OrElse SelMachGroup.bReadyForMachining OrElse SelMachGroup.bSentToMachine OrElse SelMachGroup.bResetWhileCutting Then
'MessageBox.Show("Impossibile cancellare il grezzo")
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile cancellare il grezzo")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62544))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile cancellare il grezzo")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62544))
End If
Return
End If
@@ -807,9 +807,9 @@ Public Class LeftPanelVM
ElseIf CurrPart.nProduction_State < ItemState.Produced Then
'MessageBox.Show("It is not possible to set as done a part that has before not already produced parts.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "It is not possible to set as done a part that has before not already produced parts.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62545), EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "It is not possible to set as done a part that has before not already produced parts.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62545), EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
End If
Return
End If
EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb
+4 -4
View File
@@ -191,9 +191,9 @@ Public Class MyMachGroupVM
If IsNothing(RedoMachGroupVM) Then
'MessageBox.Show("New RawPart creation failed!")
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "New RawPart creation failed!")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62546))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "New RawPart creation failed!")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62546))
End If
Return
End If
@@ -286,9 +286,9 @@ Public Class MyMachGroupVM
' chiedo se riprendere o rifare il pannello da zero
Dim bRedo As MessageBoxResult
If bOnlyProd Then
bRedo = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Riprendere lavorazione pannello corrente?", "", MessageBoxButton.YesNo, MessageBoxImage.Information)
bRedo = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62547), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
Else
bRedo = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Riprendere lavorazione pannello corrente?", "", MessageBoxButton.YesNo, MessageBoxImage.Information)
bRedo = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62547), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
End If
Dim MachIndexVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = MACHINDEX)
Select Case bRedo
EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb
+2 -2
View File
@@ -812,9 +812,9 @@ Public Class MachManaging
m_ResultCallbackDlg(CommandTypes.START, CommandStates.ERROR_, ResultTypes.NULL, "Error in copying DEFAULT.ISO file")
'MessageBox.Show("Impossibile copiare il file DEFAULT.ISO!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile copiare il file DEFAULT.ISO!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62548), EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile copiare il file DEFAULT.ISO!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62548), EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
End If
Return
End Try
EgtBEAMWALL.Supervisor/MainMenu/MainMenuV.xaml
-4
View File
@@ -6,10 +6,6 @@
<!--Barra superiore dei comandi-->
<UniformGrid Rows="1">
<Button Content="{Binding OnlyProdPage_Msg}"
Command="{Binding OnlyProdPage_Command}"
Visibility="{Binding OnlyProdPage_Visibility}"
Style="{StaticResource MainMenu_Button}"/>
<Button Content="{Binding Viewer_Msg}"
Command="{Binding Viewer_Command}"
Visibility="{Binding ViewerOptimizer_Visibility}"
EgtBEAMWALL.Supervisor/MainMenu/OnlyProdMainMenuV.xaml
+28
View File
@@ -0,0 +1,28 @@
<StackPanel x:Class="OnlyProdMainMenuV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Orientation="Horizontal"
IsEnabled="{Binding MainMenu_IsEnabled}">
<!--Barra superiore dei comandi-->
<UniformGrid Rows="1">
<Button Content="{Binding OnlyProdPage_Msg}"
Command="{Binding OnlyProdPage_Command}"
Visibility="{Binding OnlyProdPage_Visibility}"
Style="{StaticResource OnlyProdMainMenu_Button}"/>
<RadioButton Content="{Binding Supervisor_Msg}"
IsChecked="{Binding Supervisor_IsChecked}"
Style="{StaticResource OnlyProdMainMenu_ToggleButton}"/>
<RadioButton Content="{Binding Inputs_Msg}"
IsChecked="{Binding Inputs_IsChecked}"
Visibility="{Binding Inputs_Visibility}"
Style="{StaticResource OnlyProdMainMenu_ToggleButton}"/>
<RadioButton Content="{Binding Outputs_Msg}"
IsChecked="{Binding Outputs_IsChecked}"
Visibility="{Binding Outputs_Visibility}"
Style="{StaticResource OnlyProdMainMenu_ToggleButton}"/>
<RadioButton Content="{Binding Configuration_Msg}"
IsChecked="{Binding Config_IsChecked}"
Style="{StaticResource OnlyProdMainMenu_ToggleButton}"/>
</UniformGrid>
</StackPanel>
EgtBEAMWALL.Supervisor/MainMenu/OnlyProdMainMenuV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class OnlyProdMainMenuV
End Class
EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
+2 -2
View File
@@ -215,9 +215,9 @@ Public Class MainWindowVM
(Map.refLeftPanelVM.SelOPState.Id <> OPStates.End AndAlso Map.refLeftPanelVM.SelOPState.Id <> OPStates.Unspecified) Then
'MessageBox.Show("Impossible closing software while machine is working. If you want to close, first press reset and stop the machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Impossible closing software while machine is working. If you want to close, first press reset and stop the machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62549), EgtUILib.EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossible closing software while machine is working. If you want to close, first press reset and stop the machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62549), EgtUILib.EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
End If
Return
End If
EgtBEAMWALL.Supervisor/MainWindow/OnlyProdMainWindowV.xaml
+47
View File
@@ -0,0 +1,47 @@
<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdMainWindowV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
DataContext="{StaticResource MainWindowVM}"
Style="{StaticResource OnlyProd_EgtCustomWindow}"
Title="{Binding Title}" Icon="/Resources/EgtBEAMWALL.ico"
MinHeight="600" MinWidth="800"
ShowInTaskbar="True"
AboutBoxCommand="{Binding AboutBox_Command}"
CloseCommand="{Binding CloseApplication_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
<EgtWPFLib5:EgtCustomWindow.TitlePanel>
<EgtBEAMWALL:OnlyProdMainMenuV DataContext="{StaticResource MainMenuVM}"/>
</EgtWPFLib5:EgtCustomWindow.TitlePanel>
<!--Pannello principale -->
<DockPanel>
<!--StatusBar -->
<EgtBEAMWALL:StatusBarV DataContext="{StaticResource StatusBarVM}"
DockPanel.Dock="Bottom"/>
<!--Progetto corrente-->
<TabControl SelectedIndex="{Binding nSelTabPage}"
Padding="0"
Margin="0,-4,0,0">
<TabControl.ItemContainerStyle>
<Style TargetType="{x:Type TabItem}">
<Setter Property="Visibility" Value="Collapsed"/>
</Style>
</TabControl.ItemContainerStyle>
<TabItem>
<ContentControl Content="{Binding ProjectContent}"/>
</TabItem>
<TabItem>
<EgtBEAMWALL:InputsPageV DataContext="{StaticResource InputsPageVM}"/>
</TabItem>
<TabItem>
<EgtBEAMWALL:OutputsPageV DataContext="{StaticResource OutputsPageVM}"/>
</TabItem>
<TabItem>
<ContentControl Content="{Binding ConfigurationPageContent}"/>
</TabItem>
</TabControl>
</DockPanel>
</EgtWPFLib5:EgtCustomWindow>
EgtBEAMWALL.Supervisor/MainWindow/OnlyProdMainWindowV.xaml.vb
+47
View File
@@ -0,0 +1,47 @@
Imports EgtWPFLib5
Imports EgtBEAMWALL.Core
Public Class OnlyProdMainWindowV
Private m_MainWindowVM As MainWindowVM
#Region "CONSTRUCTOR"
Sub New()
' Funzione che interpreta l'xaml
InitializeComponent()
' Assegno al riferimento locale al VM il VM preso dal DataContext
m_MainWindowVM = DirectCast(Me.DataContext, MainWindowVM)
AddHandler Me.Loaded, AddressOf MainWindowV_Loaded
AddHandler Me.ContentRendered, AddressOf MainWindowV_ContentRendered
AddHandler Me.Closing, AddressOf MainWindowV_Closing
AddHandler Me.KeyDown, AddressOf MainWindowV_KeyDown
End Sub
#End Region ' CONSTRUCTOR
#Region "EVENTS"
Private Sub MainWindowV_Loaded(sender As Object, e As RoutedEventArgs)
' Carico e imposto posizione finestra
WinPosFromIniToWindow(S_GENERAL, K_SUPERVISORWINPLACE, Me)
End Sub
Private Sub MainWindowV_ContentRendered(sender As Object, e As EventArgs)
m_MainWindowVM.ContentRendered()
End Sub
Private Sub MainWindowV_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
' Salvo posizione finestra (se non minimizzata)
If WindowState <> WindowState.Minimized Then
WinPosFromWindowToIni(Me, S_GENERAL, K_SUPERVISORWINPLACE)
End If
End Sub
Private Sub MainWindowV_KeyDown(sender As Object, e As KeyEventArgs)
m_MainWindowVM.KeyDown(e.Key)
End Sub
#End Region ' EVENTS
End Class
EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb
+8 -8
View File
@@ -187,9 +187,9 @@ Public Class SupervisorManagerVM
' impedisco cambio progetto
'MessageBox.Show("Press reset before changing program!!")
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Press reset before changing program!!")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62550))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Press reset before changing program!!")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62550))
End If
Return
End If
@@ -223,9 +223,9 @@ Public Class SupervisorManagerVM
m_MruFiles.Remove(sFilePath)
'MessageBox.Show(String.Format("Impossible opening a project done with {0} in a supervisor on a {1}!", {TempCurrProd.sMachine, CurrentMachine.sMachineName}), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) 'Error
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, String.Format("Impossible opening a project done with {0} in a supervisor on a {1}!", {TempCurrProd.sMachine, CurrentMachine.sMachineName}), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) 'Error
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62551), {TempCurrProd.sMachine, CurrentMachine.sMachineName}), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) 'Error
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format("Impossible opening a project done with {0} in a supervisor on a {1}!", {TempCurrProd.sMachine, CurrentMachine.sMachineName}), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) 'Error
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62551), {TempCurrProd.sMachine, CurrentMachine.sMachineName}), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) 'Error
End If
EgtNewFile()
EgtDraw()
@@ -247,9 +247,9 @@ Public Class SupervisorManagerVM
Else
'MessageBox.Show("Impossibile aprire il file!!")
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile aprire il file!!")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62552))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile aprire il file!!")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62552))
End If
Map.refSceneHostVM.MainController.NewProject()
Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
@@ -261,9 +261,9 @@ Public Class SupervisorManagerVM
Else
'MessageBox.Show("File non trovato!!")
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "File non trovato!!")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62553))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "File non trovato!!")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62553))
End If
Map.refSceneHostVM.MainController.NewProject()
Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
EgtBEAMWALL.Supervisor/Utility/DbControllers.vb
+2 -2
View File
@@ -89,9 +89,9 @@ Module DbControllers
EgtOutLog("InitDb error: " & ex.ToString())
'MessageBox.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62554), EgtMsg(91115))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62554), EgtMsg(91115))
End If
End
End Try
EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
+37
View File
@@ -2195,6 +2195,22 @@
<Setter Property="Margin" Value="5,0,0,0"/>
</Style>
<Style x:Key="OnlyProdMainMenu_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
<Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
<Setter Property="TextBlock.FontWeight" Value="Normal"/>
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="105"/>
<Setter Property="Background">
<Setter.Value>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
<GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.65"/>
<GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
</LinearGradientBrush>
</Setter.Value>
</Setter>
</Style>
<!--#endregion Button Style-->
<!--#region EgtFloatingPanel-->
@@ -2224,6 +2240,27 @@
<Setter Property="Margin" Value="5,2,5,2"/>
</Style>
<Style x:Key="OnlyProdMainMenu_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
<Setter Property="TextBlock.FontWeight" Value="Normal"/>
<Setter Property="FontSize" Value="15"/>
<Setter Property="Background">
<Setter.Value>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
<GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.65"/>
<GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
</LinearGradientBrush>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="TextBlock.FontWeight" Value="ExtraBold"/>
<Setter Property="TextBlock.Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
</Trigger>
</Style.Triggers>
</Style>
<!--#endregion ToggleButton-->
<!--#region ComboBox-->
EgtBEAMWALL.ViewerOptimizer/Application.xaml.vb
-43
View File
@@ -22,47 +22,4 @@ Class Application
Me.MainWindow.Show()
End Sub
''' <summary>
''' Funzione che recupera la directory del file INI
''' </summary>
Private Shared Sub GetIniFileDirectory()
' Impostazione path radice per i dati
Dim m_sDataRoot As String = System.AppDomain.CurrentDomain.BaseDirectory
If EgtUILib.GetPrivateProfileString(ConstGen.S_DATA, ConstGen.K_DATAROOT, "", m_sDataRoot, m_sDataRoot & "\" & ConstGen.DAT_FILE_NAME) = 0 Then
m_sDataRoot = System.AppDomain.CurrentDomain.BaseDirectory
End If
' Impostazione direttorio di configurazione
Dim m_sConfigDir As String = m_sDataRoot & "\" & ConstGen.CONF_DIR
' Impostazione path Ini file
IniFile.m_sIniFile = m_sConfigDir & "\" & Core.ConstIni.INI_FILE_NAME
End Sub
''' <summary>
''' Funzione per recuperare bOnlyProd
''' </summary>
''' <param name="SECTION"></param>
''' <param name="KEY"></param>
''' <param name="PATH"></param>
''' <param name="DEFAULT_VALUE"></param>
''' <returns></returns>
Public Function Read_Value(ByVal SECTION As String, ByVal KEY As String, ByVal PATH As String, ByVal Optional DEFAULT_VALUE As String = "") As String
Dim READER_LINES As String() = System.IO.File.ReadAllLines(PATH)
Dim CURRENT_SECTION As String = ""
For Each READER_LINE As String In READER_LINES
If READER_LINE.StartsWith("[") AndAlso READER_LINE.EndsWith("]") Then
CURRENT_SECTION = READER_LINE
ElseIf CURRENT_SECTION.Equals($"[{SECTION}]") Then
Dim lineParts As String() = READER_LINE.Split({"="c}, 2)
If lineParts.Length >= 1 AndAlso lineParts(0) = KEY Then
Return If(lineParts.Length >= 2, lineParts(1), DEFAULT_VALUE)
End If
End If
Next
Return DEFAULT_VALUE
End Function
End Class
EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb
+4 -4
View File
@@ -152,16 +152,16 @@ Public Class BTLParamVM
If nDoneCnt > 0 Then
'MessageBox.Show("Pezzo " & nPartId & " non modificato in " & INPROD & " barra/e perche' settata/e come da produrre", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Pezzo " & nPartId & " non modificato in " & INPROD & " barra/e perche' settata/e come da produrre", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62555) & nPartId & EgtMsg(62556) & INPROD & EgtMsg(62557), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Pezzo " & nPartId & " non modificato in " & INPROD & " barra/e perche' settata/e come da produrre", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62555) & nPartId & EgtMsg(62556) & INPROD & EgtMsg(62557), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
End If
ElseIf INPROD > 0 Then
'MessageBox.Show("Pezzo " & nPartId & " modificato in " & INPROD & " barra/e grezza/e", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Pezzo " & nPartId & " modificato in " & INPROD & " barra/e grezza/e", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62555) & nPartId & EgtMsg(62558) & INPROD & EgtMsg(62559), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Pezzo " & nPartId & " modificato in " & INPROD & " barra/e grezza/e", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62555) & nPartId & EgtMsg(62558) & INPROD & EgtMsg(62559), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
End If
End If
UpdateParamValue(dNewValue, "")
EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb
+2 -2
View File
@@ -245,9 +245,9 @@ Public Class CALCPanelVM
If e.End_ = CalcEndEventArgs.Results.ERROR_ OrElse e.End_ = CalcEndEventArgs.Results.NULL Then
'MessageBox.Show("Execution error (all processes are disabled)")
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Execution error (all processes are disabled)")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Execution error (all processes are disabled)")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
End If
End If
If e.End_ = CalcEndEventArgs.Results.EDIT Then
EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb
+16 -6
View File
@@ -578,12 +578,22 @@ Public Class ConfigurationPageVM
' .OverwritePrompt = False,
' .FileName = "Select this ",
' .Title = "Backup & Restore File Path"}
Dim FileDialog As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
.CheckFileExists = False,
.OverwritePrompt = False,
.FileName = "Select this ",
.Title = "Backup & Restore File Path"
}
Dim FileDialog As Object
If bOnlyProd Then
FileDialog = New EgtBEAMWALL.Core.OnlyProdEgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
.CheckFileExists = False,
.OverwritePrompt = False,
.FileName = "Select this ",
.Title = "Backup & Restore File Path"
}
Else
FileDialog = New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
.CheckFileExists = False,
.OverwritePrompt = False,
.FileName = "Select this ",
.Title = "Backup & Restore File Path"
}
End If
If FileDialog.ShowDialog() Then
m_ExternalBackupFolderPath = Path.GetDirectoryName(FileDialog.FileName)
WriteMainPrivateProfileString(S_BACKUPANDRESTORE, K_EXTERNALFILEPATH, m_ExternalBackupFolderPath)
EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/NestingRunningWndVM.vb
+4 -4
View File
@@ -619,9 +619,9 @@ Public Class NestingRunningWndVM
Else
'MessageBox.Show("Impossible creating rawpart", EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Impossible creating rawpart", EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossible creating rawpart", EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
End If
End If
' se nessun grezzo, rimetto tutti i pezzi invisibili
@@ -771,9 +771,9 @@ Public Class NestingRunningWndVM
'If MessageBox.Show("Are you sure you want to stop the nesting?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then Return
Dim m_MessageBoxResult As MessageBoxResult
If bOnlyProd Then
m_MessageBoxResult = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Are you sure you want to stop the nesting?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
m_MessageBoxResult = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62560), EgtMsg(91122), MessageBoxButton.YesNo, MessageBoxImage.Warning)
Else
m_MessageBoxResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Are you sure you want to stop the nesting?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
m_MessageBoxResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62560), EgtMsg(91122), MessageBoxButton.YesNo, MessageBoxImage.Warning)
End If
If m_MessageBoxResult = MessageBoxResult.No Then Return
' fermo il nesting
EgtBEAMWALL.ViewerOptimizer/OnlyProdManager/OnlyProdManagerVM.vb
+10 -10
View File
@@ -754,7 +754,7 @@ Public Class OnlyProdManagerVM
' se esiste gia' un'ottimizzazione
If ToDeleteProj.nProdId > 0 Then
'Select Case MessageBox.Show(EgtMsg(61942), "Information", MessageBoxButton.YesNo, MessageBoxImage.Information) ' BTL file already imported and optimized. Do you want to import it again?
Select Case EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61942), "Information", MessageBoxButton.YesNo, MessageBoxImage.Information) ' BTL file already imported and optimized. Do you want to import it again?
Select Case EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61942), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) ' BTL file already imported and optimized. Do you want to import it again?
Case MessageBoxResult.Yes
' lo importo, quindi non devo fare nulla
Case MessageBoxResult.No
@@ -763,7 +763,7 @@ Public Class OnlyProdManagerVM
Else
' se non ha ottimizazione, chiedo se sovrascriverlo
'Select Case MessageBox.Show(EgtMsg(61943), "Information", MessageBoxButton.YesNoCancel, MessageBoxImage.Information) ' BTL file already imported. Do you want to overwrite it?
Select Case EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61943), "Information", MessageBoxButton.YesNoCancel, MessageBoxImage.Information) ' BTL file already imported. Do you want to overwrite it?
Select Case EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61943), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information) ' BTL file already imported. Do you want to overwrite it?
Case MessageBoxResult.Yes
' cancello BTLParts su DB
DbControllers.m_ProjController.UpdateBtlParts(nAlreadyImported, New List(Of BTLPartM))
@@ -1474,7 +1474,7 @@ Public Class OnlyProdManagerVM
Catch ex1 As Exception
EgtOutLog("Exception in zip: " & ex1.ToString())
'MessageBox.Show("Error in export file creation!")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Error in export file creation!")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62561))
End Try
' elimino layer di esportazione
EgtErase(nImpExpPartId)
@@ -1541,7 +1541,7 @@ Public Class OnlyProdManagerVM
Catch ex1 As Exception
EgtOutLog("Exception in zip: " & ex1.ToString())
'MessageBox.Show("Impossibile importare file", "Errore")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile importare file", "Errore")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62562), EgtMsg(15001))
Return
End Try
LoadingWndHelper.OpenLoadingWnd(ActiveIds.IMPORTPROJECT, 2, EgtMsg(63018), EgtMsg(63019), 30) ' Project importing ' Loading project
@@ -1551,7 +1551,7 @@ Public Class OnlyProdManagerVM
If Not bOk Then
LoadingWndHelper.CloseLoadingWnd(ActiveIds.IMPORTPROJECT)
'MessageBox.Show("Impossibile aprire il file", "Errore")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile aprire il file", "Errore")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62562), EgtMsg(15001))
Return
End If
' recupero e verifico se ho a disposizione la macchina con cui e' stato creato il progetto
@@ -1601,7 +1601,7 @@ Public Class OnlyProdManagerVM
End While
If Not ImportProjIdList.Count > 0 Then
'MessageBox.Show("Nessun progetto trovato all'interno del file importato", "Errore")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Nessun progetto trovato all'interno del file importato", "Errore")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62563), EgtMsg(15001))
End If
' carico i proj
For nProjIndex = 0 To ImportProjIdList.Count - 1
@@ -1655,7 +1655,7 @@ Public Class OnlyProdManagerVM
EgtOutLog("Impossibile copiare il file")
LoadingWndHelper.CloseLoadingWnd(ActiveIds.IMPORTPROJECT)
'MessageBox.Show("Impossibile copiare il file del progetto", "Errore")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile copiare il file del progetto", "Errore")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62564), EgtMsg(61764))
Return
End Try
End If
@@ -1834,17 +1834,17 @@ Public Class OnlyProdManagerVM
Next
If bFound Then
'MessageBox.Show("Selezionato progetto che fa gia' parte di questa produzione!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Selezionato progetto che fa gia' parte di questa produzione!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62565), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
Else
'MessageBox.Show("Progetto gia' collegato ad una produzione!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Progetto gia' collegato ad una produzione!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62566), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
End If
Return
End If
' verifico che sia associato alla stessa macchina
If OpenProjectFileDialogVM.SelProject.sMachine <> CurrProd.sMachine Then
'MessageBox.Show("Progetto per una macchina diversa da quella del progetto corrente!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Progetto per una macchina diversa da quella del progetto corrente!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62567), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
Return
End If
' inserisco proj nel prod corrente
EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
+3 -3
View File
@@ -495,17 +495,17 @@ Public Class ProdManagerVM
Next
If bFound Then
'MessageBox.Show("Selezionato progetto che fa gia' parte di questa produzione!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Selezionato progetto che fa gia' parte di questa produzione!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62565), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
Else
'MessageBox.Show("Progetto gia' collegato ad una produzione!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Progetto gia' collegato ad una produzione!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62566), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
End If
Return
End If
' verifico che sia associato alla stessa macchina
If OpenProjectFileDialogVM.SelProject.sMachine <> CurrProd.sMachine Then
'MessageBox.Show("Progetto per una macchina diversa da quella del progetto corrente!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Progetto per una macchina diversa da quella del progetto corrente!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62567), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
Return
End If
' inserisco proj nel prod corrente
EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
+7 -7
View File
@@ -638,7 +638,7 @@ Public Class ProjManagerVM
' se esiste gia' un'ottimizzazione
If ToDeleteProj.nProdId > 0 Then
'Select Case MessageBox.Show(EgtMsg(61942), "Information", MessageBoxButton.YesNo, MessageBoxImage.Information) ' BTL file already imported and optimized. Do you want to import it again?
Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61942), "Information", MessageBoxButton.YesNo, MessageBoxImage.Information) ' BTL file already imported and optimized. Do you want to import it again?
Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61942), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) ' BTL file already imported and optimized. Do you want to import it again?
Case MessageBoxResult.Yes
' lo importo, quindi non devo fare nulla
Case MessageBoxResult.No
@@ -647,7 +647,7 @@ Public Class ProjManagerVM
Else
' se non ha ottimizazione, chiedo se sovrascriverlo
'Select Case MessageBox.Show(EgtMsg(61943), "Information", MessageBoxButton.YesNoCancel, MessageBoxImage.Information) ' BTL file already imported. Do you want to overwrite it?
Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61943), "Information", MessageBoxButton.YesNoCancel, MessageBoxImage.Information) ' BTL file already imported. Do you want to overwrite it?
Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61943), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information) ' BTL file already imported. Do you want to overwrite it?
Case MessageBoxResult.Yes
' cancello BTLParts su DB
DbControllers.m_ProjController.UpdateBtlParts(nAlreadyImported, New List(Of BTLPartM))
@@ -1402,7 +1402,7 @@ Public Class ProjManagerVM
Catch ex1 As Exception
EgtOutLog("Exception in zip: " & ex1.ToString())
'MessageBox.Show("Error in export file creation!")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Error in export file creation!")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62561))
End Try
' elimino layer di esportazione
EgtErase(nImpExpPartId)
@@ -1468,7 +1468,7 @@ Public Class ProjManagerVM
Catch ex1 As Exception
EgtOutLog("Exception in zip: " & ex1.ToString())
'MessageBox.Show("Impossibile importare file", "Errore")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile importare file", "Errore")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62562), EgtMsg(15001))
Return
End Try
LoadingWndHelper.OpenLoadingWnd(ActiveIds.IMPORTPROJECT, 2, EgtMsg(63018), EgtMsg(63019), 30) ' Project importing ' Loading project
@@ -1478,7 +1478,7 @@ Public Class ProjManagerVM
If Not bOk Then
LoadingWndHelper.CloseLoadingWnd(ActiveIds.IMPORTPROJECT)
'MessageBox.Show("Impossibile aprire il file", "Errore")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile aprire il file", "Errore")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62562), EgtMsg(15001))
Return
End If
' recupero e verifico se ho a disposizione la macchina con cui e' stato creato il progetto
@@ -1526,7 +1526,7 @@ Public Class ProjManagerVM
End While
If Not ImportProjIdList.Count > 0 Then
'MessageBox.Show("Nessun progetto trovato all'interno del file importato", "Errore")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Nessun progetto trovato all'interno del file importato", "Errore")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62563), EgtMsg(15001))
End If
' carico i proj
For nProjIndex = 0 To ImportProjIdList.Count - 1
@@ -1580,7 +1580,7 @@ Public Class ProjManagerVM
EgtOutLog("Impossibile copiare il file")
LoadingWndHelper.CloseLoadingWnd(ActiveIds.IMPORTPROJECT)
'MessageBox.Show("Impossibile copiare il file del progetto", "Errore")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile copiare il file del progetto", "Errore")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62564), EgtMsg(15001))
Return
End Try
End If
EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerVM.vb
+2 -2
View File
@@ -229,9 +229,9 @@ Public Class RawPartManagerVM
sMachGroups = sMachGroups.Trim({" "c, ","c})
'MessageBox.Show(String.Format("Impossible sending {0} to supervisor because not machinable!", sMachGroups))
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, String.Format("Impossible sending {0} to supervisor because not machinable!", sMachGroups))
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62568), sMachGroups))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format("Impossible sending {0} to supervisor because not machinable!", sMachGroups))
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62568), sMachGroups))
End If
End If
End If
EgtBEAMWALL.ViewerOptimizer/Utility/DbControllers.vb
+2 -2
View File
@@ -85,9 +85,9 @@ Public Module DbControllers
EgtOutLog("InitDb error: " & ex.ToString())
'MessageBox.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
If bOnlyProd Then
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62554), EgtMsg(15001))
Else
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62554), EgtMsg(15001))
End If
End
End Try