TestEIn 1.9j5 :
- aggiornamento.
This commit is contained in:
Dario Sassi
+2
-2
@@ -619,10 +619,10 @@ Public Class Controller
|
||||
DisableCommandLog()
|
||||
End Sub
|
||||
|
||||
Public Sub MouseSelectedAll()
|
||||
Public Sub MouseSelectedAll(Optional bOnlyVisible As Boolean = True)
|
||||
' eseguo la selezione ed aggiorno
|
||||
EnableCommandLog()
|
||||
EgtSelectAll(True)
|
||||
EgtSelectAll(bOnlyVisible)
|
||||
DisableCommandLog()
|
||||
EgtDraw()
|
||||
End Sub
|
||||
|
||||
@@ -492,8 +492,8 @@ Public Class Form1
|
||||
m_Controller.MouseSetObjFilterForSelect(bZeroDim, bCurve, bSurf, bVolume, bExtra)
|
||||
End Sub
|
||||
|
||||
Private Sub OnMouseSelectedAll(ByVal sender As Object) Handles Scene1.OnMouseSelectedAll
|
||||
m_Controller.MouseSelectedAll()
|
||||
Private Sub OnMouseSelectedAll(sender As Object, bOnlyVisible As Boolean) Handles Scene1.OnMouseSelectedAll
|
||||
m_Controller.MouseSelectedAll(bOnlyVisible)
|
||||
End Sub
|
||||
|
||||
Private Sub OnMouseDeselectedAll(ByVal sender As Object) Handles Scene1.OnMouseDeselectedAll
|
||||
|
||||
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
|
||||
' utilizzando l'asterisco (*) come descritto di seguito:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.9.10.2")>
|
||||
<Assembly: AssemblyFileVersion("1.9.10.2")>
|
||||
<Assembly: AssemblyVersion("1.9.10.5")>
|
||||
<Assembly: AssemblyFileVersion("1.9.10.5")>
|
||||
|
||||
Generated
+18
-10
@@ -4,7 +4,7 @@ Partial Class Scene
|
||||
|
||||
'UserControl esegue l'override del metodo Dispose per pulire l'elenco dei componenti.
|
||||
<System.Diagnostics.DebuggerNonUserCode()> _
|
||||
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
|
||||
Protected Overrides Sub Dispose( disposing As Boolean)
|
||||
Try
|
||||
If disposing AndAlso components IsNot Nothing Then
|
||||
components.Dispose()
|
||||
@@ -25,6 +25,7 @@ Partial Class Scene
|
||||
Me.components = New System.ComponentModel.Container()
|
||||
Me.MenuScene = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.cmdSelectAll = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.cmdSelectAllVisible = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.cmdDeselectAll = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.sepSel1 = New System.Windows.Forms.ToolStripSeparator()
|
||||
Me.cmdWinSelect = New System.Windows.Forms.ToolStripMenuItem()
|
||||
@@ -32,6 +33,7 @@ Partial Class Scene
|
||||
Me.cmdSelectLayer = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.cmdSelectPath = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.cmdSelectPathAuto = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.cmdSelectEntity = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.cmdRestartDrag = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.cmdSketchPoint = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.cmdGridPoint = New System.Windows.Forms.ToolStripMenuItem()
|
||||
@@ -49,18 +51,17 @@ 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.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.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cmdSelectAllVisible, 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, 550)
|
||||
Me.MenuScene.Size = New System.Drawing.Size(193, 572)
|
||||
'
|
||||
'cmdSelectAll
|
||||
'
|
||||
@@ -68,6 +69,12 @@ Partial Class Scene
|
||||
Me.cmdSelectAll.Size = New System.Drawing.Size(192, 22)
|
||||
Me.cmdSelectAll.Text = "Select All"
|
||||
'
|
||||
'cmdSelectAllVisible
|
||||
'
|
||||
Me.cmdSelectAllVisible.Name = "cmdSelectAllVisible"
|
||||
Me.cmdSelectAllVisible.Size = New System.Drawing.Size(192, 22)
|
||||
Me.cmdSelectAllVisible.Text = "Select All Visible"
|
||||
'
|
||||
'cmdDeselectAll
|
||||
'
|
||||
Me.cmdDeselectAll.Name = "cmdDeselectAll"
|
||||
@@ -113,6 +120,12 @@ Partial Class Scene
|
||||
Me.cmdSelectPathAuto.Size = New System.Drawing.Size(192, 22)
|
||||
Me.cmdSelectPathAuto.Text = "Select Path Auto"
|
||||
'
|
||||
'cmdSelectEntity
|
||||
'
|
||||
Me.cmdSelectEntity.Name = "cmdSelectEntity"
|
||||
Me.cmdSelectEntity.Size = New System.Drawing.Size(192, 22)
|
||||
Me.cmdSelectEntity.Text = "Select Entity"
|
||||
'
|
||||
'cmdRestartDrag
|
||||
'
|
||||
Me.cmdRestartDrag.Name = "cmdRestartDrag"
|
||||
@@ -224,12 +237,6 @@ 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!)
|
||||
@@ -269,5 +276,6 @@ End Sub
|
||||
Friend WithEvents cmdSelectPathAuto As System.Windows.Forms.ToolStripMenuItem
|
||||
Friend WithEvents cmdExcludeSurfFromSel As System.Windows.Forms.ToolStripMenuItem
|
||||
Friend WithEvents cmdSelectEntity As System.Windows.Forms.ToolStripMenuItem
|
||||
Friend WithEvents cmdSelectAllVisible As System.Windows.Forms.ToolStripMenuItem
|
||||
|
||||
End Class
|
||||
|
||||
@@ -250,7 +250,7 @@ Public Class Scene
|
||||
'---- Events ----------
|
||||
Public Event OnMouseSetObjFilterForSelect(sender As Object, bZeroDim As Boolean, bCurve As Boolean,
|
||||
bSurf As Boolean, bVolume As Boolean, bExtra As Boolean)
|
||||
Public Event OnMouseSelectedAll(sender As Object)
|
||||
Public Event OnMouseSelectedAll(sender As Object, bOnlyVisible As Boolean)
|
||||
Public Event OnMouseDeselectedAll(sender As Object)
|
||||
Public Event OnMouseSelectedObj(sender As Object, nId As Integer, bLast As Boolean)
|
||||
Public Event OnMouseSelectedPart(sender As Object, nId As Integer)
|
||||
@@ -899,6 +899,9 @@ Public Class Scene
|
||||
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 "cmdSelectAllVisible"
|
||||
i.Text = EgtMsg(1016) ' Select All Visible
|
||||
i.Visible = True
|
||||
Case "cmdSelectAll"
|
||||
i.Text = EgtMsg(1001) ' Select All
|
||||
i.Visible = True
|
||||
@@ -1039,8 +1042,10 @@ Public Class Scene
|
||||
|
||||
Private Sub MenuScene_ItemClicked(sender As Object, e As ToolStripItemClickedEventArgs) Handles MenuScene.ItemClicked
|
||||
' Per selezione
|
||||
If e.ClickedItem.Name = "cmdSelectAll" Then
|
||||
RaiseEvent OnMouseSelectedAll(Me)
|
||||
If e.ClickedItem.Name = "cmdSelectAllVisible" Then
|
||||
RaiseEvent OnMouseSelectedAll(Me, True)
|
||||
ElseIf e.ClickedItem.Name = "cmdSelectAll" Then
|
||||
RaiseEvent OnMouseSelectedAll(Me, False)
|
||||
ElseIf e.ClickedItem.Name = "cmdDeselectAll" Then
|
||||
RaiseEvent OnMouseDeselectedAll(Me)
|
||||
ElseIf e.ClickedItem.Name = "cmdWinSelect" Then
|
||||
|
||||
Reference in New Issue
Block a user