From ebedccf46a3fda8289e9f92c546993b03e20bdc5 Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Wed, 12 Feb 2025 12:33:18 +0100 Subject: [PATCH 1/3] Aggiunto popup viste --- OmagCUT.vbproj | 15 + OmagCUTDarkDictionary.xaml | 1212 ++++++++++++++------------- Project/SceneButtonsUC.xaml | 37 + Project/SceneButtonsUC.xaml.vb | 34 +- Resources/NewIcons/icoBack-3D.png | Bin 0 -> 4143 bytes Resources/NewIcons/icoBottom-3D.png | Bin 0 -> 4156 bytes Resources/NewIcons/icoFront-3D.png | Bin 0 -> 4122 bytes Resources/NewIcons/icoLeft-3D.png | Bin 0 -> 4133 bytes Resources/NewIcons/icoRight-3D.png | Bin 0 -> 4181 bytes 9 files changed, 694 insertions(+), 604 deletions(-) create mode 100644 Resources/NewIcons/icoBack-3D.png create mode 100644 Resources/NewIcons/icoBottom-3D.png create mode 100644 Resources/NewIcons/icoFront-3D.png create mode 100644 Resources/NewIcons/icoLeft-3D.png create mode 100644 Resources/NewIcons/icoRight-3D.png diff --git a/OmagCUT.vbproj b/OmagCUT.vbproj index 2b02cd0..ee4dd17 100644 --- a/OmagCUT.vbproj +++ b/OmagCUT.vbproj @@ -1396,6 +1396,21 @@ + + + + + + + + + + + + + + + IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe diff --git a/OmagCUTDarkDictionary.xaml b/OmagCUTDarkDictionary.xaml index dac15df..d047669 100644 --- a/OmagCUTDarkDictionary.xaml +++ b/OmagCUTDarkDictionary.xaml @@ -11,185 +11,191 @@ x:Class="OmagCUTDarkDictionary"> - + - - - - + + + + - 9.5 - - - 0.5 - 4,0,8,0 + 9.5 + + + 0.5 + 4,0,8,0 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + - ./Resources/Fonts/#Roboto - - - + + + + - - + + + + + + + + + + + + + + + + + + + - + ./Resources/Fonts/#Roboto - - + + + + - + + + - + + + - + - + - + - + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + + + + + + + + + + + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Project/SceneButtonsUC.xaml b/Project/SceneButtonsUC.xaml index 238c07a..2d1e9c3 100644 --- a/Project/SceneButtonsUC.xaml +++ b/Project/SceneButtonsUC.xaml @@ -39,6 +39,43 @@ + + + + + + + + + diff --git a/Project/SceneButtonsUC.xaml.vb b/Project/SceneButtonsUC.xaml.vb index 5274ea3..48430b7 100644 --- a/Project/SceneButtonsUC.xaml.vb +++ b/Project/SceneButtonsUC.xaml.vb @@ -5,6 +5,10 @@ Public Class SceneButtonsUC 'Riferimento alla MainWindow Dim m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow) + Private Sub Init() Handles Me.Initialized + TopViewBtn.ToolTip = "Top View" & vbCrLf & "Select View (Shift)" + End Sub + Private Sub MeasureBtn_Checked(sender As Object, e As RoutedEventArgs) Handles MeasureBtn.Checked GetCurrScene.SetStatusGetDistance() Dim ptRef1 As Point3d @@ -75,7 +79,35 @@ Public Class SceneButtonsUC End Sub Private Sub TopViewBtn_Click(sender As Object, e As RoutedEventArgs) Handles TopViewBtn.Click - EgtSetView(VT.TOP) + If (Keyboard.Modifiers And ModifierKeys.Shift) > 0 Then + If ViewPopUp.IsOpen Then + ViewPopUp.IsOpen = False + Else + ViewPopUp.IsOpen = True + End If + Else + EgtSetView(VT.TOP) + End If + End Sub + + Private Sub BottomViewBtn_Click(sender As Object, e As RoutedEventArgs) Handles BottomViewBtn.Click + EgtSetView(VT.BOTTOM) + End Sub + + Private Sub FrontViewBtn_Click(sender As Object, e As RoutedEventArgs) Handles FrontViewBtn.Click + EgtSetView(VT.FRONT) + End Sub + + Private Sub BackViewBtn_Click(sender As Object, e As RoutedEventArgs) Handles BackViewBtn.Click + EgtSetView(VT.BACK) + End Sub + + Private Sub LeftViewBtn_Click(sender As Object, e As RoutedEventArgs) Handles LeftViewBtn.Click + EgtSetView(VT.LEFT) + End Sub + + Private Sub RightViewBtn_Click(sender As Object, e As RoutedEventArgs) Handles RightViewBtn.Click + EgtSetView(VT.RIGHT) End Sub Private Function GetCurrScene() As EgtUILib.Scene diff --git a/Resources/NewIcons/icoBack-3D.png b/Resources/NewIcons/icoBack-3D.png new file mode 100644 index 0000000000000000000000000000000000000000..3d6564075bd29f506b006f324866ef711d292819 GIT binary patch literal 4143 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 M((qQzO^2BO0IejW_5c6? literal 0 HcmV?d00001 diff --git a/Resources/NewIcons/icoBottom-3D.png b/Resources/NewIcons/icoBottom-3D.png new file mode 100644 index 0000000000000000000000000000000000000000..5086c24332ef1a3cf4cfb131b6415e17ce211404 GIT binary patch literal 4156 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 TYo4m5zn_{qR7bT=*(TyYB=nVU literal 0 HcmV?d00001 diff --git a/Resources/NewIcons/icoFront-3D.png b/Resources/NewIcons/icoFront-3D.png new file mode 100644 index 0000000000000000000000000000000000000000..dc61742ce5328a05d01f7d9968e6968bc4252f51 GIT binary patch literal 4122 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 literal 0 HcmV?d00001 diff --git a/Resources/NewIcons/icoLeft-3D.png b/Resources/NewIcons/icoLeft-3D.png new file mode 100644 index 0000000000000000000000000000000000000000..c4476ec97543b115e00a7450d58424848a06f8eb GIT binary patch literal 4133 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 AA^-pY literal 0 HcmV?d00001 diff --git a/Resources/NewIcons/icoRight-3D.png b/Resources/NewIcons/icoRight-3D.png new file mode 100644 index 0000000000000000000000000000000000000000..38585bf74217171b59c456412ad4293839166c52 GIT binary patch literal 4181 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 literal 0 HcmV?d00001 From cba095188e8bbdd7d166efae94429616b5b78888 Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Wed, 12 Feb 2025 17:37:54 +0100 Subject: [PATCH 2/3] Migliorata gestione parcheggi in fase creazione nuovo progetto --- CadCuts/NestPageUC.xaml | 2 +- CadCuts/NestPageUC.xaml.vb | 42 ++++++++++++++++++++++----- DrawImport/DrawPageUC.xaml.vb | 6 ++-- MainWindow.xaml.vb | 4 +-- My Project/AssemblyInfo.vb | 4 +-- OmagCUT.vbproj | 3 ++ Project/CurrentProjectPageUC.xaml.vb | 12 ++++++-- Resources/NewIcons/Park_Busy.png | Bin 0 -> 10397 bytes 8 files changed, 55 insertions(+), 18 deletions(-) create mode 100644 Resources/NewIcons/Park_Busy.png diff --git a/CadCuts/NestPageUC.xaml b/CadCuts/NestPageUC.xaml index ee74b07..d1ee8d6 100644 --- a/CadCuts/NestPageUC.xaml +++ b/CadCuts/NestPageUC.xaml @@ -157,7 +157,7 @@ - + diff --git a/CadCuts/NestPageUC.xaml.vb b/CadCuts/NestPageUC.xaml.vb index ec71902..85f9efd 100644 --- a/CadCuts/NestPageUC.xaml.vb +++ b/CadCuts/NestPageUC.xaml.vb @@ -149,15 +149,24 @@ Public Class NestPageUC UG0.Columns = nColumnIn_UG0 ' Gestione dei comandi di parcheggio e selezione (UniformGrid2) - '... + If GetPrivateProfileInt(S_GENERAL, K_ENABLEDXFPARK, 0, m_MainWindow.GetIniFile) = 0 Then + ParkIndBtn.Visibility = Visibility.Collapsed + UG2.Columns = 2 + End If End Sub + Dim ImageConverter As New ImageSourceConverter + Private Sub NestPage_Loaded(sender As Object, e As RoutedEventArgs) m_bActive = True LoadParams() - Dim ListparkInd As New List(Of ParkInd) - SelParkIndWD.LoadParkInd(ListparkInd) - If ListparkInd.Count > 2 Then ParkIndBtn.IsChecked = True + Dim nCpuntParkInd As Integer = UpdateImageParkInd() + If nCpuntParkInd > 2 Then + If GetPrivateProfileInt(S_GENERAL, K_ENABLEDXFPARK, 0, m_MainWindow.GetIniFile) = 0 Then + EgtOutLog("ATTENZIONE: Attivare gestione parcheggio per progetti DXF e riavviare il programma") + End If + ParkIndBtn.IsChecked = True + End If ParkIndBtn_Click() EgtZoom(ZM.ALL) End Sub @@ -2810,9 +2819,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then ' Aggiorno vista EgtZoom(ZM.ALL) ' Aggiorno la lista dei parcheggi - If ParkIndBtn.IsChecked Then - m_SelParkInd.UpdateList() - End If + ReloadListParkInd() End Sub ' ripulisco la lista dei pezzi in parcheggio @@ -2985,8 +2992,28 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then If ParkIndBtn.IsChecked Then m_SelParkInd.UpdateList() End If + UpdateImageParkInd() End Sub + ' Aggiorna immagine e restituisce il numero di parcheggi (+1) disponibili (+1 perchè conto anche il comando All_Off) + Private Function UpdateImageParkInd() As Integer + Dim nCount As Integer = 0 + ' Se il comando è abilitato allora provvedo ad aggiornare l'immagine + If GetPrivateProfileInt(S_GENERAL, K_ENABLEDXFPARK, 0, m_MainWindow.GetIniFile) <> 0 Then + Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\Parking.png" + Dim ListparkInd As New List(Of ParkInd) + SelParkIndWD.LoadParkInd(ListparkInd) + If ListparkInd.Count > 1 Then + s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\Park_Busy.png" + Else + s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\Park_Empty.png" + End If + ParkIndImg.Source = ImageConverter.ConvertFromString(s) + nCount = ListparkInd.Count + End If + Return nCount + End Function + Private Sub DeleteBridgeAssociated(nMyId As Integer) ' verifico se esistono dei ponticelli associati al pezzo indicato ' recuoero il gruppo di lavorazione corrente @@ -3130,6 +3157,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then If Not IsNothing(m_SelParkInd) Then m_SelParkInd.UpdateList() End If + UpdateImageParkInd() End Sub diff --git a/DrawImport/DrawPageUC.xaml.vb b/DrawImport/DrawPageUC.xaml.vb index ddbfb50..1dbdd44 100644 --- a/DrawImport/DrawPageUC.xaml.vb +++ b/DrawImport/DrawPageUC.xaml.vb @@ -1174,10 +1174,6 @@ Public Class DrawPageUC If m_ActiveComponentPage = Pages.CompoDimension And m_bInternalCompo Then Return ' Se errore esco If Not m_bDrawOk Then Return - - ' Attivo il parcheggio dei pezzi Draw (per il corretto posizionamento nella scena) - ActivateParkIndZero() - ' Nome pezzo Dim sPartName As String = PartNameTxBx.Text ' Leggo numero di pezzi da inserire @@ -1189,6 +1185,8 @@ Public Class DrawPageUC Else MakeMultipleInsert(InsNbr, sPartName) End If + ' Attivo il parcheggio dei pezzi Draw (per il corretto posizionamento nella scena) + ActivateParkIndZero() Dim bExitPage As Boolean = GetPrivateProfileInt(S_GENERAL, K_QUITDRAWPAGE, 1, m_MainWindow.GetIniFile) <> 0 ' Se Shift premuto eseguo il contrario If Keyboard.Modifiers And ModifierKeys.Shift Then diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index 51889ba..f6145d8 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -345,8 +345,8 @@ Class MainWindow ' Verifico abilitazione nesting automatico m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey) ' Recupero opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(9423, 2701, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 2701, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 2702, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 2702, 1, m_nKeyOptions) ' Verifico abilitazione prodotto Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE) ' Impostazione per programma OnlyFrame: solo se CUT_BASE non attivo diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index a9ad02d..dc0a784 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -62,5 +62,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OmagCUT.vbproj b/OmagCUT.vbproj index 2b02cd0..0b2d503 100644 --- a/OmagCUT.vbproj +++ b/OmagCUT.vbproj @@ -1396,6 +1396,9 @@ + + + IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe diff --git a/Project/CurrentProjectPageUC.xaml.vb b/Project/CurrentProjectPageUC.xaml.vb index 00201c1..898ed47 100644 --- a/Project/CurrentProjectPageUC.xaml.vb +++ b/Project/CurrentProjectPageUC.xaml.vb @@ -436,21 +436,29 @@ Public Class CurrentProjectPageUC ' prima di parcheggiare svuoto dei pezzi in parcheggio sia vuota m_MainWindow.m_CadCutPageUC.m_NestPage.ResetListOfGruopInPark() ' Parcheggio correttamente i pezzi precedentemente salvati + Dim nIdList As New List(Of Integer) + Dim nStatList As New List(Of Integer) Dim nId2 As Integer = EgtGetFirstPart() While nId2 <> GDB_ID.NULL + ' Forzo lo stato per avere il giusto calcolo delle posizioni per evitare sovrapposizioni + EgtSetStatus(nId2, GDB_ST.ON_) ' Inserisco correttamente in parcheggio m_MainWindow.m_CadCutPageUC.m_NestPage.StoreOnePart(nId2, True) ' Aggiorno lo stato di visualizzazione Dim nInfoStatus As Integer = 1 ' Salvo lo stato (per gestire la navigazione) EgtGetInfo(nId2, INFO_PARKSTATUS, nInfoStatus) - ' Imposto lo stato - EgtSetStatus(nId2, nInfoStatus) + ' Salvo l'Id e lo stato da impostare successivamente al posizionamento + nIdList.Add(nId2) + nStatList.Add(nInfoStatus) ' Notifica a WeinMatching per modifica Id VeinMatching.UpdatePart(nId2) ' Passo al pezzo successivo nId2 = EgtGetNextPart(nId2) End While + For IndIndex As Integer = 0 To nIdList.Count - 1 + EgtSetStatus(nIdList(IndIndex), nStatList(IndIndex)) + Next ' Aggiorno Aree totale e da lavorare dei pezzi SetTotalArea(dTotArea) UpdateToProduceArea() diff --git a/Resources/NewIcons/Park_Busy.png b/Resources/NewIcons/Park_Busy.png new file mode 100644 index 0000000000000000000000000000000000000000..a4bf19ccfdad5fc708f73db9ccf1099b85e69c35 GIT binary patch literal 10397 zcmeHtbyOSew=NWywooYUPKzWsDemrGpac>iSbzjCQlLn2FIK!b6e}*pDHMkyE!N@` zmjVS&=qJB();(+8_5E}IxnHs-nRm~#pLg$P?{`*aCgEBdig)p;@X^rF?kX$E>7c%a zQ5yp;HtO>|?h+IY4Lt}ZE32g}E6d>Q3b%$ipiCSiNpa#zT~ZVwi*M};^k{Y%R$_BN zvpugwk{^+Mkbym}-Li1qq!)lG>6p@BeGUwgjL^p+w=ttN#gg8~={9rLLB>63SH+-}k1SL+bVFt~(=y)Qv-8 zF0YNaJgUC*lvx&a^LG==PjNi!Z!U9QSSg#PDnn>qcWP-r9dOND6NxvH!H0##j!8Wf zGzuFpiL+#qy$q+j2KHsKrKnXrq7Wt13dJ8d2)g;Ow~$saQ=3kzf_BCG{tAeW>Hflf z;(dFJW3%s_pII*+e>(d7wBrl=rn+VX4SLsnM^9bhfKSKjJ-|i2YRGpbzciU*%$BS% z;fDcnPZ=84PRnazCU6)OTTR-~@7;Sbzz3~7^E|WgSiBaS*j&6H^w_mLoSjMlRTVsE zC1V5{8o}M$4gCjB2NxO|d78JL5mE>2@mGx)kY3JE2B;^@8V${J?o&FOUo7>gZ#XQ=2&LLL|HOJX@)afsU zgU>(DyQEIVL{j6#=s!!XQuWUsg*0Lp*%*V8GZuJrJ{@`bUcY_;XO(>J_vVzooxM!> z&Y8=!hE2v=A>vxCW57eJ;;?&PcOls(dEK;Ib8knG0^18(*w@|}nXER|-m)?9IL2n} zWP2;GzNMANg+7voK8E+1A=`7$F7aKftQGcWBRfaioM~Rx#~&^ZTc`W&D^vCL=z(r6 zWNy4r$!|@)+~22-fptYBi!T_*uOB^!<~EVw%X)nMx%HMJLNfWl`n6qh>Sa~>FllS% zN47Uc^X2or)+r8EzCPoFDaJyLDU*|T zNN=R7^MN9h{=KF7^sB1W5Kj$1S4ukIHlN)Lc3Zo|HAy>2jH3HvJQG&edww~BwYzv< z+-tvec6=Lb_>sb zEI(J`yVRlP;(ct6Gqf+~JjVK5*R;oY0cVB%T#ayQDeyjHcdX1k*2#_B7{=b$xdE2y zJYGpMuQ&@bR7z%{S+dchs~M^lJ!CkxArDj^H74pjJ}ZkfJx8tvnxs2coRjHAaMyiN zDb3v9Yzw9H*=kHN52bYqpl6O2IONFF;KwW2w0Z6FHq|E8jo5Cmc-7Fzr69@B_++_m zu-yOoRfqlBVcOR>@dOiH_AP1S;=#lscq{xg3J-yvV&Me1wvQzyW$U=j`pX{wEm^K3|O@{4ahaeGW;?X%ly^)`~2l zo$b5iH%u=jZI+~)vVs3PK4=%wDoqPkD{kcO+vNujrRmVBV)p}gU)aIa=^SB!^;JWqEOn%C+X2!LyCC!h|Zja|o&2;FRI69y5h{d1iOg`8g^t4X5960+ z8Go(jUF-&~_bDH5R%7sOOhI$Tg2~=jF+SubTI3V{L66`+8FCEes3B;u)MwjzkKtVf z!E28uIsa&=^zG5y`$qEDIQOU5NgJ{YevE(-Zydc_`{ppVnPvx!8eF0`$vpMSD-k9Y zME6hDUa<a#paIn3vp<$n_1~oQ&Cs=lC~mz z*)nzR4F&U5q^7!@cbSyj>a2|i{^Ar-FGX7-I+!nfE^fV_gJjvP2mHO-6W{o$@k&W3 zP#xajSFuT;algDoTk393i3K{e12V{@u+M2Jn!QfJJQNDVEHr{W)CIJ167)kKO;CCE z@+O3>(qW3F2)YzIjsfkzexzV9+T3>)x7Xy(e<3Om_bJkO)5SmEllQ?0Qv>cqnD#42 zJp%L!$5LaOWr_OqEQwZ070(0kLzdo4k1=jfhu&~{qFG#OtT{c%q zodM&RBLlv31dMREp4bv7d&)5!FXO;3x4?SPO8LSq z=!?8`l}Wkp{V_5^yIH!RHwiieM7W=Vn^;V2gsOkOwj=CjW3m0PaHobLyiX@uGmw@o zZa5@kBTxXO4j4q=%B1J?u#*ug-`%HvteOPMG2_z-kuAe$H*p_E@gVmihF)wJ(V`YDXg`%PY1gvF>ix6jGYWGVrlmDrt6}_ zVcq}7g@^HRKOOg{vgRy?1*(^Ymj&rsymQl>Qu)O_yB-bj29nB2C%aF+DJmi%KIY#(Ideqw9%@Bv0rrYD0Oo1SH-S{_6cBo=Z$ zGm^W=U1l&FuALxKE{hb%G2Mp4H$ag6vpoFNw5dElICAr=SiZ=dE(T&DL%f^iJdaFj z=&l35OTy5uY$qbV}+%bk>s@ zED{#P4myA(%CyxUG=C%gZ4?_E(c@0fC%16iOBTCguNif>s)tG^CSk17g_ zhGp(lM@)@2c1T~Pw(I1M-4o9e_>4;mmX;ekL3UMw`w8+;-dp4%w#B*ImQua8_3`={ zt=WdmzM`onht9mkT4+ykV}b0wFzi+qwY&|3p9k9EJj#(c>8hL3i}t!D|AYvxXc1*)`vAi<0+lG)d5cIE$k1KhijzlI$`%aB9!Ft z>ASXc82NY}$O0-FN5|f&+NJ0=z14Q$+X&8Za}(;f4p7XhVrz+4t?R})7cgR~+9nWo za{3;9vGJgtZ#~DGJ%UTaje_kVdH-qk)@yYtW>ItyG>-iphKn6C&34(Hkfmu<`+=6m zG>IbJ(3jqu@yEHrA;%s?gS{_9I(Ogv+`*kSGS!*HLehY;xaw*!hB0QtSk*$p$-<}_ zma|CtWTnx6Sry59DOUC*;PX*XnyZ<9w$L!ajDK@yj>zI%BqI})z#)@#$b&&hS+CZD z?Up(giscEI%y=QMJt3vZov6|+ye2_5IH=ls$C!zXnhhkpUQH5FY)<8D9qd225S<;| zz9qK%u+2hF79Tt#N>2HTreGiORLk0lZ>|<(R>Ei`LgdLA#n_Rk;IJ!@y33Nn7Z+`- z5gN-qaKz}+90}4UvvLb>P?yi;3Mb5V0@--P=J*ZRCv#C#DI1u|#NK=Q3UI+A6`!O> zguLMd$ZlyZ2x1;&9WBSW$QP5ohy! zO0cY7L)4Zsh8RWLq)ga#EsbesA9_c_y}9RwHy*dMu`Rc9y^t%w#Y5NSr{|yQ5OB_l z9pk)fU-c;0adRkz9niw@ygqy2yOP*h5=88a)CP?zrGhus6N5>Qq}^7Nh zE&3i_v~=(5-MuB-NtmOC^TsC~>p)2`^Gf&6aGV`XkKTOmgsJ%XyE%aw0n8QVt=%DR zl&nduq<&&XA!r=AjwWDceKKi5I~~816)U}GkKELgUILg>en!uMsh)I0IIACU3GKD$ zR`{dg4p3I_@`U4b&|_&^ONly|EmC^ec4uCZM@dP#oM!x(j znk+uKZfigZ=xGYk2vc1npx3&pe|njNxZIMzI+R1^wRQpriGp2ChgBajI++0hXZ-sj zkB7e1ZJTsIK2=PtkWNn&c+oJHU*gNV-XF8)%sYA;%4Gv{@A6-HPnE{6f{59;%6&46 ztJJ!8tc-Iy7LZh>LEwHSed7@HsDz%F#hS&oXq40||GfAO>BwY0*i>VnSSR0C(VB6n zJGuwS*(zf_DQ*lOfgHVYXzUA>RqApz`{skMPWs%g%q<4qmslQ;8{SVV;ZVR#D99D> zY*5{%O!8Kdqb4ElltL|$$?cEsCh4&~1|Q{)5*z z{S#Q{F9$vdug>fN4e1TD?kVYnkq*r8 z*RBY1DuB&sc2fE{8?k3Lx>oKKTOCy!I5#GAN+n2Mb5?i;|EcY&`egGHWm=xxw&K-b zskqwhUc2B>&eO@4y8YnMg~1=f2D<%mzvw9EHTbh+G%$M#Y;_qF zI7BMAkCI4@)JgyB)$`#W9bgImxg;ohReL>Sf?(f1tAG=~muG8E(20ME9W3V1bVfTd z>@`a?L(Z4y-EraAAnT{F*=!^FZPQs1GwE2NC4+}SGWG6RQh7@a`>cSr$0KFJLS6i@ zbR4{)LcDEZEInt!j6k49jKNw&@h}-L%q*Ym1b*2tQ2emBUNGvJMqb*NHtMPO=22Tq zfydrcrOAh1wc8lj3J5HR+jjI#CG`wWz*Kwq+a8y3pPjy=LraH99{F>W-M96Bu>eqWXL+|1O(Gs+PWAc;~^oT!Rog*;Y)(_^9iv;(f7ZO7cVG1v-wubz*5a72qL~%nLB8XASwF0rNFm)su+h7W1|Q|D z^u70HysUY6sHJO!T3nb6zJatUekNUL`D&z}v%!mL3r{2_?+T<I-8`8|PwxW^?}B2&>@LFvMF*9lD89(p$haYe%49jc)h z7!@~aCj)+grR{d##m-#vIbA%*NPK zx1liTPrtbAQS|WFa!=J}!gx?U6@--YorzLQp0Xej9M*0g7%*79tAoe9mq{43{=If~ z?}>>~ZrQ;n;=pykDL48$IMPl2w0!B=syfEUI0XjNU+w}+WQIR~*mjhcm4)Fa^#tSw z|5DulMd@C0iid2I9j5N2M{Ao9atP7tD(IWc!98OUf`Le1D4Q0hw|&uHG+T`%o1HmF z7li_UNUf7Nt6al3zI4nU`s^48d)}ZmL%Gi-J~RLf(p}M@I}<;#$~LaR8t81L63658a@_KJcUDVJ%%+%K0qy2tjZ&D>|UA30a{fz`*D zl7;EdYSgjpRN}Ak>sei5bF=7OF9#@v3)&slXub=uprcD&P?LDuwhrX%?Gm$B7?C^v zFm@Af6&3e>z$rA)dX{~S^VVl}obCx+x9L=U8{ZC|vF0a16}>5-vgVM{>n`M#*LXL$vxaf>P6jl=I8L|npYUh5lje3 zolWI}FlQpE(s@{I!Z6HoXEx@JjQL&IQ**z0qBjjMW-C8w?*q>hGqfy~sZa0Y zzSRN}C?nXhpO2ULjGAh&e#0s12f+4@o$D_HVu!?Od~3HYdv-(zPrH3&N+hr<+eIXW z=F(|&D^F(TX`ihXOQsu*$ME1`5AaXj>E=<2ogD4Y*(#$MSO0{LU;QJ*l%<0`_+FL` z?ndHOhIbktd^x|u6V#d(B$TAhh|~O0AUwH1l>m_?QbNJt3A{R#jdtzU_(B+*#j!>q z&96iBu14saMsaI*1P%Figg$mNL;O>kpF%roKegYRkzuU#87pXiFx-@K-{KeD%PwM} z6s-9?GO?^LRMf5%%3E`-;e9e+)}CN~)>?%Fb9ZEUFaTH{_N683T*Mq?RLV<)-^(VIzP)iq(JOW$873%=>t&xvOX z(Pk8^ZnY4)Yp%R!oTON(>N~yDWIxD*uk+Mh8!fL(|LOkADY$=6uEfnzasqRfVfDJq zTZwYWYg+TPIP%_+siq7X3SAAqrIl9R>afLymGSjGd4^90`SCP^mE~SfDka;Hl+Bj+ zNw#9YZbq_$n13Q7(G5fK@5RR3zI&Tb!bZEs^T{$jSZ9DZ9(24dX=$|DtzFC>y}O}z zxYEql{p<5W`Nd4jRh!4)ZR6^zebq4B241MWi;11o7k8QpPR=I>Hf zzN{g1Fr%#JIdNRg)gwq#j_h)!j@{_I=gda&@~9OJ4LS`+8mZv+L!Zee64`M(wtvn) zBlNib$bRD|a^mORPN{L#IOk8TAzn#lR@*i=+Y~Llg~*uE+WjiJth5y% z*)2BgHh1YzHmFl(&zf*X|7frMS$BQWqZ=}nEqUzcLBo|FjD4erC4KbHQ!sw{Q{h^D zXqmb}Uz&pgKU^Sr%#wQ}T9&>UwMFS$W%Ai9(npCGO&jd4f<3j!-0+ z!PC*f2?6pHXZlSHLhaw0d6^h~Ly-33Oh)Qj46<-nD1!ix01tp$-V^4|$Alum6LW=F zgLLE+{^UT7#F=c7NM{f)uZM>Rj|V>w+|`B`C@Lz-3*h7BNy9m4io`*bG3rXyF;Cj%zwE)=+CJer{0_fB?4upD2)91Ym8+EePZn zwT3_;B78vpzj&0L5J<3-74((|#moakk?;us01%*%Ft-)ID1=+UQbdSb6aW$C1`F_6 z1NebJD8Hb%IOk02NV782#N;xp8&TAP{>-; z3IMhQgMmy85G#-Z+|?0`DjCcXYy;(WcCuk&xK$P;t)(o^#K!~pbExG2Mp~nwsOE+_ zLEs*UKka%jN2o3md@CJLm|sW`AR;0n$j>hT4rv#F9g@TcAS3Nk~L7eF}3Wi&sKaQ!RRt5x&1j~VuP!tz{PY?tEf`9-$ zARmZd03^Wo7&Qd^1%^Xl)?WWN=Sf52e>YkdW+AeN{?fJLEDZULyED7U2$L zDDC*IM1ewr;J^G4aBHLo*cB>mgHj452&&b73&OzhXAL<2LVDOjZv{q)!VLg&|3?%- zCf>gi;=Ntle`h4d`+sIF_8aowP6xNHe;83G8q@&g^w+5iHDdUG@cMU>eJM)SWjSd*BgG%nsv2DYBJ8D9mnNsrN=nPv;xaYX zx*Ae3XzT&h$GC~q$gU=u7t~sK;oP%*Z@|(_1+q^?dt6|vny*MTTlV)99|Z7+H0@`# zJU3Tq_Vqm&gSBLW`tpMWn=p@eDJCi`?k)!86Rfkme4=me^Eo9f65XO?n=U!*=QPg_ z$fIrju1rNnm|A(=V{5uCn@hmas7dpKxG3dWGRvpj`0HOP(Jvmvr6QaPw*4PEtlB}F z#|TZ#5X1xXS7;XHbJD^03RmR>h~tQVIef?n+ud>$8PAm6enNwWMq#xZ1?;f^G+3_5 zCqvI)@V?Q=4Yp^_UB57Ze_F~7EtMo^V4_~Hxv$*`JSqCU(iWd`ZSi zL;MMC=|!0JP|HwtnN;_YktiC+JL|~CF@I*?@Q1q`It{v09u0#0?OTi0MlvCf)8R%K z#N@rNJHKJ^iB4mB634md>pyc1C@EPu>1I)mXHl+R6b5BZP9ooT=iFWkE6Z!hRmfNb F{uki!6;1#E literal 0 HcmV?d00001 From bdcdcaecf099b478a8ad895c6b4e90ac1a887fea Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Wed, 12 Feb 2025 17:51:09 +0100 Subject: [PATCH 3/3] Gestione sfondo dinamico PopUp viste --- Project/SceneButtonsUC.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project/SceneButtonsUC.xaml b/Project/SceneButtonsUC.xaml index 2d1e9c3..921f6d2 100644 --- a/Project/SceneButtonsUC.xaml +++ b/Project/SceneButtonsUC.xaml @@ -47,8 +47,8 @@ Placement="Bottom" PlacementTarget="{Binding ElementName=TopViewBtn}"> + Width="78" + Background="{DynamicResource OmagCut_Gray}">