Egalware/TestEIn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TestEIn 1.8j6 :

Browse Source 
- aggiornamento.
This commit is contained in:
Dario Sassi
2017-11-02 07:36:08 +00:00
parent bc9a9c3370
commit ff78a821c4
3 changed files with 73 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controller.vb
+66 -57
View File
@@ -242,13 +242,14 @@ Public Class Controller
Dim sFile As String = sDir
' Scelta file con dialogo
If bWithDlg Then
Dim OpenFileDialog As New OpenFileDialog
OpenFileDialog.Title = "Open"
OpenFileDialog.Filter = "New geometry EgalTech(*.nge)|*.nge" &
"|New font EgalTech(*.nfe)|*.nfe" &
"|All Files (*.*)|*.*"
OpenFileDialog.FilterIndex = 1
OpenFileDialog.InitialDirectory = sDir
Dim OpenFileDialog As New OpenFileDialog With {
.Title = "Open",
.Filter = "New geometry EgalTech(*.nge)|*.nge" &
"|New font EgalTech(*.nfe)|*.nfe" &
"|All Files (*.*)|*.*",
.FilterIndex = 1,
.InitialDirectory = sDir
}
If OpenFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
Return True
End If
@@ -273,15 +274,16 @@ Public Class Controller
Dim sFile As String = sDir
' Scelta file con dialogo
If bWithDlg Then
Dim OpenFileDialog As New OpenFileDialog
OpenFileDialog.Title = "Insert"
OpenFileDialog.Filter = "New geometry EgalTech(*.nge)|*.nge" &
"|Drawing Exchange Fmt(*.dxf)|*.dxf" &
"|Stereolithography (*.stl)|*.stl" &
"|New font EgalTech(*.nfe)|*.nfe" &
"|All Files (*.*)|*.*"
OpenFileDialog.FilterIndex = 1
OpenFileDialog.InitialDirectory = sDir
Dim OpenFileDialog As New OpenFileDialog With {
.Title = "Insert",
.Filter = "New geometry EgalTech(*.nge)|*.nge" &
"|Drawing Exchange Fmt(*.dxf)|*.dxf" &
"|Stereolithography (*.stl)|*.stl" &
"|New font EgalTech(*.nfe)|*.nfe" &
"|All Files (*.*)|*.*",
.FilterIndex = 1,
.InitialDirectory = sDir
}
If OpenFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
Return True
End If
@@ -340,11 +342,12 @@ Public Class Controller
'Eventuale sistemazione estensione
sFile = IO.Path.ChangeExtension(sFile, "nge")
'Assegnazione nome file con dialogo
Dim SaveFileDialog As New SaveFileDialog
SaveFileDialog.Title = "Save"
SaveFileDialog.Filter = "New geometry EgalTech(*.nge)|*.nge"
SaveFileDialog.FileName = sFile
SaveFileDialog.InitialDirectory = IO.Path.GetDirectoryName(sFile)
Dim SaveFileDialog As New SaveFileDialog With {
.Title = "Save",
.Filter = "New geometry EgalTech(*.nge)|*.nge",
.FileName = sFile,
.InitialDirectory = IO.Path.GetDirectoryName(sFile)
}
If SaveFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
Return True
End If
@@ -393,11 +396,12 @@ Public Class Controller
sFile = sDir.TrimEnd("\") & "\" & sName
End If
'Assegnazione nome file con dialogo
Dim SaveFileDialog As New SaveFileDialog
SaveFileDialog.Title = "Save Object"
SaveFileDialog.Filter = "New geometry EgalTech(*.nge)|*.nge"
SaveFileDialog.FileName = sFile
SaveFileDialog.InitialDirectory = sDir.TrimEnd("\")
Dim SaveFileDialog As New SaveFileDialog With {
.Title = "Save Object",
.Filter = "New geometry EgalTech(*.nge)|*.nge",
.FileName = sFile,
.InitialDirectory = sDir.TrimEnd("\")
}
If SaveFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
Return True
End If
@@ -427,16 +431,17 @@ Public Class Controller
Dim sFile As String = sDir
'Scelta file con dialogo
If bWithDlg Then
Dim OpenFileDialog As New OpenFileDialog
OpenFileDialog.Title = "Import"
OpenFileDialog.Filter = "Drawing Exchange Fmt(*.dxf)|*.dxf" &
"|Stereolithography (*.stl)|*.stl" &
"|Building parts (*.btl)|*.btl" &
"|Part program ISO (*.cnc;*.xpi;*.mpf)|*.cnc;*.xpi;*.mpf" &
"|Cms file format (*.hed;*.ent;*.ens)|*.hed;*.ent;*.ens" &
"|All Files (*.*)|*.*"
OpenFileDialog.FilterIndex = 6
OpenFileDialog.InitialDirectory = sDir
Dim OpenFileDialog As New OpenFileDialog With {
.Title = "Import",
.Filter = "Drawing Exchange Fmt(*.dxf)|*.dxf" &
"|Stereolithography (*.stl)|*.stl" &
"|Building parts (*.btl)|*.btl" &
"|Part program ISO (*.cnc;*.xpi;*.mpf)|*.cnc;*.xpi;*.mpf" &
"|Cms file format (*.hed;*.ent;*.ens)|*.hed;*.ent;*.ens" &
"|All Files (*.*)|*.*",
.FilterIndex = 6,
.InitialDirectory = sDir
}
If OpenFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
Return True
End If
@@ -479,14 +484,15 @@ Public Class Controller
Public Function ExportProject(Optional ByVal sFile As String = "") As Boolean
'Assegnazione nome file con dialogo
Dim SaveFileDialog As New SaveFileDialog
SaveFileDialog.Title = "Export"
SaveFileDialog.Filter = "Drawing Exchange Fmt(*.dxf)|*.dxf" &
"|Stereolithography (*.stl)|*.stl" &
"|Images (*.png;*.jpg;*.jpeg;*.bmp)|*.png;*.jpg;*.jpeg;*.bmp" &
"|All Files (*.*)|*.*"
SaveFileDialog.FilterIndex = 4
SaveFileDialog.FileName = sFile
Dim SaveFileDialog As New SaveFileDialog With {
.Title = "Export",
.Filter = "Drawing Exchange Fmt(*.dxf)|*.dxf" &
"|Stereolithography (*.stl)|*.stl" &
"|Images (*.png;*.jpg;*.jpeg;*.bmp)|*.png;*.jpg;*.jpeg;*.bmp" &
"|All Files (*.*)|*.*",
.FilterIndex = 4,
.FileName = sFile
}
If SaveFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
Return True
End If
@@ -529,13 +535,14 @@ Public Class Controller
Dim sFile As String = sDir
'Scelta file con dialogo
If bWithDlg Then
Dim OpenFileDialog As New OpenFileDialog
OpenFileDialog.Title = "Exec Script"
OpenFileDialog.Filter = "Lua commands(*.lua)|*.lua" &
"|Test commands(*.tsc)|*.tsc" &
"|All Files (*.*)|*.*"
OpenFileDialog.FilterIndex = 1
OpenFileDialog.InitialDirectory = sDir
Dim OpenFileDialog As New OpenFileDialog With {
.Title = "Exec Script",
.Filter = "Lua commands(*.lua)|*.lua" &
"|Test commands(*.tsc)|*.tsc" &
"|All Files (*.*)|*.*",
.FilterIndex = 1,
.InitialDirectory = sDir
}
If OpenFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
Return True
End If
@@ -1759,8 +1766,9 @@ Public Class Controller
Else
Return False
End If
Dim ColDlg As New ColorDialog
ColDlg.AnyColor = True
Dim ColDlg As New ColorDialog With {
.AnyColor = True
}
Dim colObj As Color3d
EgtGetCalcColor(nCurrId, colObj)
ColDlg.Color = colObj.ToColor()
@@ -3963,10 +3971,11 @@ Public Class Controller
Dim colObj As Color3d
EgtGetCalcColor(nId, colObj)
' lancio dialogo scelta colore
Dim ColDlg As New ColorDialog()
ColDlg.AnyColor = True
ColDlg.Color = colObj.ToColor()
ColDlg.FullOpen = True
Dim ColDlg As New ColorDialog() With {
.AnyColor = True,
.Color = colObj.ToColor(),
.FullOpen = True
}
If ColDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then
Return False
End If
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
' utilizzando l'asterisco (*) come descritto di seguito:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.8.10.5")>
<Assembly: AssemblyFileVersion("1.8.10.5")>
<Assembly: AssemblyVersion("1.8.10.6")>
<Assembly: AssemblyFileVersion("1.8.10.6")>
Scene.vb
+5 -4
View File
@@ -1,7 +1,7 @@
'----------------------------------------------------------------------------
' EgalTech 2014-2017
' EgalTech 2014-2015
'----------------------------------------------------------------------------
' File : Scene.vb Data : 01.09.17 Versione : 1.8i1
' File : Scene.vb Data : 27.01.15 Versione : 1.6a6
' Contenuto : Classe Scene (parte di MVC).
'
'
@@ -704,8 +704,9 @@ Public Class Scene
Return vId(0)
' altrimenti faccio scegliere all'utente
ElseIf vId.Count() > 1 Then
Dim MselDlg As New SelectMulti(vId)
MselDlg.StartPosition = System.Windows.Forms.FormStartPosition.Manual
Dim MselDlg As New SelectMulti(vId) With {
.StartPosition = FormStartPosition.Manual
}
Dim ptScreen As Point = PointToScreen(WinXY)
ptScreen.Offset(10, 0)
MselDlg.Location = ptScreen