From f767cdfa3a19450d4a686bf8c58a1c9a8ee5e4df Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 27 Apr 2015 08:29:21 +0000 Subject: [PATCH] TestEIn 1.6d8 : - aggiunta esplodi superfici - corretto piccolo problema di visualizzazione in Rotate3d - migliorate info in About. --- AboutBox1.Designer.vb | 52 ++++++++++++++++++++++++-------------- AboutBox1.vb | 26 +++++++++++-------- Controller.vb | 32 ++++++++++++++++++++++- EgtInterface.vb | 20 +++++++++++---- Form1.Designer.vb | 23 ++++++++++++++++- Form1.resx | 29 +++++++++++++++++++-- Form1.vb | 6 +++++ My Project/AssemblyInfo.vb | 4 +-- 8 files changed, 151 insertions(+), 41 deletions(-) diff --git a/AboutBox1.Designer.vb b/AboutBox1.Designer.vb index 3a5cbbb..d16c3a4 100644 --- a/AboutBox1.Designer.vb +++ b/AboutBox1.Designer.vb @@ -30,14 +30,15 @@ Partial Class AboutBox1 Me.LabelCopyright = New System.Windows.Forms.Label() Me.LabelVersion = New System.Windows.Forms.Label() Me.LabelProductName = New System.Windows.Forms.Label() - Me.tbInfo = New System.Windows.Forms.TextBox() + Me.tbInfoProg = New System.Windows.Forms.TextBox() + Me.tbInfoSys = New System.Windows.Forms.TextBox() CType(Me.LogoPictureBox, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'LogoPictureBox ' Me.LogoPictureBox.Image = CType(resources.GetObject("LogoPictureBox.Image"), System.Drawing.Image) - Me.LogoPictureBox.Location = New System.Drawing.Point(36, 33) + Me.LogoPictureBox.Location = New System.Drawing.Point(36, 24) Me.LogoPictureBox.Name = "LogoPictureBox" Me.LogoPictureBox.Size = New System.Drawing.Size(52, 52) Me.LogoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage @@ -49,7 +50,7 @@ Partial Class AboutBox1 Me.OKButton.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.OKButton.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.OKButton.Location = New System.Drawing.Point(97, 327) + Me.OKButton.Location = New System.Drawing.Point(97, 344) Me.OKButton.Name = "OKButton" Me.OKButton.Size = New System.Drawing.Size(112, 19) Me.OKButton.TabIndex = 0 @@ -57,7 +58,7 @@ Partial Class AboutBox1 ' 'LabelCompanyName ' - Me.LabelCompanyName.Location = New System.Drawing.Point(136, 78) + Me.LabelCompanyName.Location = New System.Drawing.Point(136, 69) Me.LabelCompanyName.Margin = New System.Windows.Forms.Padding(6, 0, 3, 0) Me.LabelCompanyName.MaximumSize = New System.Drawing.Size(152, 17) Me.LabelCompanyName.MinimumSize = New System.Drawing.Size(152, 17) @@ -69,7 +70,7 @@ Partial Class AboutBox1 ' 'LabelCopyright ' - Me.LabelCopyright.Location = New System.Drawing.Point(136, 59) + Me.LabelCopyright.Location = New System.Drawing.Point(136, 50) Me.LabelCopyright.Margin = New System.Windows.Forms.Padding(6, 0, 3, 0) Me.LabelCopyright.MaximumSize = New System.Drawing.Size(152, 17) Me.LabelCopyright.MinimumSize = New System.Drawing.Size(152, 17) @@ -81,7 +82,7 @@ Partial Class AboutBox1 ' 'LabelVersion ' - Me.LabelVersion.Location = New System.Drawing.Point(136, 40) + Me.LabelVersion.Location = New System.Drawing.Point(136, 31) Me.LabelVersion.Margin = New System.Windows.Forms.Padding(6, 0, 3, 0) Me.LabelVersion.MaximumSize = New System.Drawing.Size(152, 17) Me.LabelVersion.MinimumSize = New System.Drawing.Size(152, 17) @@ -93,7 +94,7 @@ Partial Class AboutBox1 ' 'LabelProductName ' - Me.LabelProductName.Location = New System.Drawing.Point(136, 21) + Me.LabelProductName.Location = New System.Drawing.Point(136, 12) Me.LabelProductName.Margin = New System.Windows.Forms.Padding(6, 0, 3, 0) Me.LabelProductName.MaximumSize = New System.Drawing.Size(152, 17) Me.LabelProductName.MinimumSize = New System.Drawing.Size(152, 17) @@ -103,24 +104,36 @@ Partial Class AboutBox1 Me.LabelProductName.Text = "Nome prodotto" Me.LabelProductName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' - 'tbInfo + 'tbInfoProg ' - Me.tbInfo.AcceptsReturn = True - Me.tbInfo.Location = New System.Drawing.Point(12, 108) - Me.tbInfo.Multiline = True - Me.tbInfo.Name = "tbInfo" - Me.tbInfo.ReadOnly = True - Me.tbInfo.Size = New System.Drawing.Size(289, 213) - Me.tbInfo.TabIndex = 1 - Me.tbInfo.WordWrap = False + Me.tbInfoProg.AcceptsReturn = True + Me.tbInfoProg.Location = New System.Drawing.Point(12, 99) + Me.tbInfoProg.Multiline = True + Me.tbInfoProg.Name = "tbInfoProg" + Me.tbInfoProg.ReadOnly = True + Me.tbInfoProg.Size = New System.Drawing.Size(289, 138) + Me.tbInfoProg.TabIndex = 1 + Me.tbInfoProg.WordWrap = False + ' + 'tbInfoSys + ' + Me.tbInfoSys.AcceptsReturn = True + Me.tbInfoSys.Location = New System.Drawing.Point(12, 243) + Me.tbInfoSys.Multiline = True + Me.tbInfoSys.Name = "tbInfoSys" + Me.tbInfoSys.ReadOnly = True + Me.tbInfoSys.Size = New System.Drawing.Size(289, 86) + Me.tbInfoSys.TabIndex = 2 + Me.tbInfoSys.WordWrap = False ' 'AboutBox1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.CancelButton = Me.OKButton - Me.ClientSize = New System.Drawing.Size(313, 356) - Me.Controls.Add(Me.tbInfo) + Me.ClientSize = New System.Drawing.Size(313, 374) + Me.Controls.Add(Me.tbInfoSys) + Me.Controls.Add(Me.tbInfoProg) Me.Controls.Add(Me.LogoPictureBox) Me.Controls.Add(Me.OKButton) Me.Controls.Add(Me.LabelCompanyName) @@ -147,6 +160,7 @@ End Sub Friend WithEvents LabelCopyright As System.Windows.Forms.Label Friend WithEvents LabelVersion As System.Windows.Forms.Label Friend WithEvents LabelProductName As System.Windows.Forms.Label - Friend WithEvents tbInfo As System.Windows.Forms.TextBox + Friend WithEvents tbInfoProg As System.Windows.Forms.TextBox + Friend WithEvents tbInfoSys As System.Windows.Forms.TextBox End Class diff --git a/AboutBox1.vb b/AboutBox1.vb index 7af521d..fe0e577 100644 --- a/AboutBox1.vb +++ b/AboutBox1.vb @@ -16,24 +16,28 @@ Public NotInheritable Class AboutBox1 Me.LabelVersion.Text = String.Format("Versione {0}", My.Application.Info.Version.ToString) Me.LabelCopyright.Text = My.Application.Info.Copyright Me.LabelCompanyName.Text = My.Application.Info.CompanyName - Dim sbInfo As New System.Text.StringBuilder Dim sTemp As String = String.Empty + ' Informazioni sul programma + Dim sbInfoProg As New System.Text.StringBuilder EgtGetVersionInfo(sTemp) - sbInfo.Append(sTemp & vbCrLf) - sbInfo.Append("ExeRoot " & Form1.GetExeRoot() & vbCrLf) - sbInfo.Append("DataRoot " & Form1.GetDataRoot() & vbCrLf) - EgtGetOsInfo(sTemp) - sbInfo.Append(sTemp & vbCrLf) - sbInfo.Append("User " & SystemInformation.UserName & + sbInfoProg.Append(sTemp & vbCrLf) + sbInfoProg.Append("ExeRoot " & Form1.GetExeRoot() & vbCrLf) + sbInfoProg.Append("DataRoot " & Form1.GetDataRoot() & vbCrLf) + sbInfoProg.Append("User " & SystemInformation.UserName & "\" & SystemInformation.ComputerName & " (" & Form1.GetInstance() & ")" & vbCrLf) + Me.tbInfoProg.Text = sbInfoProg.ToString() + ' Informazioni sul sistema + Dim sbInfoSys As New System.Text.StringBuilder + EgtGetOsInfo(sTemp) + sbInfoSys.Append(sTemp & vbCrLf) EgtGetCpuInfo(sTemp) - sbInfo.Append(sTemp & vbCrLf) + sbInfoSys.Append(sTemp & vbCrLf) EgtGetMemoryInfo(sTemp) - sbInfo.Append(sTemp & vbCrLf) + sbInfoSys.Append(sTemp & vbCrLf) EgtGetSceneInfo(sTemp) - sbInfo.Append(sTemp) - Me.tbInfo.Text = sbInfo.ToString() + sbInfoSys.Append(sTemp) + Me.tbInfoSys.Text = sbInfoSys.ToString() End Sub Private Sub OKButton_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OKButton.Click diff --git a/Controller.vb b/Controller.vb index 52a3af0..6ce6679 100644 --- a/Controller.vb +++ b/Controller.vb @@ -93,6 +93,7 @@ Public Class Controller SCREW RULED MERGESURF + EXPLODESURF INVERTSURF DELETE CHANGELAYER @@ -973,6 +974,9 @@ Public Class Controller ' Merge Surfaces Case CMD.MERGESURF Return ProcessMergeSurf() + ' Explode Surfaces + Case CMD.EXPLODESURF + Return ProcessExplodeSurf() ' Invert Surface Case CMD.INVERTSURF Return ProcessInvertSurf() @@ -3517,6 +3521,31 @@ Public Class Controller Return True End Function + Private Function ProcessExplodeSurf() As Boolean + If m_nStep <> 0 Then + Return False + End If + ' opero su tutti gli oggetti selezionati + EnableCommandLog() + Dim nId As Integer = EgtGetFirstSelectedObj() + While nId <> GDB_ID.NULL + ' recupero il successivo, perchè il corrente verrà cancellato + Dim nNextId = EgtGetNextSelectedObj() + ' eseguo esplosione + Dim nCount As Integer + Dim nFirstId As Integer = EgtExplodeSurfTm(nId, nCount) + ' passo al successivo + nId = nNextId + End While + DisableCommandLog() + ' reset stato scena + m_Scene.ResetStatus() + ' reset stato + m_nStep = 0 + RaiseEvent UpdateUI(Me, True) + Return True + End Function + Private Function ProcessInvertSurf() As Boolean If m_nStep <> 0 Then Return False @@ -3897,7 +3926,7 @@ Public Class Controller Dim nFirstId As Integer = EgtExplodeCurveCompo(nId, nCount) Case GDB_TY.CRV_BEZ ' approssimo la curva di Bezier con archi - Dim nNewId As Integer = EgtExplodeCurveBezier(nId, True, 10 * EPS_SMALL) + Dim nNewId As Integer = EgtApproxCurveBezier(nId, True, 10 * EPS_SMALL) Case GDB_TY.EXT_TEXT ' esplodo il testo nei suoi contorni Dim nCount As Integer @@ -4246,6 +4275,7 @@ Public Class Controller EgtSetGeoLine(m_ptP1, m_ptLast) EgtDraw() ElseIf m_nStep = 3 Then + EgtResetGeoLine(False) EgtSetGeoTria(m_ptP1, m_ptP2, m_ptLast) EgtDraw() ElseIf m_nStep = 4 Then diff --git a/EgtInterface.vb b/EgtInterface.vb index 79789fa..842e373 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -1093,10 +1093,6 @@ End Function Public Function EgtChangeVectorBase(ByVal nId As Integer, ByRef PtBase As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function - -Public Function EgtInvertSurface(ByVal nId As Integer) As Boolean -End Function - Public Function EgtFlipText(ByVal nId As Integer) As Boolean End Function @@ -1180,7 +1176,21 @@ Public Function EgtExplodeCurveCompo(ByVal nId As Integer, ByRef nCount As Integ End Function -Public Function EgtExplodeCurveBezier(ByVal nId As Integer, ByVal bArcsVsLines As Boolean, ByVal dLinTol As Double) As Integer +Public Function EgtApproxCurveArc(ByVal nId As Integer, ByVal dLinTol As Double) As Integer +End Function + + +Public Function EgtApproxCurveBezier(ByVal nId As Integer, ByVal bArcsVsLines As Boolean, ByVal dLinTol As Double) As Integer +End Function + + +'---------- GeomDb Surfaces Modify --------------------------------------------- + +Public Function EgtInvertSurface(ByVal nId As Integer) As Boolean +End Function + + +Public Function EgtExplodeSurfTm(ByVal nId As Integer, ByRef nCount As Integer) As Integer End Function diff --git a/Form1.Designer.vb b/Form1.Designer.vb index 65f268e..74023b9 100644 --- a/Form1.Designer.vb +++ b/Form1.Designer.vb @@ -182,6 +182,7 @@ Partial Class Form1 Me.MruSFile6 = New System.Windows.Forms.ToolStripMenuItem() Me.MruSFile7 = New System.Windows.Forms.ToolStripMenuItem() Me.MruSFile8 = New System.Windows.Forms.ToolStripMenuItem() + Me.btnExplodeSurf = New System.Windows.Forms.Button() Me.TableLayoutPanel1.SuspendLayout() Me.TabControl1.SuspendLayout() Me.TabFile.SuspendLayout() @@ -1549,6 +1550,7 @@ Partial Class Form1 'TabConstruct ' Me.TabConstruct.BackColor = System.Drawing.SystemColors.Control + Me.TabConstruct.Controls.Add(Me.btnExplodeSurf) Me.TabConstruct.Controls.Add(Me.btnMergeSurf) Me.TabConstruct.Controls.Add(Me.btnInvertSurf) Me.TabConstruct.Controls.Add(Me.btnRevolve) @@ -1590,7 +1592,7 @@ Partial Class Form1 Me.btnInvertSurf.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnInvertSurf.Image = CType(resources.GetObject("btnInvertSurf.Image"), System.Drawing.Image) Me.btnInvertSurf.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnInvertSurf.Location = New System.Drawing.Point(0, 288) + Me.btnInvertSurf.Location = New System.Drawing.Point(0, 336) Me.btnInvertSurf.Name = "btnInvertSurf" Me.btnInvertSurf.Size = New System.Drawing.Size(56, 48) Me.btnInvertSurf.TabIndex = 42 @@ -2349,6 +2351,24 @@ Partial Class Form1 Me.MruSFile8.Size = New System.Drawing.Size(160, 22) Me.MruSFile8.Text = "File8" ' + 'btnExplodeSurf + ' + Me.btnExplodeSurf.FlatAppearance.BorderColor = System.Drawing.SystemColors.Control + Me.btnExplodeSurf.FlatAppearance.BorderSize = 0 + Me.btnExplodeSurf.FlatAppearance.MouseDownBackColor = System.Drawing.SystemColors.Control + Me.btnExplodeSurf.FlatAppearance.MouseOverBackColor = System.Drawing.SystemColors.GradientInactiveCaption + Me.btnExplodeSurf.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnExplodeSurf.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnExplodeSurf.Image = CType(resources.GetObject("btnExplodeSurf.Image"), System.Drawing.Image) + Me.btnExplodeSurf.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnExplodeSurf.Location = New System.Drawing.Point(0, 288) + Me.btnExplodeSurf.Name = "btnExplodeSurf" + Me.btnExplodeSurf.Size = New System.Drawing.Size(56, 48) + Me.btnExplodeSurf.TabIndex = 44 + Me.btnExplodeSurf.Text = "Explode" + Me.btnExplodeSurf.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnExplodeSurf.UseVisualStyleBackColor = False + ' 'Form1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2557,5 +2577,6 @@ End Sub Friend WithEvents btnInvertSurf As System.Windows.Forms.Button Friend WithEvents btnChangeStartCurve As System.Windows.Forms.Button Friend WithEvents btnFillet As System.Windows.Forms.Button + Friend WithEvents btnExplodeSurf As System.Windows.Forms.Button End Class diff --git a/Form1.resx b/Form1.resx index 61a6d12..50382ca 100644 --- a/Form1.resx +++ b/Form1.resx @@ -883,7 +883,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC2 - DQAAAk1TRnQBSQFMAgEBDgEAAWgBEAFoAhABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + DQAAAk1TRnQBSQFMAgEBDgEAAXABEAFwAhABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA AUADAAFAAwABAQEAAQgGAAEQGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm @@ -952,7 +952,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADW - CAAAAk1TRnQBSQFMAgEBAgEAAYgBBwGIAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAZABBwGQAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1108,6 +1108,31 @@ LAcyLAEJCZkmOZChAhISMs1yIEMPJCRkuuRAhgwkJGS65UCGEUhIyAyRgzwoSyP9x057ZBOG+opFhsiN Le7lJ1N5WmKY/LjfS/gFxQK8rhUbkHKBzS+4tQCANLm6ydIz0H38ERvlAseEfwuGyYGN99GXCsxGhjOR 4UxkOBMZzkSG8wjLC3uFfZK6X129AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAAAd0SU1FB94LEggTC5EOsFgAAARvSURBVFhHxZRraFxFHMXPnfva3WBNqHm0ijGJ + kJSC2iCo5EOigWICRim0FAWrgkhb1FCxKiom1kTy6AOrYmqLVlQKheIHUTGKCFEoRpt9J7vpZjemCekD + C401D+F67iZ3vdkdi/jhOvBjZs7uzPnPmdmFZVn/K1LRS6Sil0hFL5GK/5XvOqAl+vEBuUyGx/rRIvue + G6l4Ldhqoaqt5CFoWgPn/qxuWSJ1AEPJPhxMdqN0rBetiT6cS/aiPn8PN1JRBg0fhRAd5AWyE7q+E6bZ + A595BEZxsHMLwpOH8KV7TbIfu8gJt5aPVHTDto6GL7Fvgoo2Gj8JTfTBMH6Ez/iEehUU81RtGdKGghFg + 7Y3O2tgbqOQ1/ODMF8K4zRk7rJrkw1ZK9qCpSWO/g4W8xti7aH4CAd9l+P1bAW0PVP09KMq3dTWYAdZs + /3u9pfAtnLbH82HU/BFElfNZ7jv5ghu257K9ELtN4FZG3gJdPcLY4/D7pnktQ9CMHihF3zTejcz9jUhd + H8BVhuWz1y1GcPtYN87Y46UY9jr7uikQHNjuZNz17BtYwL7sWFffhmGO8+S/MoVxnnpMgTIsYI6wgJgO + Zbx+I2ZVGB9m97AsZfpTzNr9Ygzv29piFJusEEpyPs4gH7bHyX2MfD/ppGEvE/geAZqbRopFxRQgxALC + AiKuwsyo8M1U3YRMZQWmnX3On8Jvfybw8EIcXfNRtMwHUbvKxz1xw9bOU98BoX4EQ3sFpj4Any/NItJ8 + hHF+HlYgQgJKRIVIqlAny4uRbtiEieZ7eA1mW9bowuc4ujSKz5jAUbKrwCdfcOAJX11+8eoX0I0Q7z0N + n3+Ssa+YK9nTaxAJRp8mTECbKg4gtb0NF3e04RErjQNLccz9Por1jP4JFnB8LozyK0mU5nzcpm5YQDd5 + nkXYJ0/x3ic5TtjmyJqLEM3HePoJ21wH0hoLqFyH1LYHMfv6bnRaU2in8bskthDFSfbHrkaQ+5VkfdwT + N7z3Hkb/Igz9YwQCM+zHIZQoC8iaM/q4DpGyzY1sASKjoej81lZMdO3FxYEO3GzvQ9NB/v43LESwz55f + GMJ1TCL371hg7MC7foq00/wST56CgigfHU8vgjSP8uGNL598GQ3qVJGOzPHDSFRVY9Degz+9l539FsN4 + 1hm7KRAcaF7D2A8z/q+YRmzl3vnilShjpzls48kVMkBgYnMzfn5nPyYgbnmGW1RcCaLM2Y8pbHHv71Ag + uIHf7GchB/kTDDOF0yzkJ97/CAthGgqLUiJQtBD0ktENdRgeOIT4xlrEltdDuPeai6DCxq3ZrJrI4L/d + MRp/Tc5AaL/QMAhFhCCMCIQ/bhfQ3IjQmx04W1eNFPB07oUXMIxAvrZq8k+w9fPhneP9pxQFoz4TkfIb + ELmrHrG2FpzdfC8umSoGgceKZeuvhVSUYcKs5t2/ZahIlRVjobQEi2vXYFaDclLF+gdka/4NUtFLpKKX + SEUvkYpeIhW9RCp6iVT0EqnoJVLRS6Sid1j4C/hYuonT6tCmAAAAAElFTkSuQmCC diff --git a/Form1.vb b/Form1.vb index 7a3ce6d..51d3f3f 100644 --- a/Form1.vb +++ b/Form1.vb @@ -559,6 +559,7 @@ Public Class Form1 btnScrew.Enabled = bLayerOk And bSelOk btnRuled.Enabled = bLayerOk And bSelOk btnMergeSurf.Enabled = bSelOk + btnExplodeSurf.Enabled = bSelOk btnInvertSurf.Enabled = bSelOk ' Edit btnDelete.Enabled = bSelOk @@ -647,6 +648,7 @@ Public Class Form1 SetTextAndToolTip(btnScrew, 409, 410) ' Screw / Surface : curve screwing SetTextAndToolTip(btnRuled, 411, 412) ' Ruled / Surface : ruled between 2 curves SetTextAndToolTip(btnMergeSurf, 413, 414) ' Merge / Merge Surfaces + SetTextAndToolTip(btnExplodeSurf, 417, 418) ' Explode / Explode Surfaces SetTextAndToolTip(btnInvertSurf, 415, 416) ' Flip / Flip Surface Outside ' Edit TabEdit.Text = EgtMsg(501) ' Edit @@ -1003,6 +1005,10 @@ Public Class Form1 m_Controller.ExecuteCommand(CMD.MERGESURF) End Sub + Private Sub btnExplodeSurf_Click(sender As System.Object, e As System.EventArgs) Handles btnExplodeSurf.Click + m_Controller.ExecuteCommand(CMD.EXPLODESURF) + End Sub + Private Sub btnInvertSurf_Click(sender As System.Object, e As System.EventArgs) Handles btnInvertSurf.Click m_Controller.ExecuteCommand(CMD.INVERTSURF) End Sub diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 7d774c9..75118b2 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: ' - - + +