diff --git a/Controller.vb b/Controller.vb index 7e9b2c1..896ddb7 100644 --- a/Controller.vb +++ b/Controller.vb @@ -4330,7 +4330,7 @@ Public Class Controller m_nStep = 1 m_Scene.SetStatusNull() ' abilito dialogo - RaiseEvent PrepareInputBox("CURVE THICKNESS", "Insert Thickness", "Extraction from CPlane", False, True) + RaiseEvent PrepareInputBox("CURVE THICKNESS", "Insert Thickness", "Extrusion from CPlane", False, True) m_nInpType = IBT.TY_LENGTH ' recupero spessore dell'ultima entità selezionata Dim dThick As Double diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index f9abf71..4cce284 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices ' utilizzando l'asterisco (*) come descritto di seguito: ' - - + + diff --git a/Scene.Designer.vb b/Scene.Designer.vb index 60ea9a0..d7fb9f9 100644 --- a/Scene.Designer.vb +++ b/Scene.Designer.vb @@ -49,17 +49,18 @@ Partial Class Scene Me.cmdExcludeSurfFromSnap = New System.Windows.Forms.ToolStripMenuItem() Me.sepSelPnt2 = New System.Windows.Forms.ToolStripSeparator() Me.cmdStopDrag = New System.Windows.Forms.ToolStripMenuItem() + Me.cmdSelectEntity = New System.Windows.Forms.ToolStripMenuItem() Me.MenuScene.SuspendLayout() Me.SuspendLayout() ' 'MenuScene ' - Me.MenuScene.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cmdSelectAll, Me.cmdDeselectAll, Me.sepSel1, Me.cmdWinSelect, Me.cmdSelectPart, Me.cmdSelectLayer, Me.cmdSelectPath, Me.cmdSelectPathAuto, Me.cmdRestartDrag, Me.cmdSketchPoint, Me.cmdGridPoint, Me.cmdEndPoint, Me.cmdMidPoint, Me.cmdCenterPoint, Me.cmdCentroid, Me.cmdNearPoint, Me.cmdIntersectionPoint, Me.cmdTangentPoint, Me.cmdPerpendicularPoint, Me.cmdMinDistPoint, Me.sepSelPnt1, Me.cmdExcludeSurfFromSel, Me.cmdExcludeSurfFromSnap, Me.sepSelPnt2, Me.cmdStopDrag}) + Me.MenuScene.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cmdSelectAll, Me.cmdDeselectAll, Me.sepSel1, Me.cmdWinSelect, Me.cmdSelectPart, Me.cmdSelectLayer, Me.cmdSelectPath, Me.cmdSelectPathAuto, Me.cmdSelectEntity, Me.cmdRestartDrag, Me.cmdSketchPoint, Me.cmdGridPoint, Me.cmdEndPoint, Me.cmdMidPoint, Me.cmdCenterPoint, Me.cmdCentroid, Me.cmdNearPoint, Me.cmdIntersectionPoint, Me.cmdTangentPoint, Me.cmdPerpendicularPoint, Me.cmdMinDistPoint, Me.sepSelPnt1, Me.cmdExcludeSurfFromSel, Me.cmdExcludeSurfFromSnap, Me.sepSelPnt2, Me.cmdStopDrag}) Me.MenuScene.Name = "ContextMenuStrip1" Me.MenuScene.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional Me.MenuScene.ShowCheckMargin = True Me.MenuScene.ShowImageMargin = False - Me.MenuScene.Size = New System.Drawing.Size(193, 506) + Me.MenuScene.Size = New System.Drawing.Size(193, 550) ' 'cmdSelectAll ' @@ -88,12 +89,14 @@ Partial Class Scene 'cmdSelectPart ' Me.cmdSelectPart.Name = "cmdSelectPart" + Me.cmdSelectPart.ShortcutKeyDisplayString = "Alt" Me.cmdSelectPart.Size = New System.Drawing.Size(192, 22) Me.cmdSelectPart.Text = "Select Part" ' 'cmdSelectLayer ' Me.cmdSelectLayer.Name = "cmdSelectLayer" + Me.cmdSelectLayer.ShortcutKeyDisplayString = "Ctrl + Alt" Me.cmdSelectLayer.Size = New System.Drawing.Size(192, 22) Me.cmdSelectLayer.Text = "Select Layer" ' @@ -221,6 +224,12 @@ Partial Class Scene Me.cmdStopDrag.Size = New System.Drawing.Size(192, 22) Me.cmdStopDrag.Text = "Drag Off" ' + 'cmdSelectEntity + ' + Me.cmdSelectEntity.Name = "cmdSelectEntity" + Me.cmdSelectEntity.Size = New System.Drawing.Size(192, 22) + Me.cmdSelectEntity.Text = "Select Entity" + ' 'Scene ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -259,5 +268,6 @@ End Sub Friend WithEvents cmdSelectPath As System.Windows.Forms.ToolStripMenuItem Friend WithEvents cmdSelectPathAuto As System.Windows.Forms.ToolStripMenuItem Friend WithEvents cmdExcludeSurfFromSel As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents cmdSelectEntity As System.Windows.Forms.ToolStripMenuItem End Class diff --git a/Scene.vb b/Scene.vb index 01d39b1..aab8ab9 100644 --- a/Scene.vb +++ b/Scene.vb @@ -1,7 +1,7 @@ '---------------------------------------------------------------------------- -' EgalTech 2014-2015 +' EgalTech 2014-2017 '---------------------------------------------------------------------------- -' File : Scene.vb Data : 27.01.15 Versione : 1.6a6 +' File : Scene.vb Data : 01.09.17 Versione : 1.8i1 ' Contenuto : Classe Scene (parte di MVC). ' ' @@ -55,7 +55,7 @@ Public Class Scene Private m_bSurfForSnap As Boolean = False ' abilita le superfici per lo snap a punto Private m_bVolumeForSnap As Boolean = False ' abilita i solidi per lo snap a punto Private m_bExtraForSnap As Boolean = False ' abilita testi/quote per lo snap a punto - Private m_bExcludeSurfInSelMenu As Boolean = False ' abilita visualizzazione voce Escudi superfici in menù contestuale + Private m_bExcludeSurfInSelMenu As Boolean = False ' abilita visualizzazione voce Escludi superfici in menù contestuale Private m_PrevPoint As Point Private m_ptPrev As Point3d Private m_ptGrid As Point3d @@ -252,8 +252,6 @@ Public Class Scene '---- Mouse ----------- Private m_bSetFocusOnMove As Boolean = True - ' Per correggere un problema con hot spot cursore, nei file cur è stato spostato di 4 pixel in Y+ (in basso) - Public Sub SetFocusOnMove(ByVal bVal As Boolean) m_bSetFocusOnMove = bVal End Sub @@ -271,7 +269,7 @@ Public Class Scene m_nStatus = ST.WINSEL End If m_PrevPoint = e.Location - ' se stato SELPATH, SELPATHAUTO oppure SEL e premuto CONTROL + ' se stato SELPATH, SELPATHAUTO oppure SEL + Control ElseIf m_nStatus = ST.SELPATH Or m_nStatus = ST.SELPATHAUTO Or (m_nStatus = ST.SEL And (ModifierKeys And Keys.Control) = Keys.Control) Then EgtSetObjFilterForSelWin(False, m_bCurveForSel, False, False, False) ' abilito solo le curve @@ -287,6 +285,10 @@ Public Class Scene End If ' se stato SEL, SELPART, SELLAYER ElseIf m_nStatus = ST.SEL Or m_nStatus = ST.SELPART Or m_nStatus = ST.SELLAYER Then + ' SEL + Ctrl + Alt --> SELLAYER + If m_nStatus = ST.SEL And (ModifierKeys And Keys.Control) = Keys.Control And (ModifierKeys And Keys.Alt) = Keys.Alt Then m_nStatus = ST.SELLAYER + ' SEL + Alt --> SELPART + If m_nStatus = ST.SEL And (ModifierKeys And Keys.Alt) = Keys.Alt Then m_nStatus = ST.SELPART EgtSetObjFilterForSelWin(m_bZeroDimForSel, m_bCurveForSel, m_bSurfForSel, m_bVolumeForSel, m_bExtraForSel) Dim nId As Integer = ChooseOneSelectedObj(e.Location, m_nStatus) If nId <> GDB_ID.NULL Then @@ -874,7 +876,7 @@ Public Class Scene Private Sub PrepareMenuScene() ' per selezione oggetti - If m_nStatus = ST.SEL Then + If m_nStatus = ST.SEL Or m_nStatus = ST.WINSEL Or m_nStatus = ST.SELPART Or m_nStatus = ST.SELLAYER Or m_nStatus = ST.SELPATH Or m_nStatus = ST.SELPATHAUTO Then For Each i As ToolStripItem In MenuScene.Items Select Case i.Name Case "cmdSelectAll" @@ -888,18 +890,27 @@ Public Class Scene Case "cmdWinSelect" i.Text = EgtMsg(1005) ' Select Window i.Visible = True + DirectCast(i, ToolStripMenuItem).Checked = (m_nStatus = ST.WINSEL) Case "cmdSelectPart" i.Text = EgtMsg(1007) ' Select Part i.Visible = True + DirectCast(i, ToolStripMenuItem).Checked = (m_nStatus = ST.SELPART) Case "cmdSelectLayer" i.Text = EgtMsg(1009) ' Select Layer i.Visible = True + DirectCast(i, ToolStripMenuItem).Checked = (m_nStatus = ST.SELLAYER) Case "cmdSelectPath" i.Text = EgtMsg(1011) ' Select Path i.Visible = True + DirectCast(i, ToolStripMenuItem).Checked = (m_nStatus = ST.SELPATH) Case "cmdSelectPathAuto" i.Text = EgtMsg(1013) ' Select Path Auto i.Visible = True + DirectCast(i, ToolStripMenuItem).Checked = (m_nStatus = ST.SELPATHAUTO) + Case "cmdSelectEntity" + i.Text = EgtMsg(1015) ' Select Entity + i.Visible = True + DirectCast(i, ToolStripMenuItem).Checked = (m_nStatus = ST.SEL) Case "sepSelPnt1" i.Visible = m_bExcludeSurfInSelMenu Case "cmdExcludeSurfFromSel" @@ -1022,6 +1033,8 @@ Public Class Scene m_nStatus = ST.SELPATH ElseIf e.ClickedItem.Name = "cmdSelectPathAuto" Then m_nStatus = ST.SELPATHAUTO + ElseIf e.ClickedItem.Name = "cmdSelectEntity" Then + m_nStatus = ST.SEL ' Riabilitazione drag sospeso ElseIf e.ClickedItem.Name = "cmdRestartDrag" Then EgtResetGeoLine()