From 68ee954dd3ad6625d623fc5e2681f30214d2c1ad Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Thu, 27 Oct 2022 20:15:46 +0200
Subject: [PATCH] Icarus : - modifiche per griglia su oggetto e per terna su
 griglia.

---
 Icarus/SceneHost/MySceneHostVM.vb             | 16 +++++++++++---
 .../ShellNumberPanel/ShellNumberPanelV.xaml   | 22 +++++--------------
 Icarus/ShellNumberPanel/ShellNumberPanelVM.vb |  2 +-
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb
index f7e558e..81cf408 100644
--- a/Icarus/SceneHost/MySceneHostVM.vb
+++ b/Icarus/SceneHost/MySceneHostVM.vb
@@ -209,7 +209,7 @@ Public Class MySceneHostVM
          EgtSetGridGeo(dSnapStepInch, nMinLineSStep, nMajLineSStep, nExtSStep)
       End If
       EgtSetGridColor(MinLnColor, MajLnColor)
-      EgtSetGridShow(True, False)
+      EgtSetGridShow(True, True)
       ' imposto tipo coordinate
       MainScene.SetGridCursorPos(True)
       ' modo di visualizzazione
@@ -1329,6 +1329,7 @@ Public Class MySceneHostVM
 #Region "ShellNumber"
 
    Friend Sub ShellNumber_OnMouseDownScene(sender As Object, e As Forms.MouseEventArgs)
+      m_nIdToSel = GDB_ID.NULL
       ' Verifico se selezionato indicativo di pezzo
       EgtSetObjFilterForSelWin(True, True, True, True, True)
       Dim nSel As Integer
@@ -1348,6 +1349,17 @@ Public Class MySceneHostVM
          Exit While
          nId = EgtGetNextObjInSelWin()
       End While
+      If m_nIdToSel <> GDB_ID.NULL Then
+         ' recupero dati punto di selezione
+         Dim PtTemp As Point3d
+         Dim nAux As Integer
+         If EgtGetPointFromSelect(m_nIdToSel, e.Location, PtTemp, nAux) Then
+            ' eseguo la selezione
+            EgtSelectObj(m_nIdToSel)
+            ' dati ausiliari
+            EgtSetSelInfo(m_nIdToSel, nAux, PtTemp)
+         End If
+      End If
       ' Dati per drag
       m_bDragToStart = True
    End Sub
@@ -1371,8 +1383,6 @@ Public Class MySceneHostVM
          ' Se selezione da eseguire
       ElseIf m_nIdToSel <> GDB_ID.NULL Then
          If Map.refShellNumberPanelVM.bCPlaneObj_IsActive Then
-            ' eseguo la selezione
-            EgtSelectObj(m_nIdToSel)
             ' eseguo comando
             Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_OBJ)
             Map.refShellNumberPanelVM.ResetCPlaneObjIsActive()
diff --git a/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml b/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
index 906e4dc..0f27c76 100644
--- a/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
+++ b/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
@@ -269,30 +269,18 @@
                     Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>
          </Button>
-         <Button Grid.Column="7" 
-                    Command="{Binding CPlaneRotate_Command}" 
-                    ToolTip="{Binding CPlaneRotateToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneROTATE.png" Stretch="Uniform"/>
-         </Button>
-         <Button Grid.Column="8"
-                    Command="{Binding CPlane3P_Command}"
-                    ToolTip="{Binding CPlane3PToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CPlane3POINTS.png" Stretch="Uniform"/>
-         </Button>
          <Button Grid.Column="9"
-                    Command="{Binding CPlanePerpObj_Command}"
-                    ToolTip="{Binding CPlanePerpObjToolTip}" 
+                    Command="{Binding CPlaneOrigin_Command}"
+                    ToolTip="{Binding CPlaneOriginToolTip}" 
                     Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CPlanePERPCURVE.png" Stretch="Uniform"/>
+            <Image Source="/Resources/GridViewPanel/CPlaneORIGIN.png" Stretch="Uniform"/>
          </Button>
-         <!--<Button Grid.Column="10"
+         <Button Grid.Column="10"
                     Command="{Binding CPlaneObj_Command}"
                     ToolTip="{Binding CPlaneObjToolTip}" 
                     Style="{StaticResource ToolBar_Button}">
                <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
-            </Button>-->
+            </Button>
       </Grid>
    </Border>
    <!--<Popup IsOpen="{Binding IsChecked, ElementName=GridBtn}"
diff --git a/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb b/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
index 6cfff72..a58dfd5 100644
--- a/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
+++ b/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
@@ -1173,7 +1173,7 @@ Public Class ShellNumberPanelVM
       End While
       EgtDeselectAll()
       m_bCPlaneObj_IsActive = True
-      Map.refControllerInputPanelVM.PrepareInputBox("Grid from Selection", "Select the face of the object where to place the grid", "", False, False)
+    '  Map.refControllerInputPanelVM.PrepareInputBox("Grid from Selection", "Select the face of the object where to place the grid", "", False, False)
    End Sub
 
 #End Region ' CPlaneObj