Merge pull request #45 from tomaz82/fixes

Enhance romid detection + remember last import directory

Author: JockeJarre

b2sbackglassdesigner/b2sbackglassdesigner/Modules/moduleB2S.vb

@@ -53,6 +53,7 @@ Module moduleB2S
     Public Property DefaultOpacity() As Single = 1
     Public Property DefaultVPTablesFolder() As String = String.Empty
     Public Property LatestAuthor() As String = String.Empty
+    Public Property LatestImportDirectory() As String = String.Empty
 
     Public Property NoToolEvents() As Boolean = False
 

b2sbackglassdesigner/b2sbackglassdesigner/classes/Base classes/formBase.vb

@@ -72,6 +72,9 @@
             If node.SelectSingleNode("LatestAuthor") IsNot Nothing Then
                 LatestAuthor = node.SelectSingleNode("LatestAuthor").Attributes("Value").InnerText
             End If
+            If node.SelectSingleNode("LatestImportDirectory") IsNot Nothing Then
+                LatestImportDirectory = node.SelectSingleNode("LatestImportDirectory").Attributes("Value").InnerText
+            End If
             Me.Location = New Point(x, y)
             Me.Size = New Size(width, height)
             Me.WindowState = If(maximized, FormWindowState.Maximized, FormWindowState.Normal)
@@ -151,6 +154,7 @@
                 helper.AddXMLAttribute(XmlSettings, nodeForm, "Opacity", "Value", CInt(DefaultOpacity * 100).ToString())
                 helper.AddXMLAttribute(XmlSettings, nodeForm, "VPTablesFolder", "Value", DefaultVPTablesFolder)
                 helper.AddXMLAttribute(XmlSettings, nodeForm, "LatestAuthor", "Value", LatestAuthor)
+                helper.AddXMLAttribute(XmlSettings, nodeForm, "LatestImportDirectory", "Value", LatestImportDirectory)
             End If
             ' save
             Try

b2sbackglassdesigner/b2sbackglassdesigner/classes/Tab/B2STabPage.vb

@@ -1079,23 +1079,30 @@ Public Class B2STabPage
                 .Location = loc
                 .Image = image
                 .IsImageSnippit = True
-                If Char.IsDigit(name.Last()) Then
-                    Dim copy As String = name
-                    Dim numbers As String = ""
-                    While Char.IsDigit(copy.Last())
-                        numbers = copy.Last() + numbers
-                        copy = copy.Substring(0, copy.Length - 1)
+
+                If name.Length AndAlso Char.IsDigit(name.Last()) Then
+                    Dim romtype As String = name
+                    Dim romid As String = ""
+
+                    While romtype.Length AndAlso Char.IsDigit(romtype.Last())
+                        romid = romtype.Last() + romid
+                        romtype = romtype.Substring(0, romtype.Length - 1)
                     End While
-                    If numbers.Length AndAlso copy.Length Then
-                        If copy.Substring(copy.Length - 1, 1) = "L" Then
-                            .RomID = CInt(numbers)
+
+                    If romid.Length Then
+                        .RomID = CInt(romid)
+                    End If
+
+                    If romid.Length AndAlso romtype.Length Then
+                        If romtype.EndsWith("L") Then
                             .RomIDType = eRomIDType.Lamp
-                        ElseIf copy.Substring(copy.Length - 1, 1) = "S" Then
-                            .RomID = CInt(numbers)
+                            .RomInverted = romtype.EndsWith("iL")
+                        ElseIf romtype.EndsWith("S") Then
                             .RomIDType = eRomIDType.Solenoid
-                        ElseIf copy.Length > 1 AndAlso copy.Substring(copy.Length - 2, 2) = "Gi" Then
-                            .RomID = CInt(numbers)
+                            .RomInverted = romtype.EndsWith("iS")
+                        ElseIf romtype.EndsWith("Gi") Then
                             .RomIDType = eRomIDType.GIString
+                            .RomInverted = romtype.EndsWith("iGi")
                         End If
                     End If
                 End If

b2sbackglassdesigner/b2sbackglassdesigner/formDesigner.vb

@@ -522,10 +522,12 @@ Public Class formDesigner
             With filedialog
                 .Filter = "'directB2S' backglass file (*.directb2s)|*.directb2s|ALL (*.*)|*.*"
                 .FileName = String.Empty
-                .InitialDirectory = BackglassProjectsPath
+                .InitialDirectory = If(LatestImportDirectory.Length, LatestImportDirectory, BackglassProjectsPath)
                 If .ShowDialog(Me) = DialogResult.OK Then
                     Dim backglassdata As Backglass.Data = Nothing
                     Cursor.Current = Cursors.WaitCursor
+                    LatestImportDirectory = IO.Path.GetDirectoryName(.FileName)
+                    SaveSettings()
                     Try
                         coding.ImportDirectB2SFile(backglassdata, .FileName)
                         If backglassdata IsNot Nothing Then