From e65174209d4787ce4c8d613f0fec36a257e18c77 Mon Sep 17 00:00:00 2001 From: DarioS Date: Wed, 14 Sep 2022 06:21:25 +0200 Subject: [PATCH] Icarus 2.4i2 : - piccole modifiche per togliere warning di compilazione - aggiunta icona standard Egaltech. --- Icarus/Icarus.vbproj | 9 ++++++--- Icarus/ImportPanel/ImportUtility.vb | 2 ++ .../MachSaveInDbWnd/MachSaveInDbWindowV.xaml | 2 +- Icarus/MainWindow/MainWindowV.xaml | 2 +- Icarus/MainWindow/MainWindowVM.vb | 3 ++- Icarus/My Project/AssemblyInfo.vb | 6 +++--- Icarus/ReferencePanel/ReferencePanelVM.vb | 2 ++ .../Resources/{EgtBEAMWALL.ico => Icarus.ico} | Bin 9158 -> 9158 bytes Icarus/RibPanel/RibPanelVM.vb | 1 + Icarus/SceneHost/MySceneHostVM.vb | 8 ++++---- Icarus/SecondaryWindow/SecondaryWindowV.xaml | 2 +- Icarus/SimulationPanel/SimulationPanelVM.vb | 2 +- Icarus/SliceManager/SliceManagerVM.vb | 1 + Icarus/StartMachPanel/StartMachPanelVM.vb | 1 + Icarus/Utility/CurrentMachine.vb | 1 - 15 files changed, 26 insertions(+), 16 deletions(-) rename Icarus/Resources/{EgtBEAMWALL.ico => Icarus.ico} (75%) diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj index b0203e4..6fb16d6 100644 --- a/Icarus/Icarus.vbproj +++ b/Icarus/Icarus.vbproj @@ -46,6 +46,9 @@ x64 true + + Resources\Icarus.ico + False @@ -55,8 +58,8 @@ False ..\ExtLibs\EgtWPFLib5.dll - - packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll + + ..\..\..\EgtProg\Icarus\Ionic.Zip.dll @@ -437,7 +440,7 @@ - + diff --git a/Icarus/ImportPanel/ImportUtility.vb b/Icarus/ImportPanel/ImportUtility.vb index 719b5e2..5ee400b 100644 --- a/Icarus/ImportPanel/ImportUtility.vb +++ b/Icarus/ImportPanel/ImportUtility.vb @@ -74,6 +74,8 @@ Public Class GeomEntity Return "┴" Case ChooseReferenceWndVM.References.MC Return "┼" + Case Else + Return "X" End Select End Get End Property diff --git a/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml b/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml index fec8a2f..5064e43 100644 --- a/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml +++ b/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml @@ -6,7 +6,7 @@ Title="Machining Param Name" Height="150" Width="300" WindowStartupLocation="CenterOwner" - Icon="/Resources/EgtBEAMWALL.ico" + Icon="/Resources/Icarus.ico" WindowStyle="None" ResizeMode="NoResize" ShowInTaskbar="False" IsMinimizable="False"> diff --git a/Icarus/MainWindow/MainWindowV.xaml b/Icarus/MainWindow/MainWindowV.xaml index a1974cc..bbb5a95 100644 --- a/Icarus/MainWindow/MainWindowV.xaml +++ b/Icarus/MainWindow/MainWindowV.xaml @@ -4,7 +4,7 @@ xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" xmlns:PrintApp="clr-namespace:Icarus" Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" - Title="{Binding sTitle}" Icon="/Resources/EgtBEAMWALL.ico" + Title="{Binding sTitle}" Icon="/Resources/Icarus.ico" MinHeight="600" MinWidth="800" AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize" AllowDrop="True" Drop="MainWindowV_Drop" diff --git a/Icarus/MainWindow/MainWindowVM.vb b/Icarus/MainWindow/MainWindowVM.vb index b8356e9..de4b95e 100644 --- a/Icarus/MainWindow/MainWindowVM.vb +++ b/Icarus/MainWindow/MainWindowVM.vb @@ -42,6 +42,7 @@ Public Class MainWindowVM Public Property nSelTabPage As Integer Get ' Return If(IsNothing(Map.refMainMenuVM.SelPage) OrElse Map.refMainMenuVM.SelPage = -1 OrElse Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING, 0, 1) + Return -1 End Get Set(value As Integer) End Set @@ -110,7 +111,7 @@ Public Class MainWindowVM Friend Sub ContentRendered() Map.refTopPanelVM.SelPage = Pages.NULL 'DbControllers.Init() - ''' chiamata a caso su Db per inizializzarlo + '' chiamata a caso su Db per inizializzarlo 'DbControllers.m_ProjController.FindByProjDbId(0) '' Verifico che l'inizializzazione di tutte le parti del programma sia andata a buon fine 'If Map.EndInit() Then diff --git a/Icarus/My Project/AssemblyInfo.vb b/Icarus/My Project/AssemblyInfo.vb index 3cf0f28..2f8c643 100644 --- a/Icarus/My Project/AssemblyInfo.vb +++ b/Icarus/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Windows - + @@ -55,5 +55,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/Icarus/ReferencePanel/ReferencePanelVM.vb b/Icarus/ReferencePanel/ReferencePanelVM.vb index bce1bfb..3f14924 100644 --- a/Icarus/ReferencePanel/ReferencePanelVM.vb +++ b/Icarus/ReferencePanel/ReferencePanelVM.vb @@ -129,6 +129,8 @@ Public Class ReferenceBtn Return "┴" Case References.MC Return "┼" + Case Else + Return "X" End Select End Get End Property diff --git a/Icarus/Resources/EgtBEAMWALL.ico b/Icarus/Resources/Icarus.ico similarity index 75% rename from Icarus/Resources/EgtBEAMWALL.ico rename to Icarus/Resources/Icarus.ico index 90d629658ffc7eb566f1f908b9955e8d9fc0ee46..49429c5a6f83b1fc45202156b33ccc510e848525 100644 GIT binary patch delta 1534 zcmZ`&&5P4O6fas`k-f;ebyr+L6w#Y0LO|H=aVexFrG*v*KiDNLVXxw;%ti7KLe>{VSG*YG_$vc0MrIKf8=zsTm&N&d-C3%*`3Dr56tt8L$EJ@QO zMY^o1Fh;W+ATAjXVxKfyqrIk7VL*sujk}%EBF!=?69FVivJ6s9pmwv>dgHjUsEqqE zTyXrHA7o&ISgmf~4S@r7mSGqsf3X0^7cC^%HmLqd5XA_GF`iH0Nk`zE)9N}Th@uSw zeOnOhzB3p&VH7Tl8=y{s_Z`3oP7p1N1}xUNfRPcF@U$xlSbRWWfjIn*_z4(25d@A4 z81^%`Wr45H@Qkg#b2@NP+#rnND1u88IEw+dPM1*>CnoW@?yRc*ta{68x7EM4`OMpG ze9HJ(@o_87DkA=$XAOM+$3g80FQ*4a;~W;GT@e5My+6C|Z-M;m^?Ge*=nUQAD|b!~ z_O6l5u?z!eP-9e>@QX2|uX`AVo@3%c6mV}kn@&7$GVvzdKQhdt4;}~+zE?NuhH*#; zfdu2V!I)`)n5M}C2AhomHya@1k64g-_4BHXmw*z=?L(e)3jQqp$A1_v|7 z;a6*S#VE$n0^=aGci4`KQAUB4hEr?DK+}mt{LwJC97DhhkQ?8EyYN*rjP$NJr3O~z zKPj@Pn#z5oSEP!nIQIhnW|dc1_oXzA$M?3LKk%}DTCKLi)CW!p&)V`_!-8NV_ii_! z^jwFH1#wJ4i8lxdt56Lz*PfLc+Pr(=<&MalD8r|2CIN3dELhDawzN zCA}}DGz@|$qL{}8`mM8RoFr0ba{6o%lYqHwzN**Xy8TF1rg0Wb*F5VrVYPa@+Yg{Y znOP77i{Bw@=CVnzq3PbgY(g-H=e>aPWHTPvu#HkZ#xU4cASJcpsWz$q)fyr4bSyY5NP zCF@UuFbYE)lHyqeUOSnEVYG;G5s8#oKL7r;AZaygXK9wEd|R}1ZJKB8TAz1p;$}8{ za%LjM*>K6{QD86GGlBxjIh*+K$#!}8YNU z7uuv(P4{@Z$uOA&T?lI$e%Sl<@cgGD-#eX7!##CR`=_tZ$KK 0) EgtSetShowTriaAdv(bShowTriaAdv) @@ -216,9 +216,9 @@ Public Class MySceneHostVM MainScene.SetSnapPointType(SP.PT_SKETCH) ' visualizzazione assemblato Dim nShowBuilding As Boolean = GetMainPrivateProfileInt(S_SCENE, K_SHOWBUILDING, 0) <> 0 - '''Map.refShowBeamPanelVM.SetShowBuilding(nShowBuilding) + 'Map.refShowBeamPanelVM.SetShowBuilding(nShowBuilding) ' nascondo input box - '''Map.refFreeContourInputVM.ResetInputBox() + 'Map.refFreeContourInputVM.ResetInputBox() End Sub Friend Sub EmitTitle() @@ -393,7 +393,7 @@ Public Class MySceneHostVM MainScene.SetStatusNull() End Sub - Friend Sub ExecScript(sFilePath As String) + Friend Shadows Sub ExecScript(sFilePath As String) If String.IsNullOrEmpty(sFilePath) Then Dim sDir As String = String.Empty 'GetMainPrivateProfileString(S_GENERAL, K_LASTLUADIR, "", sDir) diff --git a/Icarus/SecondaryWindow/SecondaryWindowV.xaml b/Icarus/SecondaryWindow/SecondaryWindowV.xaml index da13014..961c8a1 100644 --- a/Icarus/SecondaryWindow/SecondaryWindowV.xaml +++ b/Icarus/SecondaryWindow/SecondaryWindowV.xaml @@ -4,7 +4,7 @@ xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" xmlns:PrintApp="clr-namespace:Icarus" Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" - Title="{Binding sTitle}" Icon="/Resources/EgtBEAMWALL.ico" + Title="{Binding sTitle}" Icon="/Resources/Icarus.ico" WindowStyle="None" ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" diff --git a/Icarus/SimulationPanel/SimulationPanelVM.vb b/Icarus/SimulationPanel/SimulationPanelVM.vb index f806c4b..155cd04 100644 --- a/Icarus/SimulationPanel/SimulationPanelVM.vb +++ b/Icarus/SimulationPanel/SimulationPanelVM.vb @@ -219,7 +219,7 @@ Public Class SimulationPanelVM ' Return False ' End If 'End If - 'Return True + Return True End Function Friend Sub ExitSimulation() diff --git a/Icarus/SliceManager/SliceManagerVM.vb b/Icarus/SliceManager/SliceManagerVM.vb index 5a1a63b..51d8b63 100644 --- a/Icarus/SliceManager/SliceManagerVM.vb +++ b/Icarus/SliceManager/SliceManagerVM.vb @@ -118,6 +118,7 @@ Public Class SliceManagerVM 'Else ' Return 0 'End If + Return 0 End Function Friend Function CalcSlice(bSlice As Boolean, bCalcTFS As Boolean, bGenerate As Boolean) As Boolean diff --git a/Icarus/StartMachPanel/StartMachPanelVM.vb b/Icarus/StartMachPanel/StartMachPanelVM.vb index bf97085..3d39072 100644 --- a/Icarus/StartMachPanel/StartMachPanelVM.vb +++ b/Icarus/StartMachPanel/StartMachPanelVM.vb @@ -348,6 +348,7 @@ Public Class StartMachPanelVM ' seleziono percorso corrente EgtDeselectAll() EgtSelectObj(m_SelStart.nId) + Return True End Function Friend Sub UpdateUi() diff --git a/Icarus/Utility/CurrentMachine.vb b/Icarus/Utility/CurrentMachine.vb index 2c0848e..43cae01 100644 --- a/Icarus/Utility/CurrentMachine.vb +++ b/Icarus/Utility/CurrentMachine.vb @@ -1,6 +1,5 @@ Imports System.Collections.ObjectModel Imports System.IO -Imports EgtBEAMWALL.Core Imports EgtUILib Imports EgtWPFLib5