From b9517e1cc5edb9af06e860d0382a22b52cbb8c3e Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Tue, 22 Jun 2021 09:16:02 +0200
Subject: [PATCH] Gestione esportazione ed importazione progetti

---
 EgtBEAMWALL.Core/Constants/ConstBeam.vb       |   5 +
 .../Controllers/ProjController.cs             |   1 +
 .../EgtBEAMWALL.ViewerOptimizer.vbproj        |  15 +-
 .../OpenProjectFileDialogVM.vb                |  10 +
 .../ProjManager/ProjManagerV.xaml             |  16 +-
 .../ProjManager/ProjManagerVM.vb              | 417 +++++++++++++++---
 .../Resources/ProjectManager/DxfOut.png       | Bin 1002 -> 0 bytes
 .../Resources/ProjectManager/Export.png       | Bin 1814 -> 0 bytes
 .../ProjectManager/ExportProject.png          | Bin 0 -> 1060 bytes
 .../{Import.png => Import.orig.png}           | Bin
 .../Resources/ProjectManager/ImportBTL.png    | Bin 0 -> 937 bytes
 .../Resources/ProjectManager/ImportBTL1.png   | Bin 0 -> 738 bytes
 .../ProjectManager/ImportProject.png          | Bin 0 -> 996 bytes
 .../ProjectManager/ImportProject1.png         | Bin 0 -> 807 bytes
 14 files changed, 406 insertions(+), 58 deletions(-)
 delete mode 100644 EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/DxfOut.png
 delete mode 100644 EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Export.png
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ExportProject.png
 rename EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/{Import.png => Import.orig.png} (100%)
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportBTL.png
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportBTL1.png
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportProject.png
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportProject1.png

diff --git a/EgtBEAMWALL.Core/Constants/ConstBeam.vb b/EgtBEAMWALL.Core/Constants/ConstBeam.vb
index 3817aa6d..dd0abf8e 100644
--- a/EgtBEAMWALL.Core/Constants/ConstBeam.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstBeam.vb
@@ -264,4 +264,9 @@
    Friend Const WRH_KERF As String = "Kerf"
    Friend Const WRH_S As String = "S"
 
+   ' parametri import/export
+   Public Const EXP_PROJ As String = "EXPORTPROJ"
+   Public Const EXP_PROD As String = "EXPORTPROD"
+   Public Const BTLFILENAME As String = "BTLFILENAME"
+
 End Module
diff --git a/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs b/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs
index 02f1d005..d43881f6 100644
--- a/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs
+++ b/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs
@@ -335,6 +335,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 //currProjs.ForEach(x => x.Locked = Locked);
                 foreach (var item in currProjs)
                 {
+               //item.ProdDbId = currProd.ProdDbId;
                     item.Locked = Locked;
                     dbCtx.Entry(item).State = System.Data.Entity.EntityState.Modified;
                 }
diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
index 3bf7bd8b..50ed7283 100644
--- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
@@ -115,6 +115,9 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
+    <Reference Include="Ionic.Zip">
+      <HintPath>..\..\..\EgtProg\EgtBEAMWALL\Ionic.Zip.dll</HintPath>
+    </Reference>
     <Reference Include="MySql.Data, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.10.9\lib\net40\MySql.Data.dll</HintPath>
     </Reference>
@@ -588,9 +591,6 @@
   <ItemGroup>
     <Resource Include="Resources\EgtBEAMWALL.ico" />
     <Resource Include="Resources\InstrumentPanel\GetDist.png" />
-    <Resource Include="Resources\ProjectManager\DxfOut.png" />
-    <Resource Include="Resources\ProjectManager\Export.png" />
-    <Resource Include="Resources\ProjectManager\Import.png" />
     <Resource Include="Resources\ProjectManager\New.png" />
     <Resource Include="Resources\ProjectManager\Open.png" />
     <Resource Include="Resources\ProjectManager\Options.png" />
@@ -703,6 +703,15 @@
   <ItemGroup>
     <Resource Include="Resources\Configuration\MachiningsTable.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\ImportBTL.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\ImportProject.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\ExportProject.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR32.exe
diff --git a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
index ead43ef5..b20d6b86 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
@@ -271,6 +271,8 @@ Public Class OpenProjectFileDialogVM
    ''' </summary>
    Friend Sub Delete()
       If IsNothing(SelProject) Then Return
+      ' recupero indice per riselezionare
+      Dim ProjListIndex As Integer = m_ProjectList.IndexOf(SelProject)
       If m_ProjectType = ProjectType.PROJ Then
          ' verifico se proj selezionato e' il corrente
          If Not IsNothing(Map.refProjManagerVM.CurrProj) AndAlso SelProject.nProjId = Map.refProjManagerVM.CurrProj.nProjId Then
@@ -350,6 +352,14 @@ Public Class OpenProjectFileDialogVM
             m_ProjectList.Add(New ProdFileVM(Project))
          Next
       End If
+      ' ripristino selezionato
+      If ProjListIndex >= 0 AndAlso ProjListIndex <= m_ProjectList.Count - 1 Then
+         SelProject = m_ProjectList(ProjListIndex)
+         NotifyPropertyChanged(NameOf(SelProject))
+      End If
+      ' reset dei controller per tornare in sync
+      DbControllers.m_ProjController.ResetController()
+      DbControllers.m_ProdController.ResetController()
    End Sub
 
 #End Region ' Delete
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml
index 6a1a1660..df83ba3e 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml
@@ -27,10 +27,10 @@
             Style="{StaticResource ToolBar_Button}">
       <Image Source="/Resources/ProjectManager/SaveAs.png" Stretch="Uniform"/>
    </Button>-->
-   <Button Command="{Binding Import_Command}"
-           ToolTip="{Binding Import_ToolTip}"
+   <Button Command="{Binding ImportBTL_Command}"
+           ToolTip="{Binding ImportBTL_ToolTip}"
            Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ProjectManager/ImportBTL.png" Stretch="Uniform"/>
    </Button>
    <!--<Button Command="{Binding OptionsCommand}"
             ToolTip="{Binding OptionsToolTip}"
@@ -46,6 +46,16 @@
            Command="{Binding UpdateBTL_Command}"
            ToolTip="{Binding UpdateBTL_ToolTip}"
            Style="{StaticResource ToolBar_Button}"/>
+   <Button Command="{Binding ExportProject_Command}"
+           ToolTip="{Binding ExportProject_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/ProjectManager/ExportProject.png" Stretch="Uniform"/>
+   </Button>
+   <Button Command="{Binding ImportProject_Command}"
+           ToolTip="{Binding ImportProject_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/ProjectManager/ImportProject.png" Stretch="Uniform"/>
+   </Button>
    <Button Content=">"
            Command="{Binding GoToProd_Command}"
            ToolTip="{Binding GoToProd_ToolTip}"
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
index 29e90cf7..fde1319f 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
@@ -57,7 +57,9 @@ Public Class ProjManagerVM
    Private m_cmdSaveAs As ICommand
    Private m_cmdExport As ICommand
    Private m_cmdDxfOut As ICommand
-   Private m_cmdImport As ICommand
+   Private m_cmdImportBTL As ICommand
+   Private m_cmdImportProject As ICommand
+   Private m_cmdExportProject As ICommand
    Private m_cmdGoToProd As ICommand
    Private m_cmdSendFeedback As ICommand
 
@@ -89,9 +91,9 @@ Public Class ProjManagerVM
          Return EgtMsg(MSG_TOPCOMMANDBAR + 5)
       End Get
    End Property
-   Public ReadOnly Property Import_ToolTip As String
+   Public ReadOnly Property ImportBTL_ToolTip As String
       Get
-         Return EgtMsg(MSG_TOPCOMMANDBAR + 6)
+         Return EgtMsg(61838)
       End Get
    End Property
    Public ReadOnly Property UpdateBTL_ToolTip As String
@@ -99,6 +101,16 @@ Public Class ProjManagerVM
          Return EgtMsg(61834)
       End Get
    End Property
+   Public ReadOnly Property ExportProject_ToolTip As String
+      Get
+         Return EgtMsg(61836)
+      End Get
+   End Property
+   Public ReadOnly Property ImportProject_ToolTip As String
+      Get
+         Return EgtMsg(61837)
+      End Get
+   End Property
    Public ReadOnly Property GoToProd_ToolTip As String
       Get
          Return EgtMsg(61835)
@@ -333,24 +345,24 @@ Public Class ProjManagerVM
 
 #End Region ' SaveCommand
 
-#Region "Import"
+#Region "ImportBTL"
 
    ''' <summary>
    ''' Returns a command that do Export.
    ''' </summary>
-   Public ReadOnly Property Import_Command As ICommand
+   Public ReadOnly Property ImportBTL_Command As ICommand
       Get
-         If m_cmdImport Is Nothing Then
-            m_cmdImport = New Command(AddressOf Import)
+         If m_cmdImportBTL Is Nothing Then
+            m_cmdImportBTL = New Command(AddressOf ImportBTL)
          End If
-         Return m_cmdImport
+         Return m_cmdImportBTL
       End Get
    End Property
 
    ''' <summary>
    ''' Execute the Export.  This method is invoked by the ExportCommand.
    ''' </summary>
-   Public Sub Import()
+   Public Sub ImportBTL()
       If Not ProjFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ) Then Return
       Dim sDir As String = String.Empty
       GetMainPrivateProfileString(S_GENERAL, K_LASTIMPDIR, "", sDir)
@@ -401,7 +413,6 @@ Public Class ProjManagerVM
       If bOk Then
          ' aggiorno Db
          Dim sBTLFileName As String = Path.GetFileNameWithoutExtension(BTLDlg.FileName)
-         'UpdateBTLFileName(nProjId, sBTLFileName)
          Dim ExportDate As DateTime
          DateTime.TryParse(Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPDATE & " " &
                            Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPTIME, ExportDate)
@@ -416,7 +427,289 @@ Public Class ProjManagerVM
       Map.refMainWindowVM.UpdateTitle()
    End Sub
 
-#End Region ' Import
+#End Region ' ImportBTL
+
+#Region "ExportProject"
+
+   ''' <summary>
+   ''' Returns a command that do Export.
+   ''' </summary>
+   Public ReadOnly Property ExportProject_Command As ICommand
+      Get
+         If m_cmdExportProject Is Nothing Then
+            m_cmdExportProject = New Command(AddressOf ExportProject)
+         End If
+         Return m_cmdExportProject
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Export.  This method is invoked by the ExportCommand.
+   ''' </summary>
+   Public Sub ExportProject()
+      If Not ProjFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ) Then Return
+      If IsNothing(CurrProj) Then Return
+      ' apro finestra di salvataggio progetto
+      Dim ExportDlg As New Microsoft.Win32.SaveFileDialog() With {.DefaultExt = ".ngexp",
+                                                                  .Filter = "ProjectExport (*.ngexp)|*.ngexp",
+                                                                  .FileName = CurrProj.nProjId.ToString("0000") & " - " & CurrProj.sBTLFileName & " - ProjectExport"}
+      If ExportDlg.ShowDialog() <> True Then Return
+      ' per ogni BTLInfo nel progetto riporto il relativo nome del BTL
+      Dim nBTLInfoProjId As Integer
+      Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
+      While nBTLInfoLayerId <> GDB_ID.NULL
+         ' recupero il ProjId
+         EgtGetInfo(nBTLInfoLayerId, BTL_PRT_PROJ, nBTLInfoProjId)
+         If nBTLInfoProjId > 0 Then
+            ' recupero il BTL file name di questo proj
+            Dim BTLFileNameProj As ProjFileM = DbControllers.m_ProjController.FindByProjIdConv(nBTLInfoProjId)
+            If Not IsNothing(BTLFileNameProj) Then
+               EgtSetInfo(nBTLInfoLayerId, BTLFILENAME, BTLFileNameProj.sBTLFileName)
+            End If
+         End If
+         nBTLInfoLayerId = EgtGetNextName(nBTLInfoLayerId, BTLINFO)
+      End While
+      '' se c'e' un prod collegato
+      'If Map.refProjManagerVM.CurrProj.nProdId > 0 Then
+      '   ' scrivo quali sono i proj e prod in questo file
+      '   Dim Prod As ProdFileM = DbControllers.m_ProdController.FindCoreByProdId(Map.refProjManagerVM.CurrProj.nProdId)
+      '   EgtSetInfo(Map.refProjectVM.BTLStructureVM.BTLStructureM.nBTLInfoId, EXP_PROD, Map.refProjManagerVM.CurrProj.nProdId)
+      '   For ProjIndex = 0 To Prod.nProjIdList.Count - 1
+      '      EgtSetInfo(Map.refProjectVM.BTLStructureVM.BTLStructureM.nBTLInfoId, EXP_PROJ & ProjIndex + 1, Prod.nProjIdList(ProjIndex))
+      '   Next
+      'Else
+      '   EgtSetInfo(Map.refProjectVM.BTLStructureVM.BTLStructureM.nBTLInfoId, EXP_PROJ & 1, Map.refProjManagerVM.CurrProj.nProjId)
+      'End If
+      ' salvo info inserite
+      Map.refSceneHostVM.SaveProject()
+      ' creo file zip
+      Dim sZipToCreate As String = ExportDlg.FileName
+      If File.Exists(sZipToCreate) Then
+         File.Delete(sZipToCreate)
+      End If
+      Try
+         Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out)
+            ' impacchetto tutta la cartella del progetto
+            Dim sProjectDirPath As String = If(CurrProj.nProdId > 0, CurrProj.sProdDirPath, CurrProj.sProjDirPath)
+            For Each sFile As String In Directory.GetFiles(sProjectDirPath)
+               zip.AddItem(sFile, "")
+            Next
+            ' salvo lo zip
+            zip.Save()
+         End Using
+      Catch ex1 As Exception
+         EgtOutLog("Exception in zip: " & ex1.ToString())
+         MessageBox.Show("Impossibile creare file di export")
+      End Try
+   End Sub
+
+#End Region ' ExportProject
+
+#Region "ImportProject"
+
+   ''' <summary>
+   ''' Returns a command that do Export.
+   ''' </summary>
+   Public ReadOnly Property ImportProject_Command As ICommand
+      Get
+         If m_cmdImportProject Is Nothing Then
+            m_cmdImportProject = New Command(AddressOf ImportProject)
+         End If
+         Return m_cmdImportProject
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Export.  This method is invoked by the ExportCommand.
+   ''' </summary>
+   Public Sub ImportProject()
+      ' lista di tutti gli errori riscontrati
+      Dim ErrorList As New List(Of String)
+      If Not ProjFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ) Then Return
+      Dim sDir As String = String.Empty
+      GetMainPrivateProfileString(S_GENERAL, K_LASTIMPDIR, "", sDir)
+      ' apro finestra scelta file
+      Dim ImportDlg As New Microsoft.Win32.OpenFileDialog() With {.DefaultExt = ".ngexp",
+                                                                  .Filter = "ProjectExport (*.ngexp)|*.ngexp",
+                                                                  .CheckFileExists = True,
+                                                                  .ValidateNames = True}
+      If ImportDlg.ShowDialog() <> True Then Return
+      ' creo cartella temporanea di estrazione in Temp
+      Dim sProjectimportDir As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\ProjectImport"
+      If Directory.Exists(sProjectimportDir) Then
+         Directory.Delete(sProjectimportDir, True)
+      End If
+      Directory.CreateDirectory(sProjectimportDir)
+      Try
+         Using zip As New Ionic.Zip.ZipFile(ImportDlg.FileName, Console.Out)
+            ' estraggo file da zip
+            zip.ExtractAll(sProjectimportDir)
+         End Using
+      Catch ex1 As Exception
+         EgtOutLog("Exception in zip: " & ex1.ToString())
+         MessageBox.Show("Impossibile importare file", "Errore")
+         Return
+      End Try
+      ' carico progetto
+      Dim sProjFromPath() As String = Directory.GetFiles(sProjectimportDir, "*.nge")
+      Dim bOk = EgtOpenFile(sProjFromPath(0))
+      If Not bOk Then
+         MessageBox.Show("Impossibile aprire il file", "Errore")
+         Return
+      End If
+      ' leggo proj e prod presenti dai layer BTLInfo
+      Dim ImportProjIdList As New List(Of Integer)
+      Dim NewProjIdList As New List(Of Integer)
+      Dim BTLInfoIdList As New List(Of Integer)
+      Dim BTLFileNameList As New List(Of String)
+      Dim CurrImportProjId As Integer
+      Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
+      While nBTLInfoLayerId <> GDB_ID.NULL
+         ' recupero il ProjId
+         EgtGetInfo(nBTLInfoLayerId, BTL_PRT_PROJ, CurrImportProjId)
+         If CurrImportProjId > 0 Then
+            ImportProjIdList.Add(CurrImportProjId)
+            BTLInfoIdList.Add(nBTLInfoLayerId)
+            ' recupero nome file BTL Associato
+            Dim sBTLFileName As String = ""
+            EgtGetInfo(nBTLInfoLayerId, BTLFILENAME, sBTLFileName)
+            BTLFileNameList.Add(sBTLFileName)
+         End If
+         nBTLInfoLayerId = EgtGetNextName(nBTLInfoLayerId, BTLINFO)
+      End While
+      If Not ImportProjIdList.Count > 0 Then
+         MessageBox.Show("Nessun progetto trovato all'interno del file importato", "Errore")
+      End If
+      ' carico i proj
+      For nProjIndex = 0 To ImportProjIdList.Count - 1
+         Dim nImportProjId As Integer = ImportProjIdList(nProjIndex)
+         ' inizializzo nuovo proj
+         Dim nNewProjId As Integer = 0
+         Dim sNewProjDir As String = ""
+         InitNewProject(nNewProjId, sNewProjDir)
+         NewProjIdList.Add(nNewProjId)
+         ' imposto ProjId di caricamento
+         m_nLoadingProjId = nImportProjId
+         ' costruisco BTLStructure del proj
+         Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(nImportProjId))
+         ' scrivo info proj su tutti i pezzi di questo progetto
+         For Each BTLPart In Map.refProjectVM.BTLStructureVM.BTLPartVMList
+            EgtSetInfo(BTLPart.nPartId, BTL_PRT_PROJ, nNewProjId)
+         Next
+         ' riporto nuovo ProjId nel layer BTLInfo
+         EgtSetInfo(BTLInfoIdList(nProjIndex), BTL_PRT_PROJ, nNewProjId)
+         ' salvo modifiche fatte al progetto
+         bOk = bOk AndAlso Map.refSceneHostVM.MainController.SaveProject()
+         If bOk Then
+            ' copio file BTL e progetto
+            Dim sBTLFromPath As String = sProjectimportDir & "\" & BTLFileNameList(nProjIndex) & ".btl"
+            Dim sProjFileName As String = sNewProjDir & "\" & nNewProjId.ToString("0000") & ".nge"
+            If sProjFromPath.Count > 0 AndAlso Not String.IsNullOrWhiteSpace(sProjFromPath(0)) Then
+               Try
+                  If Not String.IsNullOrWhiteSpace(sBTLFromPath) AndAlso File.Exists(sBTLFromPath) Then
+                     Dim sBtlToPath As String = sNewProjDir & "\" & Path.GetFileName(sBTLFromPath)
+                     File.Copy(sBTLFromPath, sBtlToPath)
+                  Else
+                     ErrorList.Add(String.Format("File BTL del progetto {0} non trovato", nImportProjId))
+                  End If
+                  File.Copy(sProjFromPath(0), sProjFileName)
+               Catch ex As Exception
+                  EgtOutLog("Impossibile copiare il file")
+                  MessageBox.Show("Impossibile copiare il file del progetto", "Errore")
+                  Return
+               End Try
+            End If
+            ' aggiorno Db
+            Dim sBTLFileName As String = BTLFileNameList(nProjIndex)
+            Dim ExportDate As DateTime
+            DateTime.TryParse(Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPDATE & " " &
+                           Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPTIME, ExportDate)
+            DbControllers.m_ProjController.UpdateInfo(nNewProjId, sBTLFileName, Map.refProjectVM.BTLStructureVM.sLISTNAME, ExportDate)
+         Else
+            ' elimino da Db
+            DbControllers.m_ProjController.DeleteProj(nNewProjId)
+         End If
+         ' salvo il progetto PROJ
+         Map.refSceneHostVM.SaveProject()
+         ' aggiorno BTLParts su DB
+         DbControllers.m_ProjController.UpdateBtlParts(nNewProjId, Map.refProjectVM.BTLStructureVM.BTLStructureM.BTLPartMList)
+         ' resetto stato new
+         DbControllers.m_ProjController.ResetNew(nNewProjId)
+         ' resetto lock
+         DbControllers.m_ProjController.LockByProjId(nNewProjId, False)
+         DbControllers.m_ProjController.ResetController()
+      Next
+      ' se tutte le operazioni precedenti sono andate a buon fine
+      If bOk Then
+         ' sostituisco indicazione nuovi proj nei pezzi
+         Dim nDuploLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, "DuploBase")
+         Dim nDuploId As Integer = EgtGetFirstInGroup(nDuploLayerId)
+         While nDuploId <> GDB_ID.NULL
+            ' recupero vecchio proj
+            Dim nOldProjId As Integer
+            EgtGetInfo(nDuploId, BTL_PRT_PROJ, nOldProjId)
+            ' lo cerco nella lista
+            Dim nOldProjIndex As Integer = ImportProjIdList.IndexOf(nOldProjId)
+            ' lo sostituisco
+            EgtSetInfo(nDuploId, BTL_PRT_PROJ, NewProjIdList(nOldProjIndex))
+            nDuploId = EgtGetNext(nDuploId)
+         End While
+         ' carico Machgroup che non verrebbero altrimenti importati
+         Map.refProjectVM.MachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList()))
+         If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count > 0 Then
+            ' inizializzo nuovo progetto PROD
+            Dim nProdId As Integer = 0
+            Dim sProdDir As String = ""
+            Map.refProdManagerVM.InitNewProject(NewProjIdList(0), nProdId, sProdDir)
+            ' copio file progetto
+            Dim sProjPath As String = String.Empty
+            Dim sProdPath As String = sProdDir & "\" & nProdId.ToString("0000") & ".nge"
+            If EgtGetCurrFilePath(sProjPath) AndAlso Not String.IsNullOrEmpty(sProjPath) Then
+               Try
+                  File.Copy(sProjPath, sProdPath)
+                  'Map.refSceneHostVM.MainController.OpenProject(sProdPath)
+                  bOk = True
+               Catch ex As Exception
+                  EgtOutLog("Impossibile copiare il file")
+                  bOk = False
+               End Try
+            End If
+            If bOk Then
+               ' aggiungo altri proj a prod
+               For Each nProjId In NewProjIdList
+                  DbControllers.m_ProdController.AddProj(nProdId, nProjId)
+               Next
+            Else
+               ' elimino da DB
+               DbControllers.m_ProdController.DeleteProd(nProdId)
+            End If
+            ' salvo il progetto PROD
+            Map.refSceneHostVM.SaveProject()
+            Dim MyMachGroupList As New List(Of MyMachGroupM)
+            If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
+               For Each MachGroup In Map.refProjectVM.MachGroupPanelVM.m_MyMachGroupPanelM.MachGroupMList
+                  MyMachGroupList.Add(MachGroup)
+               Next
+            End If
+            ' aggiorno pezzi su Db
+            DbControllers.m_ProdController.UpdateMachGroup(nProdId, MyMachGroupList)
+            ' resetto lock
+            DbControllers.m_ProdController.LockByProdId(nProdId, False)
+         End If
+         DbControllers.m_ProdController.ResetController()
+      End If
+      ' imposto progetto corrente
+      If NewProjIdList.Count > 0 Then SetCurrProj(NewProjIdList(0))
+      ' costruisco BTLStructure del proj
+      Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(NewProjIdList(0)))
+      ' mostro tutti i pezzi
+      Map.refShowBeamPanelVM.ShowAll()
+      EgtZoom(ZM.ALL, True)
+      ' aggiorno titolo
+      Map.refMainWindowVM.UpdateTitle()
+   End Sub
+
+#End Region ' ImportProject
 
 #Region "GoToProd"
 
@@ -460,47 +753,67 @@ Public Class ProjManagerVM
       Else
          'creo nuova ottimizzazione da progetto corrente
          NewProdFromProj()
-         '' chiedo se aggiungere ad ottimizzazione già presente o creare nuova
-         'Select Case MessageBox.Show("Aggiungere ad ottimizzazione già esistente?", "", MessageBoxButton.YesNoCancel, MessageBoxImage.Information)
-         '   Case MessageBoxResult.No
-         '      'creo nuova ottimizzazione da progetto corrente
-         '      NewProdFromProj()
-         '   Case MessageBoxResult.Yes
-         '      ' chiedo in quale ottimizzazione aggiungere il progetto corrente
-         '      Dim OpenProjectFileDialogVM As New OpenProjectFileDialogVM
-         '      Dim ChooseProdFileDialog As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
-         '      Dim DialogResult As Boolean? = ChooseProdFileDialog.EgtShowDialog(ProjectType.PROD)
-         '      If IsNothing(DialogResult) OrElse Not DialogResult Then Return
-         '      ' se prod selezionato
-         '      If Not IsNothing(OpenProjectFileDialogVM.SelProject.nProdId) AndAlso OpenProjectFileDialogVM.SelProject.nProdId > 0 Then
-         '         Dim nCurrCtx As Integer = EgtGetCurrentContext()
-         '         Dim nTempCtx As Integer = EgtInitContext()
-         '         Dim bOk As Boolean = nTempCtx <> 0
-         '         If bOk Then
-         '            ' inizializzo gestore lavorazioni
-         '            bOk = EgtInitMachMgr(Map.refMainWindowVM.MainWindowM.sMachinesRoot, Map.refMainWindowVM.MainWindowM.sToolMakersDir)
-         '            ' apro il prod
-         '            bOk = bOk AndAlso EgtOpenFile(OpenProjectFileDialogVM.SelProject.sProdPath)
-         '            ' inserisco proj nel prod selezionato
-         '            bOk = bOk AndAlso EgtInsertFile(Map.refProjManagerVM.CurrProj.sProjPath)
-         '            ' sposto i pezzi per non averli sovrapposti
-
-
-         '            bOk = bOk AndAlso EgtSaveFile(OpenProjectFileDialogVM.SelProject.sProdPath, NGE.CMPTEXT)
-         '            ' torno sul contesto corrente
-         '            EgtSetCurrentContext(nCurrCtx)
-         '            EgtDeleteContext(nTempCtx)
-         '         End If
-         '         If bOk Then
-         '            ' riporto aggiunta proj a prod su Db
-         '            DbControllers.m_ProdController.AddProj(OpenProjectFileDialogVM.SelProject.nProdId, Map.refProjManagerVM.CurrProj.nProjId)
-         '            ' imposto currprod
-         '            Map.refProdManagerVM.SetCurrProd(OpenProjectFileDialogVM.SelProject.nProdId)
-         '         End If
-         '      End If
-         '   Case MessageBoxResult.Cancel
-         '      Return
-         'End Select
+         ''' chiedo se aggiungere ad ottimizzazione già presente o creare nuova
+         ''Select Case MessageBox.Show("Aggiungere ad ottimizzazione già esistente?", "", MessageBoxButton.YesNoCancel, MessageBoxImage.Information)
+         ''   Case MessageBoxResult.No
+         ''      'creo nuova ottimizzazione da progetto corrente
+         ''      NewProdFromProj()
+         ''   Case MessageBoxResult.Yes
+         ''      ' chiedo in quale ottimizzazione aggiungere il progetto corrente
+         ''      Dim OpenProjectFileDialogVM As New OpenProjectFileDialogVM
+         ''      Dim ChooseProdFileDialog As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
+         ''      Dim DialogResult As Boolean? = ChooseProdFileDialog.EgtShowDialog(ProjectType.PROD)
+         ''      If IsNothing(DialogResult) OrElse Not DialogResult Then Return
+         ''      ' se prod selezionato
+         ''      If Not IsNothing(OpenProjectFileDialogVM.SelProject.nProdId) AndAlso OpenProjectFileDialogVM.SelProject.nProdId > 0 Then
+         ''         Dim nCurrCtx As Integer = EgtGetCurrentContext()
+         ''         Dim nTempCtx As Integer = EgtInitContext()
+         ''         Dim bOk As Boolean = nTempCtx <> 0
+         ''         If bOk Then
+         ''            ' inizializzo gestore lavorazioni
+         ''            bOk = EgtInitMachMgr(Map.refMainWindowVM.MainWindowM.sMachinesRoot, Map.refMainWindowVM.MainWindowM.sToolMakersDir)
+         ''            ' apro il prod
+         ''            bOk = bOk AndAlso EgtOpenFile(OpenProjectFileDialogVM.SelProject.sProdPath)
+         ''            '''' calcolo BBox globale
+         ''            '''Dim b3Parts As BBox3d
+         ''            '''Dim nProdPartId As Integer = EgtGetFirstPart()
+         ''            '''While nProdPartId <> GDB_ID.NULL
+         ''            '''   Dim b3Part As New BBox3d
+         ''            '''   EgtGetBBoxGlob(nProdPartId, 1, b3Part)
+         ''            '''   b3Parts.Add(b3Part)
+         ''            '''   nProdPartId = EgtGetNextPart(nProdPartId)
+         ''            '''End While
+         ''            ' inserisco proj nel prod selezionato
+         ''            bOk = bOk AndAlso EgtInsertFile(Map.refProjManagerVM.CurrProj.sProjPath)
+         ''            ' DA METTERE IN MERGE BTL, NON QUI!!!
+         ''            '''' deseleziono tutto
+         ''            '''EgtDeselectAll()
+         ''            '''' ciclo sui pezzi
+         ''            '''Dim nPartId As Integer = EgtGetFirstPart()
+         ''            '''While nPartId <> GDB_ID.NULL
+         ''            '''   ' se arrivano dal nuovo progetto
+         ''            '''   Dim nCurrProjId As Integer
+         ''            '''   EgtGetInfo(nPartId, PROJ, nCurrProjId)
+         ''            '''   If nCurrProjId = Map.refProjManagerVM.CurrProj.nProjId Then
+         ''            '''      ' sposto i pezzi per non averli sovrapposti
+         ''            '''      EgtMove(nCurrProjId, New Vector3d(0, b3Parts.DimY() + 500, 0))
+         ''            '''   End If
+         ''            '''End While
+         ''            bOk = bOk AndAlso EgtSaveFile(OpenProjectFileDialogVM.SelProject.sProdPath, NGE.CMPTEXT)
+         ''            ' torno sul contesto corrente
+         ''            EgtSetCurrentContext(nCurrCtx)
+         ''            EgtDeleteContext(nTempCtx)
+         ''         End If
+         ''         If bOk Then
+         ''            ' riporto aggiunta proj a prod su Db
+         ''            DbControllers.m_ProdController.AddProj(OpenProjectFileDialogVM.SelProject.nProdId, Map.refProjManagerVM.CurrProj.nProjId)
+         ''            ' imposto currprod
+         ''            Map.refProdManagerVM.SetCurrProd(OpenProjectFileDialogVM.SelProject.nProdId)
+         ''         End If
+         ''      End If
+         ''   Case MessageBoxResult.Cancel
+         ''      Return
+         ''End Select
       End If
       ' vado in pagina prod
       Map.refMainMenuVM.SetSelPage(Pages.MACHINING, False)
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/DxfOut.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/DxfOut.png
deleted file mode 100644
index 85420e4ee23bac29387d7d3335758d9044ed83c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1002
zcmV<G0~P#<P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5dZ)S5dnW>Uy%R+1Aj?GK~z{r?U-9g
z6j2z*zZp$;y|rme5sSAjJ}4O#1kuHUOd=Ft!k&!42P067EMICLgw`$(+k^VhdlxE0
zC=9I32T>wZ3o21bF!NHbTD#-AuG9I(b7I`i&dzKb82N+$&iTGMmp^mPo;^E)EX%Oc
z5b1SA@o$?F1Yv+kR;ixe!h6+3Ei}ZqgvI0<*e+A4qy?@iJt7PcWvXHvv?bvFK3c{P
zr7mGvJ3ZnidE#|WP!C>0ghs20>Q!|Nn+iI8k|bG(@|eto#>U1y>YUYTeN|LcbPCHJ
zk7ta;$)sr=Dc@stupP+_vgu=aB8xH*51vyL={RrZyL)b6?1u|wOHK24b-$e(cey2|
zgNF|LA3c8RWpP?s`XY9zu7^2{KTWu2SYOyL_Rkv^rMb{2-Lh2N{>_4#@XBIBtQeaZ
zE0~yGzIZNfO}E8hxuyBODL?;+P+MCIw;FE#swawqfbBkvdXm~YKU-XrZVUEHhu{+S
zmQYw&2xVnukdcw0#HFRBP+3_CRaI5c+S&>o9UV$u&AGNA=pCG<QE&{I%FfP)xVSh)
zXvXPuD*1|v3cx4C4BG8>a5x-FnGq!l;4H|3omsf-v<dn%gNt!=cCiVkj;5gNxRsW4
z&|3qLdxZu7j?P(V`s!86O$Sn@HzkS1<U7!&BmxL~`ZOVi>dum<h{nPo@}{UE`)jf{
zglR0Yrc{QIaE%!<<z3*fKLuuph74wGrf?(8gvOAmJMY}I6oC2((Wj&a^Oh`9DBr%6
z2!SC}^&=A0v`@p6erdTbF5S29T9O)GE)<5>RKLd$eN(>Wx?BVDwJ}9J9$pw$1Py&O
zqm3a`*K?BKK|u<f*cKmDJZ|qz23xfLp>)?gV>3g}h8QS+=7N(QQ$fW;@-0G5P9lv$
zqubQ}R5LVxbVIka0LNlwMY*EJw^7BVH?y$Y7DJ=Z7@EE>b9gc#2G@z;8XAYA>!X!8
z6e9~u?et>E6k}{kg1f`~sfq+)nflxOKc?7*X>`+MXqt+N0`5xA-E4sydHla`Y@<}m
zC|ag^$Qj#rKI8Wd@$~ySaL$|H>V%(WB8%n=4s!b3;q%L#c+g*K5)vh!EY64NgPb%4
za*|aJ=+=0_ye3L02zK%e`PK!EkqaJ)w-6;@?hojpSEPrS;{J<ReHEmaRa1IdHKh-L
YpC~PQpw@etTL1t607*qoM6N<$f>!j#IRF3v

diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Export.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Export.png
deleted file mode 100644
index 472f5dd99e3c0101383de087b0b03842f3abc28b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1814
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
Ef<fkGO#lD@

diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ExportProject.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ExportProject.png
new file mode 100644
index 0000000000000000000000000000000000000000..06e14450aa154a0a88e7663d1354dd6c815a249c
GIT binary patch
literal 1060
zcmV+<1l#+GP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00004XF*Lt006O%
z3;baP00009a7bBm000XS000XS0e@s)kpKVy8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMGBNQWX_Wu~1EEPoK~z{r&6izB6j2m_=b`MOC70SBq!qFf*GyW8ApcfPgt9;*
ze5(w!T3lTfAF3Di!50ZMFo+_{YReL_qMx-)EyF~NFcrn@$NVYRe_hwYVsGb+bBEd4
ztB~z74t(sr=iE8x+dCI#mm`F%I+#JFVFs0k8B`i(P-&P!rC|n<`T2P@5bH(MtiA{{
zh~SMgcE_(zBXd&}+mz$yO6ebU%+NYm7wfb7BFrFyH(`O$s&9k>u@zI>K1QxR>?LiT
zHiC5_wmPJIbF94Bs*$Se7$+6AU&#BOF$JYsvR&r+4I^S5Wu!o;U=QaarmU18gr%io
z%1KFtC{)aAQd6@IwhTgrWKvWtTg7=t>hjys<%MK2QZOI7$=CBzNOtXaQr$k`O3b1Z
zMJ_|}n$*FXLH>L!1xrd^!=qBqyQlca)iq>a5|$Lk@ymEz3eVH<goC6$9u|wUU`e%o
zogqyhr^PiMlfrL{VmLngsGsLpb-&n%!ji&W!X2h-JSv4}2FFjD2FU5sR&x8*kl2XA
zlES#xrSMIUZ+u0iLM*+++T6jE3MzXeHbbOReZVOlM}n_^aFeoFEGZnvX{FHKqJ$i&
zly6iLtmMevBWZk5Ds|@kMLr&Kx6ehY2x1xlbCkryM6&Zn2fyY{jnyvANjQqVnL>z*
zRQMs{tKP`p7+6xbtkjMTiw#n?apatS@$m(g)|0HPEE14kDVGXm^>zzTP-<Xo&Q7Hw
z4ExE}uqdLAO6GskqL^ID?_>c#-(K`Ul%z->-~ULd;RQT-t8JW@3XhH>DTU>H(}2SJ
zd~t1NiHp?wT@ggJ+aNZV;t?qX3hD8m$AQDi3(<xcC+wUv0^}lL*Wl4QFO*$%V)5>Q
zNhi+zwrGjboX6*oeUS!oBF#ur(=&+4WFk)+TW9e|SZiM_2vQDU92f-t(7tXWa!^dG
z)i(J1`}e>&r?|NI5*EzO&8^7D$gtqpX0zpCPNh;!CnO}i#4)1LXnyGR`gb~=t`pZ8
zjmBJv$C}ONESv-BK)gUW?dc}L0<L>NqhwwMv;fBe4EPA~df*vdCt0rpa1bZVqlEdt
zKRyavDD_%04+C&eE__m{Oko~R*9vj3Nj1r0R{$I!yp#}c24(@=#b6)+C;%`imr4SH
zC}IsdSPr-<0lCy>pbNmmx<-~O1U>^eL4E@_fptPY0-!l5CO$7M=4s$s3-~RO^N}Ow
eqzhLEg!>Bw<<K#8^1h1z0000<MNUMnLSTYUOy17`

literal 0
HcmV?d00001

diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Import.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Import.orig.png
similarity index 100%
rename from EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Import.png
rename to EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Import.orig.png
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportBTL.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportBTL.png
new file mode 100644
index 0000000000000000000000000000000000000000..08877a11f78e8eee57bcd51ca97c51b2ece0fc4f
GIT binary patch
literal 937
zcmV;a16KTrP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00004XF*Lt006O%
z3;baP00009a7bBm000XQ000XQ0h0Lxr2qf`8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMGBNQWX_Wu~113pCK~z{r&DC2-6j2-o@Cme+A~Hef@=yu&WQkpLC@FgAArvtQ
zD}sWEkfN)k6eZ=|>_Qg^D!~vo%|LyyB!dV;i!S<54~4yC>!!H)5Q$rQ`u`7ec4yCi
zyJKWd2Y$@#ch1iFoEg;+Li~4N=r$O-4Tf%mq1#~SHW<1MhHitQ+hF*&jFNdmr>}_x
zhIWm|&EB?R^O@blLbIp2(A<gEGg)LZE@V1O)gLmm-d#1tc-xu?Ek&jeeTT_XVp+&^
zmTEd--Wc|*gQW)Q*9*Ff_tE$MX(@hGsF1>U@p*Zq87bBOzFT;`-YJ`rQeQv!3IDK9
zG@aZ4?~D$WQginXM}HR;7%Hk1|MYKLuF3aEJ-S#>DbD%*q~F}TXfHb$DqL#x=|SQ5
z`$cE%u87T}iB_t++8n#SFMTQ6%MOMLm-2O8l#i~nY)i!EI$1{1N-6pt2n-cj>P>@u
zbp5x}VG+BCGP>z1HQ4(=w3p|>61q)oM)YEoC!C#2m!*#mV5o2@@26K&dUOgb#-C5k
zqDzLZ9SaN<F7>*(LVUQH0SiPER*a5&J%*tFl`Uuw1cnNi>ZsiVH+G_m@$qGiDLlu_
zOtc3AL*;R0ZqJjltq~iJwWNvux)f>1lNvTR(wG{YyHsb$<DG&upJ5nF7+=>qPuBNS
zV5qcTIWUACUEan7zH(5~{5Wwsf1#W^nv)bZ2gH*~GJy7EFjQL4=k#?{<pp$^DT^l-
zCC-`T^G6li16di%CwRll1)G0z)_g8o$~Kc_UYfu92ptp20=_N{E;Xp{r@+t&jYjfO
z%f?BrmemkC4P{o&rH1refuR!`VWntnBYd(_TNkU;h@LAjbV7qm1xOcpK{%`c>tdA}
z)pG@gPH4zGMfQ{3gg4=dVr`ww?U|KVk?(r0z|aW|^iFYsFIrYg=rojBIhPvKa|MP@
zXrNMO$Tux3A;0XIm2;_po+~hPLPI^i6_y=jnAB_Qxahb&v+`=fe=gSAtP0NC7f%(9
z2Er%GAh`wB6_Fnxzd-EYXRX0``{F-AW40w8%`3bH<*~rfUBdVcy#!cp40m0^00000
LNkvXXu0mjfMT4d>

literal 0
HcmV?d00001

diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportBTL1.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportBTL1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff4e88567a878dc1fafb8102f70e086377980123
GIT binary patch
literal 738
zcmV<80v-K{P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00004XF*Lt006O%
z3;baP00009a7bBm000id000id0mpBsWB>pF8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMGBNQWX_Wu~0$)i)K~z{r&63Yc6k!<0C+HY~e?fTdCS~b#5IT5~PC*b95yT2!
z1OugmbjbCf8w^5Vbg+d$QiJfYqOJ&GijhAe^s;P+%28Tas#}+yp7$LeW_;&6>qeXJ
z96r4Je&2VV=d<&SLqw?qhPHvBZD42{7}^Ggwt=B-U}zf{+6IRIiu3R+nV5HK0mCTs
zqqphp)1D(NkKLosTZ?>*pV1<}Plq&8>dVI!+Va}z*X)HDbC0_C3Vu#YQFBNmr8ZyX
zs503KrM~7b(Q1B>uf?DHuTpAMNJvm`@l7_)iAa@q*2wq$x;YW4y-y#gS~;Mp`&Zzb
zF+oytHuWI+TNGd@h?M&Go3F?8cO;{$1(H&^`aU;aX1R3O0|7%pNqt}HrfRiH#oWzU
z^CXg_)*pA!kBZNw!yX723QFo=WmJ!@ICM4E+(gR=hLm9TK)_JYQX4Py=*rJ7Ly;&k
z8Iwjy?Qc(0A$uK4m~_lK$zq&04W8k$ygddO3QEc^y{l_<0u)pG{!?5stX&Hj3QFqz
z%rNafX@deu91-L7&ZI-D6a8E=-U9(cK}pT$Zo$UKA!2G>A8Ds=<!vsB`<TE`Sj!L4
z;!r1SS`QN}q}GMuYg`WZK)_Haj`#ib=uCdjT%@_&T`q@vAYdpgkN48T$c<zMTIf8N
zaD;O$^qli-TO>Qg^-5IoT)mooOkh|yC68R!Bi)Agg^WX)LhxImB+R`9DVKtt!MQ!D
z!|`Y$f{IkUDJo>h2`uz^Dx_4?bV$kQG#LsUf^#I5bT>*YNCPmm4Ge7qL%Wdk2Qb7{
UU%H&dr2qf`07*qoM6N<$f=*pWi~s-t

literal 0
HcmV?d00001

diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportProject.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportProject.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b9318cd82f848418391eee5a7f9dd8bad7ca8bb
GIT binary patch
literal 996
zcmV<A0~`E_P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00004XF*Lt006O%
z3;baP00009a7bBm000XQ000XQ0h0Lxr2qf`8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMGBNQWX_Wu~17S%-K~z{r&DL8;6j2-o@D0o$GP)qq<w0M}A|E76r!q0AUIa1e
zict?mkRn-9frJL$DkZUkG7JpCOB$Pmc<myU7F`s&JcL1HDj7>95vh6l{==O0c=o?*
z(CT{N$DaAl%$(1iv9t*xW*j#3H8%7$HuN<%^ffm0H8%7$HuN<%^ffm8U$(6ILZ_eO
z2^*@a(~YkB)5Zf;U53$Fn_=wX&L?J(F~4!%ELEOj#J?&w#P9mGF6^g_0qz=NmJ-3^
zyjiN|xN&)~avfW$w|u?8w^+qpH>IWMQE`PN`WD-BT}?}=o;Mw$udnZ)O-rfIAG(EO
za6r_Y*vNh}I<AylyP4|#U6j~RlBMXUe`zl<-y`|xJmE@FPVXmvbIZ8BRBR|wsc&sZ
zgu~$wt%ZACHh0Hesg85TuS*9bgSfp^Y$#Ewfkzk2N7tIO#btAySw_-IN%|ffHk8a#
zFDlGO*K<9REuwNMqw`j&{;pf1AvcLFp^K@vxi5x%;hA~3Ee<Eah7y(Pd;jd89-YJ%
zqvMmaaLe&~d%}him3m&AC*EF(Vhgx4p%^|7RN4goue5V}aM)0yQcZ=)?8cLk#pv_t
zc|%klGoraYIBY02<|lTx<ZKh)Ys1C6(lzYn?s8Ia)h3=4g^G%_h<^Rv7%OznHT6VY
z!^Oj2=+W)oyol~1j>ZR0*z`tvkeLtFg-^({lb4Cb0r-;zYl?bUK=;MiWM#S}b6qW=
zyK^?7yQv^)I67?kpMbgk=7pu{TSq7(89O6JDZ87KXdaV@kR@Z3W$ud{y`7yfjDNw0
zQnrU=A}fMex-W(-6{hcLu5+OdqZ*o^4Jwp;KhVVAI!?2WqvSap46l`Hh8;jbjFs!9
zsC1)xEeFFZrK+ISnzul+HP=ghggoWCdr$(!mep1+OZ|ke@Cinp*U5<|7*wjwn#Tf7
zc7a~17xI<sUPA@gfdc)VIs|bR!+D*Yc!EKt?kmSN&;i`zYmnzD=Z6AKy!xV3sfWsO
zIMAfb`jn+ot>ZX(u9Z(&sdg>91~egNDJy>rKY+f)RS*nWK#O{*1Xw9K?;$6iU{r!$
zDiG+Mp_kQ9Tg!$XpaU`j<uJ!u-vDw=m13@|H}f`(*|5~jn!nDurk*%62-{zvxwe#S
SC5vtV0000<MNUMnLSTZmQ_o8P

literal 0
HcmV?d00001

diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportProject1.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportProject1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b257d28ee414d8c1a7dd0e27893792d51ea6e9f7
GIT binary patch
literal 807
zcmV+?1K9kDP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00004XF*Lt006O%
z3;baP00009a7bBm000id000id0mpBsWB>pF8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMGBNQWX_Wu~0;EYqK~z{r&6CY*6G0e<SMVr;;6LECH}R`ok%9;DgPsIIP>LWc
zdJz;FJQNQ$J+u*)f>7~L0z$E^AU$kp8!1R_sn`z@y@Yu1BNhWey?OEVok`wJcJ{YP
z#F**fVKcv(dEaMeHVzT(IACZS7}^Ggwt=B-U}zf{+6IQUfuU_+_^&v3_mYXZrV%i#
zXMXfDy?l5h!qV7P`nb8s(|C^-`MtYFJEcCoU8YUHhknf-iZOTZ952E9v=kkv(N3w2
zrx_|u9)VJyvqxzqJIKr8`~Itxx+)|js8f8Aj?)pT!n;)}7K<&@5vea9-cY%;O;fjz
z!;>*VQZhGnC;3|xU?_-`di#xMWBNOit7`<3Qn~s**Po=hbgc&hhJup%{`?x1%Vo-C
zF2<TCktDTtzn6ZLid?$Z0|7%pNo_BW>Z{8Qos2a%(K3P|C73-BFch@Z`eS`{g-6Gr
zNIfwblXgjc-I}H#eI81f^v*iTVw~?A+{0yg*aR2~N~)ND)zZ}oP)v;nc5%sC?MA>*
zP*SgFhUxu-ZYYpMM2w&PlMby+3~<SK4+IPaB{iS91RFO)#ME<bq=&v0wzwqjV**2A
zHJhTvp;NGFD@?GEdM*t2aXH)r0Yf1-e(SHV&gAFJVVcWa;c~bK0*1oU_)S_ExezCH
zkh*wlSKpa1OLy<5>nT}tg3j{16LOjYE=YNw+(^!NdM460GH4l9-1EqDyh=090?#Es
zuYLxcJ5=daT_1Sls!6ra^+_+2IRFfsqNM_UxZ#_MRDBks6H=@|zFU#0m(r)A*6|6+
zHH9Zt9Y=Dbeq_)xp%njCjrn(@lL|#Ub5fOY;HkGx{-&%*>2W9}<N9l={vl#HW1OlY
lGT14=&^9o%4Gir<&L3zjLvHvvoNWLA002ovPDHLkV1h*%VZ8tV

literal 0
HcmV?d00001