Skip to content

Commit 2312e69

Browse files
EMS90EMS90
EMS90
authored and
EMS90
committed
- Bugfix on File loading of exisitng Files
- Autoscroll down layoutPanel when containers are added - Updated default value for Transform
1 parent e69412e commit 2312e69

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

TRA.Lib/TRA.Lib.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<UseWindowsForms>true</UseWindowsForms>
66
<TargetFramework>net6.0-windows</TargetFramework>
77
<Configurations>Debug;Release;Release_NO_SCOTTPLOT</Configurations>
8+
<VersionPrefix>2.0.1</VersionPrefix>
9+
<Version>$(c)</Version>
810
</PropertyGroup>
911

1012
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_NO_SCOTTPLOT|AnyCPU'" />

TRA.Lib/TrassierungInterface.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public static TRATrasse ImportTRA(string fileName)
124124
reader.ReadSingle();
125125

126126
//Search for existing trasse
127-
TRATrasse trasse = (TRATrasse)Trasse.LoadedTrassen.Find(n => n.Filename.Contains(Path.GetFileName(fileName)));// Split('.')[0]));
127+
TRATrasse trasse = (TRATrasse)Trasse.LoadedTrassen.Find(n => n.Filename.Equals(Path.GetFileName(fileName)));// Split('.')[0]));
128128
if (trasse != null)
129129
{
130130
TrassierungLog.Logger?.LogInformation("A existing TRA-Trasse was found, existing TRA Data is overwritten", nameof(trasse));
@@ -316,7 +316,7 @@ public static GRATrasse ImportGRA(string fileName)
316316
num_GS = reader.ReadInt32();
317317

318318
//Search for existing trasse
319-
GRATrasse trasse = (GRATrasse)Trasse.LoadedTrassen.Find(n => n.Filename.Contains(Path.GetFileName(fileName).Split('.')[0]));
319+
GRATrasse trasse = (GRATrasse)Trasse.LoadedTrassen.Find(n => n.Filename.Equals(Path.GetFileName(fileName).Split('.')[0]));
320320
if (trasse != null)
321321
{
322322
TrassierungLog.Logger?.LogInformation("A existing Trasse was found: " + (trasse is TRATrasse ? "GRA Data is added to TRATrasse, " : "") + "existing GRA Data is overwritten", nameof(trasse));

TRA.Tool/MainForm.Designer.cs

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

TRA.Tool/MainForm.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,10 @@ private void btn_SaveAll_Click(object sender, EventArgs e)
302302
}
303303
}
304304

305-
305+
private void flowLayoutPanel_ControlAdded(object sender, ControlEventArgs e)
306+
{
307+
flowLayoutPanel.ScrollControlIntoView(flowLayoutPanel.Controls[flowLayoutPanel.Controls.Count - 1]);
308+
}
306309
}
307310

308311
public class TextBoxLogger : ILogger

TRA.Tool/TransformPanel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public TransformPanel() : base()
3232
comboBox_TransformFrom.DataSource = new BindingList<string>(egbt22lib.Convert.Defined_CRS);
3333
comboBox_TransformFromVCS.DataSource = egbt22lib.Convert.Defined_VRS;
3434
comboBox_TransformTo.DataSource = new BindingList<string>(egbt22lib.Convert.Defined_CRS);
35-
comboBox_TransformFrom.SelectedIndex = 4;
35+
comboBox_TransformFrom.SelectedIndex = 8;
3636
comboBox_TransformTo.SelectedItem = 0;
3737
comboBox_TransformFrom.SelectedIndexChanged += comboBox_Transform_SelectedIndexChanged;
3838
comboBox_TransformTo.SelectedIndexChanged += comboBox_Transform_SelectedIndexChanged;

0 commit comments

Comments
 (0)