From 204ddf94a8637b06840ae400c2bd6337a7c337a8 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.p@egaltech.com>
Date: Mon, 1 Feb 2021 11:00:16 +0000
Subject: [PATCH] OmagOFFICE 2.3b1: -> aggiunto il comando FiloTop nella pagina
 di importazione DXF.

---
 DxfImportWindow/DxfImportSceneHostV.xaml.vb |  4 ++
 DxfImportWindow/DxfImportWindowV.xaml       | 20 +++++--
 DxfImportWindow/DxfImportWindowVM.vb        | 65 +++++++++++++++++++--
 My Project/AssemblyInfo.vb                  |  4 +-
 SideEntityControl/SideEntityControlVM.vb    |  1 +
 5 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/DxfImportWindow/DxfImportSceneHostV.xaml.vb b/DxfImportWindow/DxfImportSceneHostV.xaml.vb
index b48495f..2057b4b 100644
--- a/DxfImportWindow/DxfImportSceneHostV.xaml.vb
+++ b/DxfImportWindow/DxfImportSceneHostV.xaml.vb
@@ -114,6 +114,8 @@ Public Class DxfImportSceneHostV
       ' Solo se in modalità angoli o gocciolatoio su lati esterni
       If DxfImportWindowMap.refDxfImportWindowVM.SideAngle_IsChecked Or DxfImportWindowMap.refDxfImportWindowVM.Drip_IsChecked Then
          OnMouseDownSceneSideAngle(e)
+      ElseIf DxfImportWindowMap.refDxfImportWindowVM.FiloTop_IsChecked Then
+         OnMouseDownSceneFiloTop(e)
       ElseIf DxfImportWindowMap.refDxfImportWindowVM.UnderDrill_IsChecked Then
          OnMouseDownSceneUnderDrill(e)
       End If
@@ -169,6 +171,8 @@ Public Class DxfImportSceneHostV
       End While
    End Sub
 
+
+
    Private Sub OnMouseDownSceneUnderDrill(e As System.Windows.Forms.MouseEventArgs)
       ' Solo con il tasto sinistro e se stato NULL
       If e.Button <> Windows.Forms.MouseButtons.Left Or Not ImportDxfScene.IsStatusNull() Then Return
diff --git a/DxfImportWindow/DxfImportWindowV.xaml b/DxfImportWindow/DxfImportWindowV.xaml
index d65e8cb..5ae581e 100644
--- a/DxfImportWindow/DxfImportWindowV.xaml
+++ b/DxfImportWindow/DxfImportWindowV.xaml
@@ -80,18 +80,26 @@
             </UniformGrid>
          </GroupBox>
 
-         <UniformGrid Columns="3"
+         <UniformGrid Columns="4"
                    DockPanel.Dock="Top"
                    IsEnabled="{Binding SideEntity_IsEnabled}"
-                   Margin="0,0,0,5">
+                   Margin="0,0,0,5">             
+            <!--Inclina lati-->
             <ToggleButton Content="{Binding SideAngleMsg}"
                        IsChecked="{Binding SideAngle_IsChecked}"
                        Style="{StaticResource CompoWindow_WrapToggleButton}"/>
+
+            <!--Filo Top-->
+            <ToggleButton Content="{Binding FiloTopMsg}"
+                   IsChecked="{Binding FiloTop_IsChecked}"
+                   Style="{StaticResource CompoWindow_WrapToggleButton}"/>
+
+                <!--Incidi da sotto-->
             <ToggleButton Content="{Binding DripMsg}"
-                       IsChecked="{Binding Drip_IsChecked}"
-                       Style="{StaticResource CompoWindow_WrapToggleButton}"
-                       IsEnabled="{Binding Drip_IsEnabled}"
-                       />
+                      IsChecked="{Binding Drip_IsChecked}"
+                      Style="{StaticResource CompoWindow_WrapToggleButton}"
+                      IsEnabled="{Binding Drip_IsEnabled}"/>
+            <!--Fora da sotto-->
             <ToggleButton Content="{Binding UnderDrillMsg}"
                        IsChecked="{Binding UnderDrill_IsChecked}"
                        Style="{StaticResource CompoWindow_WrapToggleButton}"
diff --git a/DxfImportWindow/DxfImportWindowVM.vb b/DxfImportWindow/DxfImportWindowVM.vb
index 0e16eb6..fcd7957 100644
--- a/DxfImportWindow/DxfImportWindowVM.vb
+++ b/DxfImportWindow/DxfImportWindowVM.vb
@@ -142,7 +142,7 @@ Public Class DxfImportWindowVM
          Return m_SideAngle_IsChecked
       End Get
       Set(value As Boolean)
-         If m_Drip_IsChecked Or m_UnderDrill_IsChecked Then Return
+         If m_Drip_IsChecked Or m_UnderDrill_IsChecked Or m_FiloTop_IsChecked Then Return
          m_SideAngle_IsChecked = value
          If value Then
             ' Aggiungo regioni per percorsi interni
@@ -184,13 +184,62 @@ Public Class DxfImportWindowVM
       End Set
    End Property
 
+   Private m_FiloTop_IsChecked As Boolean
+   Public Property FiloTop_IsChecked As Boolean
+      Get
+         Return m_FiloTop_IsChecked
+      End Get
+      Set(value As Boolean)
+         If m_SideAngle_IsChecked Or m_Drip_IsChecked Or m_UnderDrill_IsChecked Then Return
+         m_FiloTop_IsChecked = value
+         If value Then
+            ' Aggiungo regioni per percorsi interni
+            AdjustSelectRegions()
+            ' Messaggio di selezione contorno
+            SetOutputMessage(EgtMsg(MSG_DRAWPAGEUC + 6), MSG_TYPE.INFO)     ' Selezionare un contorno
+            ' Imposto modalità FiloTop
+            m_SideEntityControlVM = New SideEntityControlVM(SideEntityControlVM.CallingWindowOpt.DXFIMPORT,
+                                                            DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene,
+                                                            SideEntityControlVM.ModeOpt.FILOTOP)
+            SideEntityControl = New SideEntityControlV(m_SideEntityControlVM)
+            SideEntityControl = New SideEntityControlV(m_SideEntityControlVM)
+            Open_IsEnabled = False
+            Type_IsEnabled = False
+            Measure_IsEnabled = False
+            PartData_Visibility = Visibility.Collapsed
+            OrderList_Visibility = Visibility.Collapsed
+            OkIsEnabled = False
+         Else
+            ' Rimuovo regioni per percorsi interni
+            RemoveSelectRegions()
+            m_SideEntityControlVM.Close()
+            Open_IsEnabled = True
+            Type_IsEnabled = True
+            Measure_IsEnabled = True
+            PartData_Visibility = Visibility.Visible
+            OrderList_Visibility = Visibility.Visible
+            OkIsEnabled = True
+            m_SideEntityControlVM = Nothing
+            SideEntityControl = Nothing
+            ' Elimino scritte angoli per input e inserisco quelle definitive
+            SideEntityControlVM.WriteSideAngleForNest(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx())
+            ' Deseleziono tutto
+            DxfImportWindowMap.refDxfImportSceneHostV.Deselect()
+            ' Pulisco area messaggi
+            ClearOutputMessage()
+         End If
+         NotifyPropertyChanged("FiloTop_IsChecked")
+         EgtZoom(ZM.ALL)
+      End Set
+   End Property
+
    Private m_Drip_IsChecked As Boolean
    Public Property Drip_IsChecked As Boolean
       Get
          Return m_Drip_IsChecked
       End Get
       Set(value As Boolean)
-         If m_SideAngle_IsChecked Or m_UnderDrill_IsChecked Then Return
+         If m_SideAngle_IsChecked Or m_UnderDrill_IsChecked Or m_FiloTop_IsChecked Then Return
          m_Drip_IsChecked = value
          If value Then
             ' Messaggio di selezione contorno
@@ -234,7 +283,7 @@ Public Class DxfImportWindowVM
          Return m_UnderDrill_IsChecked
       End Get
       Set(value As Boolean)
-         If m_SideAngle_IsChecked Or m_Drip_IsChecked Then Return
+         If m_SideAngle_IsChecked Or m_Drip_IsChecked Or m_FiloTop_IsChecked Then Return
          m_UnderDrill_IsChecked = value
          If value Then
             ' Aggiungo regioni di selezione per percorsi interni
@@ -541,6 +590,12 @@ Public Class DxfImportWindowVM
       End Get
    End Property
 
+   Public ReadOnly Property FiloTopMsg As String
+      Get
+         Return EgtMsg(90400)   ' FiloTop
+      End Get
+   End Property
+
 #End Region    ' Messages
 
    ' Definizione comandi
@@ -760,7 +815,7 @@ Public Class DxfImportWindowVM
 
    Friend Sub SelectedPartChanged()
       ' Se sono in modalità inclinazioni o gocciolatoio calcolo lati inclinabili e creo testi
-      If SideAngle_IsChecked() Or Drip_IsChecked() Then
+      If SideAngle_IsChecked() Or Drip_IsChecked() Or FiloTop_IsChecked Then
          m_SideEntityControlVM.ReLoadSideAnglePage(SideEntityControlVM.CallingWindowOpt.DXFIMPORT)
       End If
    End Sub
@@ -806,7 +861,7 @@ Public Class DxfImportWindowVM
          Dim nCrvId As Integer = EgtGetFirstInGroup(nIntLayId)
          While nCrvId <> GDB_ID.NULL
             Dim nType As Integer = EgtGetType(nCrvId)
-            If (UnderDrill_IsChecked And nType = GDB_TY.CRV_ARC) Or (SideAngle_IsChecked And (nType = GDB_TY.CRV_LINE Or nType = GDB_TY.CRV_ARC Or nType = GDB_TY.CRV_COMPO)) Then
+            If (UnderDrill_IsChecked And nType = GDB_TY.CRV_ARC) Or ((SideAngle_IsChecked Or FiloTop_IsChecked) And (nType = GDB_TY.CRV_LINE Or nType = GDB_TY.CRV_ARC Or nType = GDB_TY.CRV_COMPO)) Then
                vCrvId.Add(nCrvId)
             End If
             nCrvId = EgtGetNext(nCrvId)
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 0b20514..e5a1c8a 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.3.1.1")>
-<Assembly: AssemblyFileVersion("2.3.1.1")>
+<Assembly: AssemblyVersion("2.3.2.1")>
+<Assembly: AssemblyFileVersion("2.3.2.1")>
 
diff --git a/SideEntityControl/SideEntityControlVM.vb b/SideEntityControl/SideEntityControlVM.vb
index 9d219b5..2483722 100644
--- a/SideEntityControl/SideEntityControlVM.vb
+++ b/SideEntityControl/SideEntityControlVM.vb
@@ -478,6 +478,7 @@ Public Class SideEntityControlVM
       Dim ptMin, ptMax As Point3d
       EgtGetBBoxGlob(LoopId, GDB_BB.STANDARD, ptMin, ptMax)
       Dim dBBoxRad As Double = 0.5 * Point3d.DistXY(ptMin, ptMax)
+
       ' Creo layer per testi se non esiste già
       Dim TextLayer As Integer = EgtGetFirstNameInGroup(PartId, SIDE_ANGLE_LAYER)
       If TextLayer = GDB_ID.NULL Then