Gestione ricerca progetti

CadCuts/SplitPageUC.xaml.vb

@@ -35,6 +35,7 @@ Public Class SplitPageUC
    Private m_nIdSelectedWaterJet_End As Integer = GDB_ID.NULL
    ' Id gruppo Bridges (Nuovo da versione 30/08/2022)
    Private m_nIdBridgesGroup As Integer = GDB_ID.NULL
+   Private m_nIdBridgeLineGroup As Integer = GDB_ID.NULL
    Private m_nIdBridge As Integer = GDB_ID.NULL
    Private m_ptSrtBridge As New Point3d
    Private m_ptEndBridge As New Point3d
@@ -86,7 +87,6 @@ Public Class SplitPageUC
       AutoBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 18)         ' Auto
       RestartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 19)      ' Restart
       BridgesWJBtn.ToolTip = "Bridges"
-      BridgesDeleteWJBtn.ToolTip = "Remove bridges"
    End Sub
 
    Private Sub SplitPageUC_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded
@@ -251,6 +251,9 @@ Public Class SplitPageUC
                ' se non esiste almeno 1 Preview di tipo WaterJet
                If ListGroup.Count > 0 Then
                   m_nIdSelectedSideWJ = nIdMy
+                  ' Ricalcolo tutte le lavorazioni
+                  Dim nWarn As Integer = 0
+                  ResetAllMachinings(nWarn)
                   ' recupero l'indice del PreView che deve essere acceso per indicare la selezione
                   ListGroup = m_MainWindow.m_CadCutPageUC.m_NestPage.ResearchGropuWJ(nIdParent, nIdPV)
                   Dim nIdWJ As Integer = m_MainWindow.m_CadCutPageUC.m_NestPage.GetPVIdFromIdSide(ListGroup, nIdMy)
@@ -264,12 +267,9 @@ Public Class SplitPageUC
                      EgtModifyCurveEndPoint(m_nIdBridge, m_ptEndBridge, GDB_RT.GLOB)
                      If VerifyInterference(m_nIdBridge) Then
                         m_CurrProjPage.ClearMessage()
-                        EgtSetInfo(m_nIdBridge, "PartStart", m_nIdSelectedPartWJ_Srt)
-                        EgtSetInfo(m_nIdBridge, "PartEnd", m_nIdSelectedPartWJ_End)
-                        EgtSetInfo(m_nIdBridge, "Ph", EgtGetCurrPhase())
-                        ' Ricalcolo tutte le lavorazioni
-                        Dim nWarn As Integer = 0
-                        ResetAllMachinings(nWarn)
+                        ' salvo nel Gruppo "BridgeLine" gli dei pezzi che sono collegati
+                        EgtSetInfo(EgtGetParent(m_nIdBridge), "PartStart", m_nIdSelectedPartWJ_Srt)
+                        EgtSetInfo(EgtGetParent(m_nIdBridge), "PartEnd", m_nIdSelectedPartWJ_End)
                      Else
                         ' attendo la selezione di un punto valido
                         m_nIdSelectedSideWJ = GDB_ID.NULL
@@ -306,19 +306,13 @@ Public Class SplitPageUC
       Dim nIdMy As Integer = EgtGetFirstObjInSelWin()
       While nIdMy <> GDB_ID.NULL
          Dim sGroupName As String = String.Empty
-         Dim sSelName As String = String.Empty
          ' gruppo di appartenenza
          Dim nIdParent As Integer = EgtGetParent(nIdMy)
-         ' recupero il nome del gruppo di appartenenza
+         ' recupero il nome del Layer
          EgtGetName(nIdParent, sGroupName)
-         ' recupero il nome dell'oggetto selezionato
-         EgtGetName(nIdMy, sSelName)
-         If sGroupName.Contains(BRIDGES) AndAlso sSelName.Contains(BRIDGELINE) Then
-            EgtErase(nIdMy)
+         If sGroupName.Contains(BRIDGELINE) Then
+            EgtErase(nIdParent)
             EgtDraw()
-            ' Ricalcolo tutte le lavorazioni
-            Dim nWarn As Integer = 0
-            ResetAllMachinings(nWarn)
             Return
          End If
          nIdMy = EgtGetNextObjInSelWin()
@@ -329,9 +323,9 @@ Public Class SplitPageUC
       ptCurr.z = m_ptSrtBridge.z
       ' rappresento il egmento
       If m_nIdBridge = GDB_ID.NULL Then
-         m_nIdBridge = EgtCreateLine(m_nIdBridgesGroup, m_ptSrtBridge, ptCurr, GDB_RT.GLOB)
-         ' assegno un nome alla linea
-         EgtSetName(m_nIdBridge, BRIDGELINE)
+         m_nIdBridgeLineGroup = EgtCreateGroup(m_nIdBridgesGroup)
+         EgtSetName(m_nIdBridgeLineGroup, BRIDGELINE)
+         m_nIdBridge = EgtCreateLine(m_nIdBridgeLineGroup, m_ptSrtBridge, ptCurr, GDB_RT.GLOB)
       End If
       EgtModifyCurveEndPoint(m_nIdBridge, ptCurr, GDB_RT.GLOB)
       EgtDraw()
@@ -1945,8 +1939,6 @@ Public Class SplitPageUC
       ModifEndBtn.IsEnabled = Not m_bShow
       InvertBtn.IsEnabled = Not m_bShow
       PauseBtn.IsEnabled = Not m_bShow And m_MainWindow.m_CurrentMachine.bEnablePause
-      BridgesWJBtn.IsEnabled = Not m_bShow
-      BridgesDeleteWJBtn.IsEnabled = Not m_bShow
 
       ' nascondo i comandi che non devono essere visualizzati in funzione delle lavorazioni attive
       If m_nCountSawing = 0 And (m_nCountWaterjetting > 0 Or m_nCountOtherMachining) Then

Constants/ConstIni.vb

@@ -170,14 +170,6 @@ Module ConstIni
    Public Const K_CSVCURRDIR As String = "CurrDir"
    Public Const K_CSVLASTFILE As String = "LastFile"
 
-   Public Const S_TRF As String = "TRF"
-   Public Const K_ORDCODE As String = "OrdCode"
-   Public Const K_ORDDESC As String = "OrdDesc"
-   Public Const K_PARTCODE As String = "PartCode"
-   Public Const K_MATCODE As String = "MatCode"
-   Public Const K_SURFCODE As String = "SurfCode"
-   Public Const K_TRFTHICKNESS As String = "TrfThickness"
-
    Public Const S_SLABDXF As String = "SlabDxf"
    Public Const K_IMPORTSLABDXF As String = "ImportSlabDxf"
    Public Const K_SLABLAYER As String = "SlabLayer"

DrawImport/CompoTrfData.xaml.vb

@@ -24,7 +24,6 @@ Public Class CompoTrfData
 
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
       DialogResult = True
-      SaveData()
       Close()
    End Sub
 
@@ -33,30 +32,7 @@ Public Class CompoTrfData
       Close()
    End Sub
 
-   Private Sub SaveData()
-      WritePrivateProfileString(S_TRF, K_ORDCODE, OrdCodeTxBx.Text, m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_TRF, K_ORDDESC, OrdDescTxBx.Text, m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_TRF, K_PARTCODE, PartCodeTxBx.Text, m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_TRF, K_MATCODE, MatCodeTxBx.Text, m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_TRF, K_SURFCODE, SurfCodeTxBx.Text, m_MainWindow.GetIniFile())
-      ' prima di salvare lo spessore converto in mm e poi di nuovo in stringa
-      Dim dVal As Double = 0
-      StringToLen(ThicknessTxBx.Text, dVal)
-      WritePrivateProfileString(S_TRF, K_TRFTHICKNESS, DoubleToString(dVal, 4), m_MainWindow.GetIniFile())
-   End Sub
-
    Friend Sub SetData(sOrdCode As String, sOrdDesc As String, sPartCode As String, sMatCode As String, sSurfCode As String, dTh As Double)
-      ' se verifico che non sono stati iniziliazzti i campi allora provvedo a leggere il file ini del programma
-      If sOrdCode = "" And sOrdDesc = "" And sPartCode = "" And sMatCode = "" And sSurfCode = "" Then
-         GetPrivateProfileString(S_TRF, K_ORDCODE, sOrdCode, sOrdCode, m_MainWindow.GetIniFile())
-         GetPrivateProfileString(S_TRF, K_ORDDESC, sOrdDesc, sOrdDesc, m_MainWindow.GetIniFile())
-         GetPrivateProfileString(S_TRF, K_PARTCODE, sPartCode, sPartCode, m_MainWindow.GetIniFile())
-         GetPrivateProfileString(S_TRF, K_MATCODE, sMatCode, sMatCode, m_MainWindow.GetIniFile())
-         GetPrivateProfileString(S_TRF, K_SURFCODE, sSurfCode, sSurfCode, m_MainWindow.GetIniFile())
-         ' recupero il dato dello spessore che deve essere in mm
-         dTh = GetPrivateProfileDouble(S_TRF, K_TRFTHICKNESS, dTh, m_MainWindow.GetIniFile())
-      End If
-      ' inizializzo i campi della finestra
       OrdCodeTxBx.Text = sOrdCode
       OrdDescTxBx.Text = sOrdDesc
       PartCodeTxBx.Text = sPartCode

DrawImport/DrawPageUC.xaml.vb

@@ -1173,10 +1173,8 @@ Public Class DrawPageUC
    Private Sub TrfDataBtn_Click(sender As Object, e As RoutedEventArgs) Handles TrfDataBtn.Click
       If m_bTrfData Then
          Dim DlgTrfData As New CompoTrfData(m_MainWindow)
-         ' carico i dati appena salvati nella pagina
          DlgTrfData.SetData(m_TrfOrderCode, m_TrfOrderDesc, m_TrfPartCode, m_TrfMatCode, m_TrfSurfCode, m_TrfThickness)
          If DlgTrfData.ShowDialog() Then
-            ' recupero i dati salvati nella pagina
             DlgTrfData.GetData(m_TrfOrderCode, m_TrfOrderDesc, m_TrfPartCode, m_TrfMatCode, m_TrfSurfCode, m_TrfThickness)
          End If
       ElseIf m_bCsvData Then

DrawImport/ImportPageUC.xaml

@@ -49,15 +49,28 @@
             <Grid.RowDefinitions>
                <RowDefinition Height="0.5*"/>
                <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="8*"/>
+               <RowDefinition Height="7.25*"/>
+               <RowDefinition Height="0.75*"/>
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
             <TextBlock Name="FilePathTxBl" Foreground="White" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             <ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" ItemTemplate="{DynamicResource DataTemplateItem}"
-                ItemsSource="{Binding ItemList}"/>
+                     ItemsSource="{Binding ItemList}"/>
 
-            <Border Name="MessageBrd" Grid.Row="4" BorderThickness="0,1,0,0" BorderBrush="Gray">
+                <Grid Grid.Row="3" Margin="0,0,8,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="4*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+                    <EgtWPFLib:EgtTextBox Name="FindTxBx" Grid.Column="0"
+                               Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}"/>
+                    <Button Name="ClearFindBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" Margin="0,6,2,6">
+                        <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}" Width="30" />
+                    </Button>
+                </Grid> 
+            
+            <Border Name="MessageBrd" Grid.Row="5" BorderThickness="0,1,0,0" BorderBrush="Gray">
                <TextBlock Name="MessageTxBx" TextAlignment="Center"
                    Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Border>

DrawImport/ImportPageUC.xaml.vb

@@ -297,6 +297,36 @@ Public Class ImportPageUC
       End Select
    End Sub
 
+   Private Sub FindTxBx_EgtClosed(sender As Object, e As EventArgs) Handles FindTxBx.EgtClosed
+      ' Elimino spazi iniziali e finali
+      FindTxBx.Text = FindTxBx.Text.Trim()
+      ' ricarico la lista dei file
+      LoadCurrDir()
+      Dim UpdateListFile As New List(Of IconListBoxItem)
+      ' Se esiste un nome
+      If Not String.IsNullOrWhiteSpace(FindTxBx.Text) Then
+         For Each Item As IconListBoxItem In FileListBox.ItemsSource
+            If Item.Name.ToLower.Contains(FindTxBx.Text.ToLower) Then
+               UpdateListFile.Add(Item)
+            End If
+         Next
+      End If
+      If UpdateListFile.Count > 0 Then
+         FileListBox.ItemsSource = UpdateListFile
+      Else
+         FileListBox.ItemsSource = m_MainWindow.m_ImportItemList
+      End If
+   End Sub
+
+   Private Sub ClearFindBtn_Click() Handles ClearFindBtn.Click
+      ' svuoto la text
+      FindTxBx.Text = ""
+      ' ricarico la lista dei file
+      LoadCurrDir()
+      ' e aggiorno la lista dei file
+      FileListBox.ItemsSource = m_MainWindow.m_ImportItemList
+   End Sub
+
    Private Function ClearView() As Boolean
       ' Pulisco il DB geometrico locale
       EgtNewFile()
@@ -809,7 +839,7 @@ Public Class ImportPageUC
          PartId = EgtGetNextPart(PartId)
       End While
 
-      ' identificativo univoico del gruppo di pezzi, se più di un "Repeat"
+      ' identificativo univoico del gruppo di pezzi, se più di un pezzo
       Dim sGUICode As New List(Of String)
 
       ' Scrivo testi per nesting
@@ -851,7 +881,6 @@ Public Class ImportPageUC
          EgtInsertFile(sTmpFile)
 
          Dim FirstOfImport As Integer = EgtGetNextPart(nFirst2Id)
-         If FirstOfImport = GDB_ID.NULL Then FirstOfImport = EgtGetFirstPart()
          Dim Index As Integer = 1
          While FirstOfImport <> GDB_ID.NULL And Index <= sGUICode.Count
             If Not String.IsNullOrEmpty(sGUICode(Index - 1)) Then
@@ -888,7 +917,6 @@ Public Class ImportPageUC
          ' Passo al pezzo successivo
          nId = EgtGetNextPart(nId)
       End While
-
       ' Ciclo sui pezzi inseriti
       nId = nFirstId
       While nId <> GDB_ID.NULL

My Project/AssemblyInfo.vb

@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.9.2")>
-<Assembly: AssemblyFileVersion("2.4.9.2")>
+<Assembly: AssemblyVersion("2.4.7.1")>
+<Assembly: AssemblyFileVersion("2.4.7.1")>

Project/OpenPageUC.xaml

@@ -2,7 +2,8 @@
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"          
    mc:Ignorable="d" 
    d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="OpenPage_Initialized" Loaded="OpenPage_Loaded" Unloaded="OpenPage_Unloaded">
       
@@ -17,22 +18,42 @@
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="8*"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
+                <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
          
-         <!-- Definizione della Grid Inferiore per i Button V e X -->
+         <!-- Definizione della Grid Superiore -->
          <Grid Name="UpperButtonsGrid" Grid.Column="1" Grid.RowSpan="2">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="5*"/>
                <ColumnDefinition Width="7*"/>
             </Grid.ColumnDefinitions>
-            
+       
          </Grid>
 
-         <TextBlock Name="FilePathTxBl" Foreground="White" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
-         <ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" ItemTemplate="{DynamicResource DataTemplateItem}"
-            ItemsSource="{Binding ItemList}"/>
-         
+         <TextBlock Name="FilePathTxBl" Grid.Row="0" Foreground="White" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            
+          <Grid Grid.Row="1" Grid.RowSpan="2">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="6.5*"/>
+                    <RowDefinition Height="0.65*"/>
+                </Grid.RowDefinitions>
+                <ListBox Name="FileListBox"  ItemTemplate="{DynamicResource DataTemplateItem}"
+                  ItemsSource="{Binding ItemList}"/>
+
+                <Grid Grid.Row="1" Margin="0,0,8,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="4*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+                    <EgtWPFLib:EgtTextBox Name="FindTxBx" Grid.Column="0"
+                               Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}"/>
+                    <Button Name="ClearFindBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" Margin="0,6,2,6">
+                        <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}" Width="30" />
+                    </Button>
+                </Grid>
+
+            </Grid>
+          
          <Border Name="MessageBrd" Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
             <TextBlock Name="MessageTxBx"  TextAlignment="Center"
                    Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>

Project/OpenPageUC.xaml.vb

@@ -38,6 +38,7 @@ Public Class OpenPageUC
       OpenSceneHost.SetValue(Grid.ColumnProperty, 1)
       OpenSceneHost.SetValue(Grid.RowProperty, 2)
       ' OpenSceneHost.SetValue(Grid.RowSpanProperty, 1)
+      OpenSceneHost.SetValue(Grid.ColumnSpanProperty, 2)
       Me.OpenPageGrid.Children.Add(OpenSceneHost)
 
       ' Definizione del collegamento tra ItemList e ListBox1
@@ -203,6 +204,36 @@ Public Class OpenPageUC
       End If
    End Sub
 
+   Private Sub FindTxBx_EgtClosed(sender As Object, e As EventArgs) Handles FindTxBx.EgtClosed
+      ' Elimino spazi iniziali e finali
+      FindTxBx.Text = FindTxBx.Text.Trim()
+      ' ricarico la lista dei file
+      LoadCurrDir()
+      Dim UpdateListFile As New List(Of IconListBoxItem)
+      ' Se esiste un nome
+      If Not String.IsNullOrWhiteSpace(FindTxBx.Text) Then
+         For Each Item As IconListBoxItem In FileListBox.ItemsSource
+            If Item.Name.ToLower.Contains(FindTxBx.Text.ToLower) Then
+               UpdateListFile.Add(Item)
+            End If
+         Next
+      End If
+      If UpdateListFile.Count > 0 Then
+         FileListBox.ItemsSource = UpdateListFile
+      Else
+         FileListBox.ItemsSource = m_MainWindow.m_OpenItemList
+      End If
+   End Sub
+
+   Private Sub ClearFindBtn_Click() Handles ClearFindBtn.Click
+      ' svuoto la text
+      FindTxBx.Text = ""
+      ' ricarico la lista dei file
+      LoadCurrDir()
+      ' e aggiorno la lista dei file
+      FileListBox.ItemsSource = m_MainWindow.m_OpenItemList
+   End Sub
+
    Private Function ClearView() As Boolean
       ' Pulisco il DB geometrico locale
       EgtNewFile()