From f634ff0aee54549b4905e379d13474a7b793e71c Mon Sep 17 00:00:00 2001 From: DarioS Date: Wed, 14 Sep 2022 11:22:38 +0200 Subject: [PATCH] Icarus : - aggiunto app.manifest per riconoscere Windows 10 e 11 - sistemato AboutBox. --- Icarus/AboutBoxWindow/AboutBoxV.xaml.vb | 10 ++- Icarus/Icarus.vbproj | 14 ++++ Icarus/MainWindow/MainWindowM.vb | 9 ++- Icarus/MainWindow/MainWindowV.xaml | 3 +- Icarus/MainWindow/MainWindowVM.vb | 21 ----- Icarus/My Project/AssemblyInfo.vb | 11 ++- Icarus/Resources/Icarus.old.ico | Bin 9158 -> 0 bytes Icarus/SceneHost/MySceneHostVM.vb | 3 + Icarus/SecondaryWindow/SecondaryWindowV.xaml | 2 +- Icarus/SecondaryWindow/SecondaryWindowVM.vb | 21 +++++ Icarus/app.manifest | 79 +++++++++++++++++++ 11 files changed, 143 insertions(+), 30 deletions(-) delete mode 100644 Icarus/Resources/Icarus.old.ico create mode 100644 Icarus/app.manifest diff --git a/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb b/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb index 7ee72ba..42fc809 100644 --- a/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb +++ b/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb @@ -20,13 +20,21 @@ Public Class AboutBoxV if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")" sInfo = If( EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName & - " (" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() & ")" & Environment.NewLine + " Inst" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() & + " Ulv" & Map.refMainWindowVM.MainWindowM.nUserLevel.ToString() & + " Dbg" & Map.refMainWindowVM.MainWindowM.DebugLevel().ToString() & Environment.NewLine sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine + Dim sOpSys As String = String.Empty + EgtGetOsInfo( sOpSys) + sInfo &= sOpSys & Environment.NewLine Dim sCPU As String = String.Empty EgtGetCpuInfo( sCPU) sInfo &= sCPU & Environment.NewLine + Dim sMem As String = String.Empty + EgtGetMemoryInfo( sMem) + sInfo &= sMem & Environment.NewLine Dim sScene As String = String.Empty EgtGetSceneInfo(sScene) sInfo &= sScene diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj index 6fb16d6..90c8b6d 100644 --- a/Icarus/Icarus.vbproj +++ b/Icarus/Icarus.vbproj @@ -49,6 +49,9 @@ Resources\Icarus.ico + + app.manifest + False @@ -83,6 +86,9 @@ MSBuild:Compile Designer + + AboutBoxV.xaml + ChooseReferenceWndV.xaml @@ -236,6 +242,10 @@ ViewPanelV.xaml + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -428,6 +438,7 @@ Resources.Designer.vb My.Resources + SettingsSingleFileGenerator Settings.Designer.vb @@ -549,6 +560,9 @@ + + + IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR64.exe diff --git a/Icarus/MainWindow/MainWindowM.vb b/Icarus/MainWindow/MainWindowM.vb index 870a524..adf5a64 100644 --- a/Icarus/MainWindow/MainWindowM.vb +++ b/Icarus/MainWindow/MainWindowM.vb @@ -10,6 +10,8 @@ Public Class MainWindowM ' massimo numero di istanze del programma ammesse Const MAX_INST As Integer = 32 + Private m_objMutex As Mutex + Private m_sDataRoot As String = String.Empty Friend ReadOnly Property sDataRoot As String Get @@ -32,8 +34,11 @@ Public Class MainWindowM End Property Private m_nDebug As Integer = 0 - - Private m_objMutex As Mutex + Public ReadOnly Property DebugLevel As Integer + Get + Return m_nDebug + End Get + End Property Private m_bFirstInstance As Boolean = False Friend ReadOnly Property bFirstInstance As Boolean diff --git a/Icarus/MainWindow/MainWindowV.xaml b/Icarus/MainWindow/MainWindowV.xaml index bbb5a95..d3eb8a2 100644 --- a/Icarus/MainWindow/MainWindowV.xaml +++ b/Icarus/MainWindow/MainWindowV.xaml @@ -5,8 +5,7 @@ xmlns:PrintApp="clr-namespace:Icarus" Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" Title="{Binding sTitle}" Icon="/Resources/Icarus.ico" - MinHeight="600" MinWidth="800" - AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize" + MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize" AllowDrop="True" Drop="MainWindowV_Drop" ShowInTaskbar="True" Topmost="False" diff --git a/Icarus/MainWindow/MainWindowVM.vb b/Icarus/MainWindow/MainWindowVM.vb index de4b95e..3d63a17 100644 --- a/Icarus/MainWindow/MainWindowVM.vb +++ b/Icarus/MainWindow/MainWindowVM.vb @@ -239,27 +239,6 @@ Public Class MainWindowVM '#Region "COMMANDS" - '#Region "AboutBoxCommand" - - ' ' Returns a command that manage the MainWindow_Unloaded command - ' Public ReadOnly Property AboutBoxCommand() As ICommand - ' Get - ' If m_cmdAboutBox Is Nothing Then - ' m_cmdAboutBox = New Command(AddressOf AboutBox) - ' End If - ' Return m_cmdAboutBox - ' End Get - ' End Property - - ' ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded. - ' Public Sub AboutBox(ByVal param As Object) - ' Dim AboutBoxWindow As New AboutBoxV - ' AboutBoxWindow.Owner = Application.Current.MainWindow - ' AboutBoxWindow.ShowDialog() - ' End Sub - - '#End Region ' AboutBoxCommand - '#Region "CloseApplicationCommand" ' ' Returns a command that manage the MainWindow_Unloaded command diff --git a/Icarus/My Project/AssemblyInfo.vb b/Icarus/My Project/AssemblyInfo.vb index 2f8c643..1c6fbd8 100644 --- a/Icarus/My Project/AssemblyInfo.vb +++ b/Icarus/My Project/AssemblyInfo.vb @@ -11,11 +11,16 @@ Imports System.Windows ' Review the values of the assembly attributes - - +#If DEBUG Then + + +#Else + + +#End If - + diff --git a/Icarus/Resources/Icarus.old.ico b/Icarus/Resources/Icarus.old.ico deleted file mode 100644 index 49429c5a6f83b1fc45202156b33ccc510e848525..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9158 zcmeI1d0bUTmdC$6-JMByPiL}pHfQvp! zt@En~zu|X$`z=D=X4^YpC~6%$YT9qZeWCm06LtIKTd?Y5c=ug(+x7S0@ELR!P07V1 zas5X4k>wBSLcae-+@(v%{6TMF(Wft;jP1#%<9pNIp+6lQb(uEo3!IGf_-nffbn7$@ z-R~Uu`11fha~VoUkKugnX2=)QjQE?k37!3{(DAjT*Ia9Q2iT!I&yF5b=b-Op&73J7 z1P^(OAcH>R5q}}V^gSZYKVZd}4~ZW839H7nV~u?W)=v7IFx##ypU|0g zQ@$k5xf`*r-Pq`&!}_Vch?}9uCfCj+cz(^6ncdms`7KFa-;wOoldW_6u*2^=w$AD& z+Wpz;H;5hc2C#AZaCZ6Y^Hrc7y#pQSwsZ=8!WHyb?uyPz5BjY2qHp3{tU^67i1o!O zW*)n8J2 z=R@=vypzs-kJ80Dim!$z(a#{25nfxEJ~M?5J&y7Dw<~P zj>7d&EIx1NYOrn0_Xex#tcrC-froR$XCy;5`&e z?l3$2F0Lznz-P^UJl53Vv%U_$Ee~0@B8I>N8;LlQ#PXxt*_M#ZiLId&?T_SqdLX9{ zEoXJ^J_0XgkeIWd)Kf~XWCwFTXC>E8MR2`%1-D9KxR8@bdEo&rpFK?FxlBUWRIoVi zJ_|S2u_V5Vn3PIl_FZG~jz@&0{YdoTA4xuPg9FN2EGbv9qD;ln3q>reJkF}?`K+%# z!{)o^*n7W>{qXA@_0# zC1n?=EY9NE85LC(Wn8PQKy~U4xh1zbd+`p(E!z2{)2TCd=KbnSIO6^v72_P;_ zA(w3$Y6mU;HSJg8CC9J9OL}de))fu>CI9M}HSV+>wcuZjUp=4ZF*JQ%xju5Z0-*IT zD%v4h@Y1B-EdMX~H-_>2X=82Oa|tHL^UL_Bjdiv8d9^b9P59>mE5HJ-@%c;sp9;Sk z(ZXNr|9M?)US6ISp5Gj?>|Y(4RwqqPfSa+RqHIRU_{_Z8ry8_+a;>rX`FYBWws_@8 zTSt$)x~ETT<;k^03-8Jdtvhx61tTpij4fC;8W{TBo zEqMa2%y?ma+%z3TFJog1kIc;Gfn>Ncqj`bU>z`+=9zZ*cg(4#(Pl`Q_#SZ?bO*=v8ogM-MrqW_-&l@gm$& z7FTzr^pZB?8^t>G16N5)L(~gJ>RCh zNpJMt2H*Im*rich;(vV%tu6n2{IASs3^3VOQDk-6y-!#@#W@~+^d9};CLuCbpIBRFZS{b#Ik_)_Mg>pXg} z-eVA(+|>LtN$}73>Al!IeIT1>>5%N(i|uoCNSZZ>ZGwO92pGTy?;#}59x8aKAzusr z*=5N@x<@#n6Yj)61o!L}AO9E;XzIqE^)IhF~5I* zE&tVSEAM``Q}EP-bm(=2PT!{Rx4wt?W^62zodiGao<+xh925NX1l{${(06z)eMX$4 zzf~E!W3Ms9ERSJh3o)`ehpA&ZW1Y@3aef7p1P`6!e+jPzSJAht!pP+&R&Lj2E^0Za z8W(@TLsJ%_n;OiBxNv-f*D*3V2+J)&jNcrLZE_g;X%UP_U%}Y)Rd^?aqezRzOSuvM z^aMs9i)FlOJ(E-$u+L4vIe!b@Cz6?VW;ZiW?__$(9(>O3WA54gEI5A{|4T=(T$_t~ z=oRKimN8*d7K+`uxa>WSUGNXMEv?2k^d>IRwai(4hv{+k%-&GP?4*YTr^b<%5hS>3 zAgA^PQFve(=MIMm-ny1^N1`anh^6#s0&BDPu<*hWg369^MHR@k{H0VCt&%zG`K)bR zDA>o9Q~SAk?kEeR%ZS{1h2@DA1g*G7@YXv-C*CJ?Ydv8Hefs>#0U|o_WIli$8NjaMkS6 z0*+rk!`1R~uAR%G@@fU=DlbuXt(Jm@YL4H0MnzRU)wgePWnQkEn7piOt�wFqx@IrNlSoQmQmHsryT2NiYAY zOIgv%t|eizE6J#4V$J^9!m~nd#0%bFgF*4%@n07M>1#S zNYhi>i!9W38DnaxP^wgI>qHQZZ0y0+D8 zTUvXAJX@`{rPSJ6G;M2dw!h*3TmBII3vW`MA|1I)XX@HKWypWD3aC|{V*K3z{yK4h zI71)Ax8FF(xkv}sVRUgELPyV*GxP4=qv_;pPA5N0zVf%B=NxPL&9|q!<22^GI55e^ zpG8Cez#@HdUOxQ42^;ZeLdDs6=*ah3X8JzirXLbv{xK2O?d3D{D65ae8G3tS#SZ{0 z#&=}Z#4m_;=pxS1yRv#pCpmvv?ffO?!3DdigG_wbZ zUcE>WXXr^@x+MAxVrPJ^I)9mO$aX&yIfv;U?nv)tuINR2GB{=?I%{XpJAO8XVJ;X& zPQ^0N1|QvGU5iJtXYo+>h3Si&#DIOlreww# zu_Mr&ZHsM0ZevT@QVY^VzLFMcOZo~cadvLS!R6z`S-YJ$Yqv+a%9+f#DI#z2mUEVr zZPVGk+n2p*0UTRvD$du(P`E=O@|3CMCe9SOiZ8i4z2tnQaOW(Mqs->a{s2B`AI#hD zt>*2I;&|uN&HTB2GVgUrme1AS>$sZ_zTD5pU5@anIA3q~bp{>#r}C9$3F1iyAgfCBY^yLBQ;31(8AeSw#|XCqhWHj> zF|&|yKE)VJxrni%f-z2~F`aiBhkz@%`Ie(U@j3=hHw69`qo&=Ka~i7|x0pENCKf)` zSoz<@+2;mR{i?)ydlkc@Lm9m@6!XM|*d>KBc3TLhdm?a-4?(dx9M>&NnY=9=@2$)6 zN{M1#@=CmqY{20}0`95=6a~plE#AfKf?Z5In~HDg0Y)zrc}w6)#zmdR@%sW6e1A!t z!C%5=(LL-#Yj9h9N93jV@L62NjNm&cR@UMdcOCEO8s^8;;2A5<1CXQ{|p*6*t%>d=oYmCo8LjGo;T?p`7)>oEs% zZgMF5Hu1TS*;^#?mXar=mHkYH$Xn8@o|9X4mZ}n!oU>fMTEnG^ddjM=akZ+N+y^(P zs;uPhEpgqcrtaQN>T0Ta@UWi8j~~maf!XV%?e|dIGBXpO5IISZO4)-{VrC}i4g%IT z*--0Wkz~ktt=E=PN8 zK(vJ3b3&nj$(N)pERgmdp)VC%nY~Ma(9}zC&w_fj{+YFvm6@59^#s{g(5!EAFt?IL z7+pLI3JMC<<2Ds)^j2017lliUzFs(zMd9M0P`G$%@lO=8)>>9e1`(({uLowrAk;$V z;_Tw$;$E-Tmk70)IGFa%L&aV;luz9Z z=-@M&cJs~odw?~)e5{!2ZOGD5?}~ls1EhT@) z@QWD7uwZ9~Efw52+yk4?sf=Fk#<*oOv5xV@e%%801q~GYjG5rTqdBtNnA9Lk_J`Su z`a~ASI-^`WS@2zF!jos9iXBPLMjOtijN|ymNu1p3MSjXWDgmS;;42A86MplOFvKGG_X6Jf?17lvxTNb~z#V>oLCUm5YvEE`J|b#XrRF ztG)HJ=xuO{{st$}9eI}ij$BAnXoAGeNnA$w^^MC|u99+%0$&?Pl)zH0G7< z#UZ91$7MD61>a)s(t89%+-3H%M@$pHkf4&0ZGeyrA zMU2vFpX%AO?f#^0x9m%rcJl|XXHU7m)Q$@gH(?J++>#g<5)u~|5+}C@_v|}3C`8Bt zbvs0-r%unFx(gO85FG@*sjn1L-@bh{?JfSo+*ePC|0dZUqN6iFS5L36zki6_j?-DN aIY|?N)IU)gxK&$Qm&zAsD~0>NlK%n3u&km0 diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb index bb95f93..c030ac0 100644 --- a/Icarus/SceneHost/MySceneHostVM.vb +++ b/Icarus/SceneHost/MySceneHostVM.vb @@ -292,6 +292,9 @@ Public Class MySceneHostVM End If Dim OpenFileDialog As New OpenFileDialog With {.Title = "Insert", .Filter = "Stereolithography (*.stl)|*.stl" & + "|Iges files (*.igs;*.iges)|*.igs;*.iges" & + "|Step files (*.stp;*.step)|*.stp;*.step" & + "|3D Manufacturing format (*.3mf)|*.3mf" & "|New geometry EgalTech(*.nge)|*.nge" & "|All Files (*.*)|*.*", .FilterIndex = 1, diff --git a/Icarus/SecondaryWindow/SecondaryWindowV.xaml b/Icarus/SecondaryWindow/SecondaryWindowV.xaml index 961c8a1..12f614d 100644 --- a/Icarus/SecondaryWindow/SecondaryWindowV.xaml +++ b/Icarus/SecondaryWindow/SecondaryWindowV.xaml @@ -9,7 +9,7 @@ ShowInTaskbar="False" AllowsTransparency="True" Background="Transparent" - + AboutBoxCommand="{Binding AboutBoxCommand}" CloseCommand="{Binding CloseApplicationCommand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" diff --git a/Icarus/SecondaryWindow/SecondaryWindowVM.vb b/Icarus/SecondaryWindow/SecondaryWindowVM.vb index 5ead758..164a7d3 100644 --- a/Icarus/SecondaryWindow/SecondaryWindowVM.vb +++ b/Icarus/SecondaryWindow/SecondaryWindowVM.vb @@ -66,6 +66,27 @@ Public Class SecondaryWindowVM #Region "COMMANDS" +#Region "AboutBoxCommand" + + ' Returns a command that manage the MainWindow_Unloaded command + Public ReadOnly Property AboutBoxCommand() As ICommand + Get + If m_cmdAboutBox Is Nothing Then + m_cmdAboutBox = New Command(AddressOf AboutBox) + End If + Return m_cmdAboutBox + End Get + End Property + + ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded. + Public Sub AboutBox(ByVal param As Object) + Dim AboutBoxWindow As New AboutBoxV + AboutBoxWindow.Owner = Application.Current.MainWindow + AboutBoxWindow.ShowDialog() + End Sub + +#End Region ' AboutBoxCommand + #Region "CloseApplicationCommand" ' Returns a command that manage the MainWindow_Unloaded command diff --git a/Icarus/app.manifest b/Icarus/app.manifest new file mode 100644 index 0000000..d975bb4 --- /dev/null +++ b/Icarus/app.manifest @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +