TestEIn :

- aggiunta possibilità di impostare direttorio dei file dei messaggi (default Config)
- aggiunto prototipo per creazione FlatRegion
- aggiunto comando di creazione di FlatRegion.
This commit is contained in:
Dario Sassi
2015-09-22 12:56:59 +00:00
parent 2e31cae5dc
commit a1944a04ea
7 changed files with 94 additions and 28 deletions
+1
View File
@@ -22,6 +22,7 @@ Public Const K_USERLEVEL As String = "UserLevel"
Public Const K_MAXINST As String = "MaxInstances"
Public Const K_INSTANCES As String = "Instances"
Public Const K_COMMANDLOG As String = "CommandLog"
Public Const K_MESSAGESDIR As String = "MessagesDir"
Public Const K_MESSAGES As String = "Messages"
Public Const K_WINPLACE As String = "WinPlace"
Public Const K_LASTNGEDIR As String = "LastNgeDir"
+42 -1
View File
@@ -91,6 +91,7 @@ Public Class Controller
POLYGONSIDE
TEXT
TEXTPLUS
REGION
PLANE
EXTRUDE
REVOLVE
@@ -1057,6 +1058,9 @@ Public Class Controller
' Text Plus
Case CMD.TEXTPLUS
Return ProcessTextPlus()
' Region
Case CMD.REGION
Return ProcessRegion()
' Plane
Case CMD.PLANE
Return ProcessPlane()
@@ -3456,6 +3460,43 @@ Public Class Controller
End If
End Sub
Private Function ProcessRegion() As Boolean
If m_nStep <> 0 Then
Return False
End If
' posso partire solo se esiste un gruppo corrente
If GetCurrLayer() = GDB_ID.NULL Then
Return False
End If
' creo la regione piana (a partire da uno o più contorni selezionati)
EnableCommandLog()
If EgtGetSelectedObjCount() = 1 Then
EgtCreateSurfTmByFlatContour(GetCurrLayer(), EgtGetLastSelectedObj(), EPS_STM)
Else
' creo vettore di entità selezionate
Dim nCrvNum As Integer = 0
Dim nCrvIds(EgtGetSelectedObjCount() - 1) As Integer
Dim nId As Integer = EgtGetFirstSelectedObj()
While nId <> GDB_ID.NULL
Select Case EgtGetType(nId)
Case GDB_TY.CRV_LINE, GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_COMPO
nCrvIds(nCrvNum) = nId
nCrvNum = nCrvNum + 1
End Select
nId = EgtGetNextSelectedObj()
End While
' creo la superficie
EgtCreateSurfFlatRegion(GetCurrLayer(), nCrvIds)
End If
DisableCommandLog()
' reset stato scena
m_Scene.ResetStatus()
' reset stato
m_nStep = 0
RaiseEvent UpdateUI(Me, True)
Return True
End Function
Private Function ProcessPlane() As Boolean
If m_nStep <> 0 Then
Return False
@@ -3482,7 +3523,7 @@ Public Class Controller
nId = EgtGetNextSelectedObj()
End While
' creo la superficie
EgtCreateSurfTmByRegion(GetCurrLayer(), nCrvNum, nCrvIds, EPS_STM)
EgtCreateSurfTmByRegion(GetCurrLayer(), nCrvIds, EPS_STM)
End If
DisableCommandLog()
' reset stato scena
+17 -3
View File
@@ -2132,6 +2132,20 @@ Public Function EgtCreatePolygonFromSide(ByVal nParentId As Integer, ByVal nNumS
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateSurfFlatRegion")>
Private Function EgtCreateSurfFlatRegion_32(ByVal nParentId As Integer, ByVal nNumCrv As Integer, ByVal nCrvId() As Integer) As Integer
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateSurfFlatRegion")>
Private Function EgtCreateSurfFlatRegion_64(ByVal nParentId As Integer, ByVal nNumCrv As Integer, ByVal nCrvId() As Integer) As Integer
End Function
Public Function EgtCreateSurfFlatRegion(ByVal nParentId As Integer, ByVal nCrvId() As Integer) As Integer
If IntPtr.Size = 4 Then
Return EgtCreateSurfFlatRegion_32(nParentId, nCrvId.Length(), nCrvId)
Else
Return EgtCreateSurfFlatRegion_64(nParentId, nCrvId.Length(), nCrvId)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateSurfTmByFlatContour")>
Private Function EgtCreateSurfTmByFlatContour_32(ByVal nParentId As Integer, ByVal nCrvId As Integer, ByVal dLinTol As Double) As Integer
End Function
@@ -2152,11 +2166,11 @@ End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateSurfTmByRegion")>
Private Function EgtCreateSurfTmByRegion_64(ByVal nParentId As Integer, ByVal nNumCrv As Integer, ByVal nCrvId() As Integer, ByVal dLinTol As Double) As Integer
End Function
Public Function EgtCreateSurfTmByRegion(ByVal nParentId As Integer, ByVal nNumCrv As Integer, ByVal nCrvId() As Integer, ByVal dLinTol As Double) As Integer
Public Function EgtCreateSurfTmByRegion(ByVal nParentId As Integer, ByVal nCrvId() As Integer, ByVal dLinTol As Double) As Integer
If IntPtr.Size = 4 Then
Return EgtCreateSurfTmByRegion_32(nParentId, nNumCrv, nCrvId, dLinTol)
Return EgtCreateSurfTmByRegion_32(nParentId, nCrvId.Length(), nCrvId, dLinTol)
Else
Return EgtCreateSurfTmByRegion_64(nParentId, nNumCrv, nCrvId, dLinTol)
Return EgtCreateSurfTmByRegion_64(nParentId, nCrvId.Length(), nCrvId, dLinTol)
End If
End Function
+13 -13
View File
@@ -230,7 +230,7 @@ Partial Class Form1
Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle())
Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 22.0!))
Me.TableLayoutPanel1.Size = New System.Drawing.Size(1096, 641)
Me.TableLayoutPanel1.Size = New System.Drawing.Size(1096, 645)
Me.TableLayoutPanel1.TabIndex = 0
'
'Scene1
@@ -241,7 +241,7 @@ Partial Class Form1
Me.Scene1.Location = New System.Drawing.Point(89, 82)
Me.Scene1.Margin = New System.Windows.Forms.Padding(0)
Me.Scene1.Name = "Scene1"
Me.Scene1.Size = New System.Drawing.Size(787, 537)
Me.Scene1.Size = New System.Drawing.Size(787, 541)
Me.Scene1.TabIndex = 1
'
'TabControl1
@@ -1111,20 +1111,20 @@ Partial Class Form1
Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30.0!))
Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 160.0!))
Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 70.0!))
Me.TableLayoutPanel3.Size = New System.Drawing.Size(220, 537)
Me.TableLayoutPanel3.Size = New System.Drawing.Size(220, 541)
Me.TableLayoutPanel3.TabIndex = 9
'
'tBoxInfo
'
Me.tBoxInfo.BackColor = System.Drawing.SystemColors.ControlLightLight
Me.tBoxInfo.Dock = System.Windows.Forms.DockStyle.Fill
Me.tBoxInfo.Location = New System.Drawing.Point(1, 229)
Me.tBoxInfo.Location = New System.Drawing.Point(1, 232)
Me.tBoxInfo.Margin = New System.Windows.Forms.Padding(1, 0, 1, 0)
Me.tBoxInfo.Multiline = True
Me.tBoxInfo.Name = "tBoxInfo"
Me.tBoxInfo.ReadOnly = True
Me.tBoxInfo.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
Me.tBoxInfo.Size = New System.Drawing.Size(218, 77)
Me.tBoxInfo.Size = New System.Drawing.Size(218, 78)
Me.tBoxInfo.TabIndex = 24
Me.tBoxInfo.WordWrap = False
'
@@ -1133,7 +1133,7 @@ Partial Class Form1
Me.tboxCmd.BackColor = System.Drawing.SystemColors.Window
Me.tboxCmd.Dock = System.Windows.Forms.DockStyle.Fill
Me.tboxCmd.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.tboxCmd.Location = New System.Drawing.Point(1, 466)
Me.tboxCmd.Location = New System.Drawing.Point(1, 470)
Me.tboxCmd.Margin = New System.Windows.Forms.Padding(1, 0, 1, 0)
Me.tboxCmd.Multiline = True
Me.tboxCmd.Name = "tboxCmd"
@@ -1154,7 +1154,7 @@ Partial Class Form1
Me.TreeView1.Margin = New System.Windows.Forms.Padding(1, 0, 1, 0)
Me.TreeView1.Name = "TreeView1"
Me.TreeView1.SelectedImageIndex = 0
Me.TreeView1.Size = New System.Drawing.Size(218, 179)
Me.TreeView1.Size = New System.Drawing.Size(218, 182)
Me.TreeView1.StateImageList = Me.ImageList2
Me.TreeView1.TabIndex = 0
'
@@ -1258,7 +1258,7 @@ Partial Class Form1
Me.InputBox.Controls.Add(Me.InputCombo)
Me.InputBox.Dock = System.Windows.Forms.DockStyle.Fill
Me.InputBox.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.InputBox.Location = New System.Drawing.Point(1, 309)
Me.InputBox.Location = New System.Drawing.Point(1, 313)
Me.InputBox.Margin = New System.Windows.Forms.Padding(1, 3, 1, 3)
Me.InputBox.Name = "InputBox"
Me.InputBox.Size = New System.Drawing.Size(218, 154)
@@ -1341,7 +1341,7 @@ Partial Class Form1
Me.TabControl2.Multiline = True
Me.TabControl2.Name = "TabControl2"
Me.TabControl2.SelectedIndex = 0
Me.TabControl2.Size = New System.Drawing.Size(89, 537)
Me.TabControl2.Size = New System.Drawing.Size(89, 541)
Me.TabControl2.TabIndex = 10
'
'TabDraw
@@ -1361,7 +1361,7 @@ Partial Class Form1
Me.TabDraw.Location = New System.Drawing.Point(23, 4)
Me.TabDraw.Name = "TabDraw"
Me.TabDraw.Padding = New System.Windows.Forms.Padding(3)
Me.TabDraw.Size = New System.Drawing.Size(62, 529)
Me.TabDraw.Size = New System.Drawing.Size(62, 533)
Me.TabDraw.TabIndex = 0
Me.TabDraw.Text = "Draw"
'
@@ -1565,7 +1565,7 @@ Partial Class Form1
Me.TabConstruct.Controls.Add(Me.btnPlane)
Me.TabConstruct.Location = New System.Drawing.Point(23, 4)
Me.TabConstruct.Name = "TabConstruct"
Me.TabConstruct.Size = New System.Drawing.Size(62, 529)
Me.TabConstruct.Size = New System.Drawing.Size(62, 533)
Me.TabConstruct.TabIndex = 4
Me.TabConstruct.Text = "Construct"
'
@@ -2060,7 +2060,7 @@ Partial Class Form1
Me.StatusStrip1.Dock = System.Windows.Forms.DockStyle.None
Me.StatusStrip1.GripMargin = New System.Windows.Forms.Padding(0)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsStatusOnL, Me.tsStatusOutput, Me.tsStatusSnapPointType, Me.tsStatusGrid, Me.tsStatusCurPosType, Me.tsStatusCursorPos, Me.tsStatusUnits, Me.tsStatusOnR, Me.tsStatusReg})
Me.StatusStrip1.Location = New System.Drawing.Point(0, 619)
Me.StatusStrip1.Location = New System.Drawing.Point(0, 623)
Me.StatusStrip1.MaximumSize = New System.Drawing.Size(0, 22)
Me.StatusStrip1.MinimumSize = New System.Drawing.Size(0, 22)
Me.StatusStrip1.Name = "StatusStrip1"
@@ -2422,7 +2422,7 @@ Partial Class Form1
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.AutoSize = True
Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
Me.ClientSize = New System.Drawing.Size(1096, 641)
Me.ClientSize = New System.Drawing.Size(1096, 645)
Me.Controls.Add(Me.TableLayoutPanel1)
Me.Cursor = System.Windows.Forms.Cursors.Arrow
Me.ForeColor = System.Drawing.SystemColors.ControlText
+10 -9
View File
@@ -883,7 +883,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABk
DgAAAk1TRnQBSQFMAgEBDwEAARABEQEQAREBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DgAAAk1TRnQBSQFMAgEBDwEAARgBEQEYAREBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAAUADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -955,7 +955,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADW
CAAAAk1TRnQBSQFMAgEBAgEAATABCAEwAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAATgBCAE4AQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1233,13 +1233,14 @@
</data>
<data name="btnPlane.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAAAd0SU1FB94KHwsECi7GS2wAAAEYSURBVFhHxZRLDoMwDEQ5QI9ET9dlFz0Qm94s
zbNIFWKD8pOJ9Go8YM+gql1CCLdiip6Yoiem6IkpnhHPGuGiG7WzFM6IJ5mv1v0amFdaKVhgyjBV+uf7
szy2bwv7nliK3aVQgimDVOmT+WsL1fQGwJQhqvQ95tATAFMGqNL3mkNrAEx5mCr9iDm0BMCUB6nSj5pD
Y4C55tAaQOosc+gKMMscbgvAjp18d86hEWFGgGQcv0Zr90FTwmiAwjie9KsSkv6/r4SRAJl5PLmx/Kos
tDAYYN9x+C+5Qgu9AY5vX2UOWhgIsM/L23NdgxbGA/BR9faghTxAI/l8LVpoXFAyJcAo5c4rTNETU/TE
FD0xRU9M0RNT9CMsP8YUDae/Iv6fAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAHdElNRQffCRYLBS76KngDAAABP0lEQVRYR8WUTa4CIRCE
5wAeSe82iUsXHsiNN8OqFkzTNFFg0pJ81lD8VM0zvi2l9FdcMxLXjMQ1I3HNHhhnwIdpmjut0QOjhJ+9
9V/g+cazhgdDeZgq88vtvp0ezxHyPRBztzUsDOVBqsxL+PWRfma2AEN5iCrzmXAyU4ChPECV+Ww4GS3A
UG6mynwlnIwUYCg3UmW+Gk4GCxwbTkYLiB4VTqYKHBVO/laAd2T03ZpqIsYRBUowvkbv7sprjNUCJhij
/KqE4n/WG2OlgArH0MHyq/JojcUC+Y7qf4lF+94iBDpaoH57fnTDwV7WvQ0Q6ESBfF7ens+WvLbnZynh
bYIsFeBH7+0Zqgvs3iYIlAUG0ed7YHwKiOrFvACpvRG+ncf4XmAVe6cG4/2n7xWIxjUjcc1IXDMS14zE
NeNI2wtww9z9ngOVYQAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnChangeStartCurve.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+11 -2
View File
@@ -115,10 +115,15 @@ Public Class Form1
Dim sLogMsg As String = "User " & SystemInformation.UserName & "\" & SystemInformation.ComputerName & " (" & GetInstance() & ")" & vbLf &
My.Application.Info.Description.ToString() & " ver. " & My.Application.Info.Version.ToString()
EgtInit(m_nDebug, sLogFile, sLogMsg)
' Leggo direttorio dei messaggi (se manca uso direttorio di configurazione)
Dim sMsgDir As String = String.Empty
If GetPrivateProfileString(S_GENERAL, K_MESSAGESDIR, "", sMsgDir, m_sIniFile) = 0 Then
sMsgDir = m_sConfigDir
End If
' Leggo file messaggi
Dim sMsgFile As String = String.Empty
GetPrivateProfileString(S_GENERAL, K_MESSAGES, "", sMsgFile, m_sIniFile)
Dim sMsgFilePath As String = m_sConfigDir & "\" & sMsgFile
Dim sMsgFilePath As String = sMsgDir & "\" & sMsgFile
If Not EgtLoadMessages(sMsgFilePath) Then
EgtOutLog("Error in EgtLoadMessages")
End If
@@ -1075,7 +1080,11 @@ Public Class Form1
' ------ Create -------
Private Sub btnPlane_Click(sender As System.Object, e As System.EventArgs) Handles btnPlane.Click
m_Controller.ExecuteCommand(CMD.PLANE)
If (ModifierKeys And Keys.Shift) = Keys.Shift Then
m_Controller.ExecuteCommand(CMD.REGION)
Else
m_Controller.ExecuteCommand(CMD.PLANE)
End If
End Sub
Private Sub btnExtrude_Click(sender As System.Object, e As System.EventArgs) Handles btnExtrude.Click
Binary file not shown.

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 372 B