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 @@ - + Margin="0,0,0,5"> + + + + + + + IsChecked="{Binding Drip_IsChecked}" + Style="{StaticResource CompoWindow_WrapToggleButton}" + IsEnabled="{Binding Drip_IsEnabled}"/> + 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: ' - - + + 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