Skip to content
Snippets Groups Projects
Commit 84a60d94 authored by Tim Übelhör's avatar Tim Übelhör
Browse files

Updated modules.

Minor fixes.
parent 72a98400
No related branches found
No related tags found
No related merge requests found
[submodule "LabChartExport"]
path = LabChartExport
url = https://git.rwth-aachen.de/ModeliChart/LabChartExportCLI.git
url = git@git.rwth-aachen.de:ModeliChart/LabChartExportCLI.git
[submodule "FmiWrapper"]
path = FmiWrapper
url = https://github.com/Tuebel/FmiWrapper.git
......
......
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
namespace ModeliChart.Basics
......
......
Subproject commit 0888d008f646c8edd2361952dc5c65a231a10451
Subproject commit 1153c13487da90646bc52949e6c1c6e6e1a2480e
Subproject commit 1c2f2f85c8788190bdf255eb178bcfa454e534cd
Subproject commit 3fd93c9b4c3703aeab8d584609af23bb64f0f333
......@@ -62,7 +62,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
......@@ -80,6 +82,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FmiWrapper\src\visual_studio\FmiWrapper_Net\FmiWrapper_Net.csproj">
......
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net47" />
</packages>
\ No newline at end of file
......@@ -184,8 +184,6 @@ namespace ModeliChart.UI
/// <param name="e"></param>
private async void MainWindow_Shown(object sender, EventArgs e)
{
// Show first Area
AddInstrumentArea(CreateEmptyInstrumentArea());
StatusLogger.Reset();
// Load the default workspace
await LoadWorkspaceAsync();
......@@ -639,6 +637,11 @@ namespace ModeliChart.UI
{
AddInstrumentArea(new InstrumentArea(AreaTitle, Instruments));
}
// Create the first area if no other is available
if (instrumentAreas.Count == 0)
{
AddInstrumentArea(CreateEmptyInstrumentArea());
}
StatusLogger.Progress = 90;
ConsoleLogger.WriteLine("MainWindow", "Updated instruments");
// Load time values
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment