Gestione inserimento di più CSV

2022-02-23 19:01:08 +01:00
parent c3c24cd8e6
commit d57075b065
4 changed files with 186 additions and 30 deletions
@@ -1,5 +1,5 @@
 Imports EgtUILib
-
+Imports System.IO

 Friend Module CSVFile

@@ -7,6 +7,7 @@ Friend Module CSVFile

   '-----------------------------------------------------------------------------------------------
   Friend Class CsvPart
+      Public m_sPath As String = String.Empty
      Public m_sName As String = String.Empty
      Public m_sOrd As String = String.Empty
      Public m_sDist As String = String.Empty
@@ -63,6 +64,7 @@ Friend Module CSVFile
      For i As Integer = 1 To nNbr
         Dim OnePart As New CsvPart
         Dim sN As String = i.ToString()
+         OnePart.m_sPath = sFile
         EgtLuaGetGlobStringVar("CSV.NAME" & sN, OnePart.m_sName)
         OnePart.m_bActive = True
         EgtLuaGetGlobStringVar("CSV.ORD" & sN, OnePart.m_sOrd)
@@ -146,7 +148,9 @@ Friend Module CSVFile
            Else
               Dim sItems() As String = sLine.Split("=".ToCharArray)
               If sItems.Count() >= 2 Then
-                  If sItems(0) = "Nam" Then
+                  If sItems(0) = "Path" Then
+                     OnePart.m_sPath = sItems(1)
+                  ElseIf sItems(0) = "Nam" Then
                     OnePart.m_sName = sItems(1)
                  ElseIf sItems(0) = "Ord" Then
                     OnePart.m_sOrd = sItems(1)
@@ -188,6 +192,8 @@ Friend Module CSVFile
                     StringToDouble(sItems(1), OnePart.m_dHeel4)
                  ElseIf sItems(0) = "OIn" Then
                     StringToInt(sItems(1), OnePart.m_nOriInd)
+                  ElseIf sItems(0) = "Guid" Then
+                     OnePart.m_sRefGuid = sItems(1).Trim
                  End If
               End If
            End If
@@ -215,6 +221,7 @@ Friend Module CSVFile
         For i As Integer = 1 To CsvPartList.Count()
            Dim CurrPart As CsvPart = CsvPartList(i - 1)
            Writer.WriteLine("[P" & i.ToString() & "]")
+            Writer.WriteLine("Path=" & CurrPart.m_sPath)
            Writer.WriteLine("Nam=" & CurrPart.m_sName)
            Writer.WriteLine("Ord=" & CurrPart.m_sOrd)
            Writer.WriteLine("Dist=" & CurrPart.m_sDist)
@@ -236,19 +243,44 @@ Friend Module CSVFile
            Writer.WriteLine("A4=" & DoubleToString(CurrPart.m_dAng4, 4))
            Writer.WriteLine("H4=" & DoubleToString(CurrPart.m_dHeel4, 4))
            Writer.WriteLine("OIn=" & CurrPart.m_nOriInd.ToString())
+            Writer.WriteLine("Guid=" & CurrPart.m_sRefGuid)
         Next
         ' Terminatore
         Writer.WriteLine("[END]")
         ' Chiudo file
         Writer.Close()
         Return True
-      ' Errore
+         ' Errore
      Catch ex As Exception
         EgtOutLog("CSV List error writing " & sFile)
         Return False
      End Try
   End Function

+   ' dato l'elenco completo dei file salvo ogni singolo epl 
+   Friend Function WriteCsvMergePartList(CsvPartList As List(Of CsvPart)) As Boolean
+      Dim bOk As Boolean = True
+      Dim LocalPartList As New List(Of CsvPart)
+      Dim Index As Integer = 0
+      ' devo dividere la lista in tante parti quanti sono i file che lo costituiscono
+      While Index < CsvPartList.Count
+         Dim CurrFile As String = CsvPartList(Index).m_sPath
+         Dim sFile As String = Path.ChangeExtension(CurrFile, ".epl")
+         LocalPartList.Clear()
+         While CurrFile = CsvPartList(Index).m_sPath
+            LocalPartList.Add(CsvPartList(Index))
+            Index += 1
+            ' se terminata la lista
+            If Index = CsvPartList.Count Then
+               Exit While
+            End If
+         End While
+         ' salvo l'elenco corrente
+         bOk = WriteCsvPartList(sFile, CurrFile, LocalPartList) And bOk
+      End While
+      Return bOk
+   End Function
+
   Friend Function RemoveNotToNestParts(ByRef CsvPartList As List(Of CsvPart)) As Boolean
      For i As Integer = CsvPartList.Count() - 1 To 0 Step -1
         If CsvPartList(i).m_nToNest = 0 Then
@@ -11,7 +11,7 @@ Public Class CSVPage
   Private WithEvents m_CurrProjPage As CurrentProjectPageUC
   ' Flag di pagina attiva
   Private m_bActive As Boolean = False
-   ' Flag tipologia
+   ' Flag tipologia (False -> Cvs semplificato)
   Private m_bFull As Boolean = False
   ' Flag inserimento diretto
   Private m_bDirect As Boolean = True
@@ -28,7 +28,7 @@ Public Class CSVPage
   Private m_ptRawMin As Point3d
   Private m_ptRawMax As Point3d

-   Dim m_bIsCounterLy As Boolean = True
+   Dim m_bIsCounterLy As Boolean = False
   Dim m_nCurrNubrOfParts As Integer = 0
   Dim m_nIdToSel As Integer = GDB_ID.NULL

@@ -182,15 +182,47 @@ Public Class CSVPage
      WritePrivateProfileString(S_CSV, K_CSVLASTFILE, "", m_MainWindow.GetIniFile())
   End Sub

+   Private Function CreateListOfDeniedFiles() As List(Of String)
+      Dim LocalList As New List(Of String)
+      LocalList.Add("MERGE")
+      Dim Index1 As Integer = 0
+      Dim Index2 As Integer = 0
+      For Index1 = 0 To m_CsvPartList.Count - 1
+         Dim sFileName As String = m_CsvPartList(Index1).m_sPath
+         Dim bNewFile As Boolean = True
+         For Index2 = 0 To LocalList.Count - 1
+            If sFileName = LocalList(Index2) Then
+               bNewFile = False
+               Exit For
+            End If
+         Next
+         If bNewFile Then
+            LocalList.Add(Path.GetFileNameWithoutExtension(sFileName).ToUpper.Trim)
+         End If
+      Next
+      Return LocalList
+   End Function
+
   Private Sub OpenBtn_Click(sender As Object, e As RoutedEventArgs) Handles OpenBtn.Click
-      ' Salvo lista dei pezzi attuale
-      SaveCsvPartList()
+      '' Salvo lista dei pezzi attuale
+      'SaveCsvPartList()
      ' Leggo direttorio corrente dei file CSV
      Dim sCurrDir As String = ""
      GetPrivateProfileString(S_CSV, K_CSVCURRDIR, "C:\", sCurrDir, m_MainWindow.GetIniFile())
      ' Apro dialogo scelta file
-      Dim OpenFileWnd As New OpenFileWD(m_MainWindow, sCurrDir, ".CSV", ".EPL")
+      Dim OpenFileWnd As OpenFileWD
+      Dim sDeniedFiles As List(Of String) = CreateListOfDeniedFiles()
+      ' imposto il filtro
+      If m_bFull Then
+         OpenFileWnd = New OpenFileWD(m_MainWindow, sCurrDir, ".CSV", ".EPL", sDeniedFiles)
+      Else
+         OpenFileWnd = New OpenFileWD(m_MainWindow, sCurrDir, ".CSV")
+      End If
      If Not OpenFileWnd.ShowDialog() Then Return
+      ' verifico che il file inserito non appartenga al Merge attuale
+
+      ' Salvo lista dei pezzi attuale
+      SaveCsvPartList()
      ' Salvo direttorio corrente
      WritePrivateProfileString(S_CSV, K_CSVCURRDIR, OpenFileWnd.GetFileDir(), m_MainWindow.GetIniFile())
      ' Apertura file
@@ -222,17 +254,28 @@ Public Class CSVPage
      ' Pulisco path e lista dei pezzi Csv
      m_sFilePath = String.Empty
      m_sCsvPath = String.Empty
-      m_CsvPartList.Clear()
+
+      ' mantengo la lista attuale dei pezzi
+      'm_CsvPartList.Clear()
+
+      ' aggiungo i pezzi su una lista temporanea
+      Dim LocalPartList As New List(Of CsvPart)
      ' Eseguo la lettura del file Csv
-      If Not ReadCsvFile(sCsvPath, m_bFull, m_sCsvPath, m_CsvPartList) Then
+      If Not ReadCsvFile(sCsvPath, m_bFull, m_sCsvPath, LocalPartList) Then
         m_CurrProjPage.SetErrorMessage(EgtMsg(91206))    'Errore nella lettura del file CSV
         Return False
      End If
+
+      ' Creo un nuovo file che ospitarà il merge de
+      Dim sNewMergeFile As String = Path.GetDirectoryName(m_sCsvPath) & "\Merge.csv"
+      m_sCsvPath = sNewMergeFile
      m_sFilePath = m_sCsvPath
+
      ' Elimino pezzi nulli
-      RemoveWrongParts(m_CsvPartList)
+      RemoveWrongParts(LocalPartList)
      ' Aggiorno
      If m_bFull Then
+         MySaveCsvPartList(LocalPartList)
         ' Salvo come epl
         SaveCsvPartList()
         ' Rinomino file originale
@@ -245,9 +288,41 @@ Public Class CSVPage
         ' eseguo rinomina
         My.Computer.FileSystem.RenameFile(sCsvPath, sBakName)
      End If
+      ' attacco i nuovi pezzi alla lista corrente
+      For Each Item As CsvPart In LocalPartList
+         m_CsvPartList.Add(Item)
+      Next
      Return True
   End Function

+   Private Sub LoadCsvPartList(sFile As String)
+      ' Se Csv semplificato non va letta
+      If Not m_bFull Then Return
+      ' Pulisco path e lista dei pezzi Csv
+      m_sCsvPath = String.Empty
+
+      ' mantengo la lista attuale dei pezzi
+      'm_CsvPartList.Clear()
+
+      ' aggiungo i pezzi su una lista temporanea
+      Dim LocalPartList As New List(Of CsvPart)
+
+      ' Lettura del file
+      If ReadCsvPartList(sFile, m_sCsvPath, m_CsvPartList) Then
+         ' Creo un nuovo file che ospitarà il merge de
+         Dim sNewMergeFile As String = Path.GetDirectoryName(m_sCsvPath) & "\Merge.csv"
+         m_sCsvPath = sNewMergeFile
+         m_sFilePath = m_sCsvPath
+      End If
+      ' Elimino pezzi nulli
+      RemoveWrongParts(LocalPartList)
+      ' attacco i nuovi pezzi alla lista corrente
+      For Each Item As CsvPart In LocalPartList
+         m_CsvPartList.Add(Item)
+      Next
+   End Sub
+
+
   Private Sub ShowTreeView()
      ' Path del file Csv
      Dim TempPath As New Text.StringBuilder(260)
@@ -257,6 +332,7 @@ Public Class CSVPage
      m_ItemsList.Clear()
      Dim sCurrMat As String = String.Empty
      Dim dCurrTh As Double = 0
+      Dim sCurrPath As String = String.Empty
      Dim nCatToNest As Integer = 0
      Dim nCatCount As Integer = 0
      Dim PartCathegory As New PartCathegoryItem("", 0)
@@ -267,19 +343,27 @@ Public Class CSVPage
         If i = 1 Then
            sCurrMat = CurrPart.m_sMaterial
            dCurrTh = CurrPart.m_dTh
+            sCurrPath = CurrPart.m_sPath
         ElseIf String.Compare(sCurrMat, CurrPart.m_sMaterial, True) <> 0 Or
                Math.Abs(dCurrTh - CurrPart.m_dTh) > 10 * EPS_SMALL Then
            If m_bFull Then
               PartCathegory.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
                                    " - " & LenToString(dCurrTh, 2) &
                                    " - " & nCatToNest.ToString() & "/" & nCatCount.ToString()
+               If Not String.IsNullOrWhiteSpace(sCurrPath) Then
+                  PartCathegory.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
+               End If
            Else
               PartCathegory.Name = nCatToNest.ToString() & "/" & nCatCount.ToString()
+               If Not String.IsNullOrWhiteSpace(sCurrPath) Then
+                  PartCathegory.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
+               End If
            End If
            PartCathegory.IsExpanded = True
            m_ItemsList.Add(PartCathegory)
            sCurrMat = CurrPart.m_sMaterial
            dCurrTh = CurrPart.m_dTh
+            sCurrPath = CurrPart.m_sPath
            PartCathegory = New PartCathegoryItem("", 0)
            nCatToNest = 0
            nCatCount = 0
@@ -297,8 +381,14 @@ Public Class CSVPage
         PartCathegory.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
                              " - " & LenToString(dCurrTh, 2) &
                              " - " & nCatToNest.ToString() & "/" & nCatCount.ToString()
+         If Not String.IsNullOrWhiteSpace(sCurrPath) Then
+            PartCathegory.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
+         End If
      Else
         PartCathegory.Name = nCatToNest.ToString() & "/" & nCatCount.ToString()
+         If Not String.IsNullOrWhiteSpace(sCurrPath) Then
+            PartCathegory.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
+         End If
      End If
      PartCathegory.IsExpanded = True
      m_ItemsList.Add(PartCathegory)
@@ -308,6 +398,7 @@ Public Class CSVPage
      For Each CatItem As PartCathegoryItem In m_ItemsList
         Dim sCurrMat As String = String.Empty
         Dim dCurrTh As Double = 0
+         Dim sCurrPath As String = String.Empty
         Dim nCatToNest As Integer = 0
         Dim nCatCount As Integer = 0
         For Each PrtItem As PartCustomItem In CatItem.Items
@@ -317,6 +408,7 @@ Public Class CSVPage
            PrtItem.sText1 = sCount
            sCurrMat = PartData.m_sMaterial
            dCurrTh = PartData.m_dTh
+            sCurrPath = PartData.m_sPath
            nCatToNest += PartData.m_nToNest
            nCatCount += PartData.m_nCount
         Next
@@ -324,8 +416,14 @@ Public Class CSVPage
            CatItem.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
                           " - " & LenToString(dCurrTh, 2) &
                           " - " & nCatToNest.ToString() & "/" & nCatCount.ToString()
+            If Not String.IsNullOrWhiteSpace(sCurrPath) Then
+               CatItem.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
+            End If
         Else
            CatItem.Name = nCatToNest.ToString() & "/" & nCatCount.ToString()
+            If Not String.IsNullOrWhiteSpace(sCurrPath) Then
+               CatItem.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
+            End If
         End If
      Next
   End Sub
@@ -703,24 +801,33 @@ Public Class CSVPage
      End If
      ' Path del file
      Dim sFile As String = Path.ChangeExtension(m_sFilePath, ".epl")
-      ' Scrittura del file
-      If WriteCsvPartList(sFile, m_sCsvPath, m_CsvPartList) Then
-         ' Registro in ini path
-         WritePrivateProfileString(S_CSV, K_CSVLASTFILE, sFile, m_MainWindow.GetIniFile())
+      ' Scrittura dei file
+      If WriteCsvMergePartList(m_CsvPartList) Then
+         ' Scrittura dei file Merge
+         If WriteCsvPartList(sFile, m_sCsvPath, m_CsvPartList) Then
+            WritePrivateProfileString(S_CSV, K_CSVLASTFILE, sFile, m_MainWindow.GetIniFile())
+         End If
      End If
   End Sub

-   Private Sub LoadCsvPartList(sFile As String)
-      ' Se Csv semplificato non va letta
+   ' salvo il sottoelenco dei pezzi
+   Friend Sub MySaveCsvPartList(ByVal CurrPartList As List(Of CsvPart))
+      ' Se Csv semplificato non va salvata
      If Not m_bFull Then Return
-      ' Pulisco path e lista dei pezzi Csv
-      m_sCsvPath = String.Empty
-      m_CsvPartList.Clear()
-      ' Lettura del file
-      ReadCsvPartList(sFile, m_sCsvPath, m_CsvPartList)
-      m_sFilePath = sFile
-      ' Elimino pezzi nulli
-      RemoveWrongParts(m_CsvPartList)
+      Dim sCurrPath As String = String.Empty
+      ' recupero dalla lista il nome del file corrente
+      For Each Item As CsvPart In CurrPartList
+         sCurrPath = Item.m_sPath
+      Next
+      ' se non trov il nome del file assocciato all'elenco di pezzi esco
+      If String.IsNullOrEmpty(sCurrPath) Then
+         EgtOutLog("CSV Curr list missing")
+         Return
+      End If
+      ' Path del file
+      Dim sFile As String = Path.ChangeExtension(sCurrPath, ".epl")
+      ' Scrittura del file
+      WriteCsvPartList(sFile, sCurrPath, CurrPartList)
   End Sub

   Friend Sub UpdateCsvPartList()
@@ -59,7 +59,7 @@ Public Class NestPageUC
   ' lista delle famiglie di pezzi in parcheggio
   Private m_ListOfGroupInPark As New List(Of FamilyPart)
   ' se seleniozato il layer CounterPz
-   Dim m_bIsCounterLy As Boolean = True
+   Dim m_bIsCounterLy As Boolean = False
   Dim m_nCurrNubrOfParts As Integer = 0

   Private Sub NestPage_Initialized(sender As Object, e As EventArgs)
@@ -9,6 +9,7 @@ Public Class OpenFileWD
   Private m_sCurrFile As String = String.Empty
   Private m_sExt As String = String.Empty
   Private m_sExt2 As String = String.Empty
+   Private n_sDeniedFiles As New List(Of String)

   Private m_OpenItemList As New ObservableCollection(Of IconListBoxItem)

@@ -27,6 +28,15 @@ Public Class OpenFileWD
      InitializeComponent()
   End Sub

+   Sub New(Owner As Window, sDir As String, sExt As String, sExt2 As String, DeniedFiles As List(Of String))
+      Me.Owner = Owner
+      m_sCurrDir = sDir
+      m_sExt = sExt
+      m_sExt2 = sExt2
+      n_sDeniedFiles = DeniedFiles
+      InitializeComponent()
+   End Sub
+
   Private Sub OpenFile_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
      ' Posizione finestra
      Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2
@@ -71,13 +81,20 @@ Public Class OpenFileWD
      Dim FileI As FileInfo
      For Each FileI In vFileI
         Dim sExt As String = Path.GetExtension(FileI.Name).ToUpper()
-         If String.Compare(sExt, m_sExt, True) = 0 Or
-            String.Compare(sExt, m_sExt2, True) = 0 Then
+         Dim sFileName As String = Path.GetFileNameWithoutExtension(FileI.Name).ToUpper.Trim
+         Dim bDenied As Boolean = False
+         For Each ItemFile As String In n_sDeniedFiles
+            If ItemFile.ToUpper.Trim = sFileName Then
+               bDenied = True
+               Exit For
+            End If
+         Next
+         If (String.Compare(sExt, m_sExt, True) = 0 Or String.Compare(sExt, m_sExt2, True) = 0) And Not bDenied Then
            m_OpenItemList.Add(New IconListBoxItem(FileI.Name, 3))
         End If
      Next
-      ' riporto visualizzazione in cima alla lista (esiste sempre almeno un elemento)
-      FileListBox.ScrollIntoView(m_OpenItemList(0))
+         ' riporto visualizzazione in cima alla lista (esiste sempre almeno un elemento)
+         FileListBox.ScrollIntoView(m_OpenItemList(0))
      Return True
   End Function