Skip to content

Commit 899384b

Browse files
macabamacaba
committed
Tweaks
1 parent f5fc771 commit 899384b

18 files changed

Lines changed: 672 additions & 702 deletions

‎source/TS.NET.Sequencer/DialogStep.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public DialogStep(string name, Func<Dialog, DialogResult> uiDialog) : base(name)
1414
Action = (CancellationToken cancellationToken) =>
1515
{
1616
var dialogResult = uiDialog?.Invoke(new Dialog { Title = Title!, Text = Text!, Buttons = Buttons, Icon = Icon });
17-
Result!.Summary = $"Dialog: {dialogResult}";
17+
Result!.Summary = $"{dialogResult}";
1818
if (dialogResult == DialogResult.Ok || dialogResult == DialogResult.Yes)
1919
return Status.Done;
2020
else

‎source/TS.NET.Sequencer/HTML/HtmlReport.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@
7676
{
7777
case ResultMetadataException exception:
7878
{
79-
<div class="@(firstMetadataItem ? "pb-2" : "py-2") text-xs">Exception:</div>
79+
<div class="@(firstMetadataItem ? "pb-2" : "py-2") text-xs">Exception</div>
8080
<pre class="bg-red-100 text-xs p-2 whitespace-pre-wrap overflow-auto max-w-full break-words">@exception.Exception</pre>
8181
}
8282
break;
8383
case ResultMetadataTable table:
8484
{
85-
<div class="@(firstMetadataItem ? "pb-2" : "py-2") text-xs">@table.Name:</div>
85+
<div class="@(firstMetadataItem ? "pb-2" : "py-2") text-xs">@table.Name</div>
8686
<table class="text-xs border border-gray-400">
8787
@if (table.Headers != null && table.Headers.Length > 0)
8888
{

‎source/TS.NET.Sequences/Sequences/AdcBranchGainsAnalysisSequence.cs‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,37 +25,37 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
2525
new LoadUserCalFromDeviceFallbackToFileStep("Load calibration from device/file", Variables),
2626
new WarmupStep("Warmup device", Variables) { Skip = false, AllowSkip = true },
2727

28-
new AdcBranchGainsStep("ADC branch gains - Channel 1 - 1 GSPS", 0, 1_000_000_000, Variables),
29-
new AdcBranchGainsStep("ADC branch gains - Channel 1 - 660 MSPS", 0, 660_000_000, Variables),
30-
new AdcBranchGainsStep("ADC branch gains - Channel 1 - 500 MSPS", 0, 500_000_000, Variables),
31-
new AdcBranchGainsStep("ADC branch gains - Channel 1 - 330 MSPS", 0, 330_000_000, Variables),
32-
new AdcBranchGainsStep("ADC branch gains - Channel 1 - 250 MSPS", 0, 250_000_000, Variables),
33-
new AdcBranchGainsStep("ADC branch gains - Channel 1 - 165 MSPS", 0, 165_000_000, Variables),
34-
new AdcBranchGainsStep("ADC branch gains - Channel 1 - 100 MSPS", 0, 100_000_000, Variables),
28+
//new AdcBranchGainsStep("ADC branch gains - Channel 1 - 1 GSPS", 0, 1_000_000_000, Variables),
29+
//new AdcBranchGainsStep("ADC branch gains - Channel 1 - 660 MSPS", 0, 660_000_000, Variables),
30+
//new AdcBranchGainsStep("ADC branch gains - Channel 1 - 500 MSPS", 0, 500_000_000, Variables),
31+
//new AdcBranchGainsStep("ADC branch gains - Channel 1 - 330 MSPS", 0, 330_000_000, Variables),
32+
//new AdcBranchGainsStep("ADC branch gains - Channel 1 - 250 MSPS", 0, 250_000_000, Variables),
33+
//new AdcBranchGainsStep("ADC branch gains - Channel 1 - 165 MSPS", 0, 165_000_000, Variables),
34+
//new AdcBranchGainsStep("ADC branch gains - Channel 1 - 100 MSPS", 0, 100_000_000, Variables),
3535

36-
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 1 GSPS", 1, 1_000_000_000, Variables),
37-
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 660 MSPS", 1, 660_000_000, Variables),
38-
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 500 MSPS", 1, 500_000_000, Variables),
39-
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 330 MSPS", 1, 330_000_000, Variables),
40-
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 250 MSPS", 1, 250_000_000, Variables),
41-
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 165 MSPS", 1, 165_000_000, Variables),
42-
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 100 MSPS", 1, 100_000_000, Variables),
36+
//new AdcBranchGainsStep("ADC branch gains - Channel 2 - 1 GSPS", 1, 1_000_000_000, Variables),
37+
//new AdcBranchGainsStep("ADC branch gains - Channel 2 - 660 MSPS", 1, 660_000_000, Variables),
38+
//new AdcBranchGainsStep("ADC branch gains - Channel 2 - 500 MSPS", 1, 500_000_000, Variables),
39+
//new AdcBranchGainsStep("ADC branch gains - Channel 2 - 330 MSPS", 1, 330_000_000, Variables),
40+
//new AdcBranchGainsStep("ADC branch gains - Channel 2 - 250 MSPS", 1, 250_000_000, Variables),
41+
//new AdcBranchGainsStep("ADC branch gains - Channel 2 - 165 MSPS", 1, 165_000_000, Variables),
42+
//new AdcBranchGainsStep("ADC branch gains - Channel 2 - 100 MSPS", 1, 100_000_000, Variables),
4343

44-
new AdcBranchGainsStep("ADC branch gains - Channel 3 - 1 GSPS", 2, 1_000_000_000, Variables),
45-
new AdcBranchGainsStep("ADC branch gains - Channel 3 - 660 MSPS", 2, 660_000_000, Variables),
46-
new AdcBranchGainsStep("ADC branch gains - Channel 3 - 500 MSPS", 2, 500_000_000, Variables),
47-
new AdcBranchGainsStep("ADC branch gains - Channel 3 - 330 MSPS", 2, 330_000_000, Variables),
48-
new AdcBranchGainsStep("ADC branch gains - Channel 3 - 250 MSPS", 2, 250_000_000, Variables),
49-
new AdcBranchGainsStep("ADC branch gains - Channel 3 - 165 MSPS", 2, 165_000_000, Variables),
50-
new AdcBranchGainsStep("ADC branch gains - Channel 3 - 100 MSPS", 2, 100_000_000, Variables),
44+
//new AdcBranchGainsStep("ADC branch gains - Channel 3 - 1 GSPS", 2, 1_000_000_000, Variables),
45+
//new AdcBranchGainsStep("ADC branch gains - Channel 3 - 660 MSPS", 2, 660_000_000, Variables),
46+
//new AdcBranchGainsStep("ADC branch gains - Channel 3 - 500 MSPS", 2, 500_000_000, Variables),
47+
//new AdcBranchGainsStep("ADC branch gains - Channel 3 - 330 MSPS", 2, 330_000_000, Variables),
48+
//new AdcBranchGainsStep("ADC branch gains - Channel 3 - 250 MSPS", 2, 250_000_000, Variables),
49+
//new AdcBranchGainsStep("ADC branch gains - Channel 3 - 165 MSPS", 2, 165_000_000, Variables),
50+
//new AdcBranchGainsStep("ADC branch gains - Channel 3 - 100 MSPS", 2, 100_000_000, Variables),
5151

52-
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 1 GSPS", 3, 1_000_000_000, Variables),
53-
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 660 MSPS", 3, 660_000_000, Variables),
54-
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 500 MSPS", 3, 500_000_000, Variables),
55-
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 330 MSPS", 3, 330_000_000, Variables),
56-
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 250 MSPS", 3, 250_000_000, Variables),
57-
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 165 MSPS", 3, 165_000_000, Variables),
58-
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 100 MSPS", 3, 100_000_000, Variables),
52+
//new AdcBranchGainsStep("ADC branch gains - Channel 4 - 1 GSPS", 3, 1_000_000_000, Variables),
53+
//new AdcBranchGainsStep("ADC branch gains - Channel 4 - 660 MSPS", 3, 660_000_000, Variables),
54+
//new AdcBranchGainsStep("ADC branch gains - Channel 4 - 500 MSPS", 3, 500_000_000, Variables),
55+
//new AdcBranchGainsStep("ADC branch gains - Channel 4 - 330 MSPS", 3, 330_000_000, Variables),
56+
//new AdcBranchGainsStep("ADC branch gains - Channel 4 - 250 MSPS", 3, 250_000_000, Variables),
57+
//new AdcBranchGainsStep("ADC branch gains - Channel 4 - 165 MSPS", 3, 165_000_000, Variables),
58+
//new AdcBranchGainsStep("ADC branch gains - Channel 4 - 100 MSPS", 3, 100_000_000, Variables),
5959

6060
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel([]); return Sequencer.Status.Done; }},
6161

0 commit comments

Comments
 (0)