diff --git a/Icarus/MachiningDb/Machining.vb b/Icarus/MachiningDb/Machining.vb index 10093fc..cd7ff91 100644 --- a/Icarus/MachiningDb/Machining.vb +++ b/Icarus/MachiningDb/Machining.vb @@ -1028,7 +1028,7 @@ Public Class ComboMachiningParam Friend Overrides Sub WriteParamOnDb(nIndex As Integer) Select Case Type Case Params.SLICINGTYPE - WriteMachiningParam(nIndex, MAC_SLICING45, m_SelValue.Id) + WriteMachiningParam(nIndex, MAC_SLICINGTYPE, m_SelValue.Id) Case Params.STRANDORDER WriteMachiningParam(nIndex, MAC_STRANDORDER, m_SelValue.Id) Case Params.DIRECTION diff --git a/Icarus/MaterialDb/Material.vb b/Icarus/MaterialDb/Material.vb index 13905b2..471bd98 100644 --- a/Icarus/MaterialDb/Material.vb +++ b/Icarus/MaterialDb/Material.vb @@ -204,7 +204,7 @@ Public Class Material End Sub Private Sub ReadAllParams() - 'm_bSlicing45 = ReadMaterialParamDouble(m_nIndex, MAC_SLICING45, 0, CurrentMachine.sMachiningFilePath) + 'm_nSlicingType = ReadMaterialParamDouble(m_nIndex, MAC_SLICINGTYPE, 0, CurrentMachine.sMachiningFilePath) 'm_dStrandH = ReadMaterialParamDouble(m_nIndex, MAC_STRANDH, 0, CurrentMachine.sMachiningFilePath) 'm_dStrandW = ReadMaterialParamDouble(m_nIndex, MAC_STRANDW, 0, CurrentMachine.sMachiningFilePath) 'm_nStrandCount = ReadMaterialParamDouble(m_nIndex, MAC_STRANDCOUNT, 0, CurrentMachine.sMachiningFilePath) @@ -871,16 +871,12 @@ Public Class CheckMaterialParam Sub New(Type As Params, nIndex As Integer) MyBase.New(Type) Select Case Type - 'Case Params.SLICING45 - ' m_bValue = ReadMaterialParamDouble(nIndex, MAC_SLICING45, 0) End Select m_bOrigValue = m_bValue End Sub Friend Overrides Sub WriteParamOnDb(nIndex As Integer) Select Case Type - 'Case Params.SLICING45 - ' WriteMaterialParam(nIndex, MAC_SLICING45, If(m_bValue, 1, 0)) End Select End Sub diff --git a/Icarus/My Project/AssemblyInfo.vb b/Icarus/My Project/AssemblyInfo.vb index 3948cd3..02f49b1 100644 --- a/Icarus/My Project/AssemblyInfo.vb +++ b/Icarus/My Project/AssemblyInfo.vb @@ -60,5 +60,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb index b7fce01..7f52fec 100644 --- a/Icarus/SceneHost/MySceneHostVM.vb +++ b/Icarus/SceneHost/MySceneHostVM.vb @@ -1235,19 +1235,35 @@ Public Class MySceneHostVM EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel) Dim nId As Integer = EgtGetFirstObjInSelWin() While nId <> GDB_ID.NULL - ' Recupero l'identificativo del pezzo cui appartiene - Dim nPartId As Integer = EgtGetParent(nId) - Dim bFound As Boolean = False - If nPartId = Map.refStartMachPanelVM.nStartMachLayerId Then bFound = True - If Not bFound Then - nId = EgtGetNextObjInSelWin() - Continue While + ' Se per Griglia da faccia di oggetto + If Map.refStartMachPanelVM.bCPlaneObj_IsActive Then + If EgtGetType( nId) = GDB_TY.SRF_MESH Then + m_nIdToSel = nId + Exit While + End If + Else + ' Recupero l'identificativo del pezzo cui appartiene + Dim nPartId As Integer = EgtGetParent(nId) + Dim bFound As Boolean = False + If nPartId = Map.refStartMachPanelVM.nStartMachLayerId Then bFound = True + If bFound Then + m_nIdToSel = nId + Exit While + End If End If - ' Memorizzo Id da selezionare - m_nIdToSel = nId - 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 @@ -1268,10 +1284,22 @@ Public Class MySceneHostVM Friend Sub StartMach_OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) ' Se eseguito drag If Not m_bDragToStart Then - ' Se selezione da eseguire + + ' Se selezione da eseguire ElseIf m_nIdToSel <> GDB_ID.NULL Then - ' Eseguo la selezione - Map.refStartMachPanelVM.SelStartFromId(m_nIdToSel) + If Map.refStartMachPanelVM.bCPlaneObj_IsActive Then + ' eseguo comando + Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_OBJ) + Map.refStartMachPanelVM.ResetCPlaneObjIsActive() + ' ripristino selezioni precedenti + For Each Id In Map.refStartMachPanelVM.PrevSelObjs + EgtSelectObj(Id) + Next + Map.refControllerInputPanelVM.ResetInputBox() + Else + ' Eseguo la selezione + Map.refStartMachPanelVM.SelStartFromId(m_nIdToSel) + End If End If ' Reset m_bDrag = False diff --git a/Icarus/SecondaryWindow/SecondaryWindowVM.vb b/Icarus/SecondaryWindow/SecondaryWindowVM.vb index 514b4dd..500a4cb 100644 --- a/Icarus/SecondaryWindow/SecondaryWindowVM.vb +++ b/Icarus/SecondaryWindow/SecondaryWindowVM.vb @@ -83,7 +83,7 @@ Public Class SecondaryWindowVM End Sub Private Sub SplashScreenTimer_Tick() - If m_WaitAfterRender > 4 Then + If m_WaitAfterRender > 2 Then ' chiudo SplashScreen Map.refSplashScreen.Close() ElseIf m_WaitAfterRender >= 1 Then diff --git a/Icarus/StartMachPanel/StartMachPanelV.xaml b/Icarus/StartMachPanel/StartMachPanelV.xaml index b6e15c0..0232961 100644 --- a/Icarus/StartMachPanel/StartMachPanelV.xaml +++ b/Icarus/StartMachPanel/StartMachPanelV.xaml @@ -207,6 +207,7 @@ + +