diff --git a/Project Files/Source/Console/AssemblyInfo.cs b/Project Files/Source/Console/AssemblyInfo.cs index 67852a8..4c64318 100644 --- a/Project Files/Source/Console/AssemblyInfo.cs +++ b/Project Files/Source/Console/AssemblyInfo.cs @@ -63,7 +63,7 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.4.5")] +[assembly: AssemblyVersion("3.4.6")] // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/Project Files/Source/Console/HPSDR/specHPSDR.cs b/Project Files/Source/Console/HPSDR/specHPSDR.cs index b841507..61da068 100644 --- a/Project Files/Source/Console/HPSDR/specHPSDR.cs +++ b/Project Files/Source/Console/HPSDR/specHPSDR.cs @@ -549,22 +549,22 @@ public void initAnalyzer() case 0: Display.RXDisplayLow = low; Display.RXDisplayHigh = high; - if (Display.CurrentDisplayMode == DisplayMode.WATERFALL || - Display.CurrentDisplayMode == DisplayMode.PANAFALL) - { - Display.TXDisplayLow = low_tx; - Display.TXDisplayHigh = high_tx; - } + //if (Display.CurrentDisplayMode == DisplayMode.WATERFALL || + // Display.CurrentDisplayMode == DisplayMode.PANAFALL) + // { + // Display.TXDisplayLow = low_tx; + // Display.TXDisplayHigh = high_tx; + // } break; case 1: Display.RX2DisplayLow = low; Display.RX2DisplayHigh = high; - if (!(Display.CurrentDisplayMode == DisplayMode.WATERFALL || - Display.CurrentDisplayMode == DisplayMode.PANAFALL)) - { + //if (!(Display.CurrentDisplayMode == DisplayMode.WATERFALL || + // Display.CurrentDisplayMode == DisplayMode.PANAFALL)) + // { Display.TXDisplayLow = low_tx; Display.TXDisplayHigh = high_tx; - } + // } break; } diff --git a/Project Files/Source/Console/console.cs b/Project Files/Source/Console/console.cs index 056f6d4..4f5b7eb 100644 --- a/Project Files/Source/Console/console.cs +++ b/Project Files/Source/Console/console.cs @@ -31382,7 +31382,7 @@ private void RunDisplay() { case DisplayMode.WATERFALL: case DisplayMode.PANAFALL: - if (mox && !display_duplex && (NReceivers <= 2) || mox && !SetupForm.DisablePureSignal && !display_duplex) + if (mox && ((!display_duplex /*&& (StitchedReceivers == 1)) || (!SetupForm.DisablePureSignal && !display_duplex*/))) { if (chkVFOATX.Checked || !chkRX2.Checked) { diff --git a/Project Files/Source/Console/display.cs b/Project Files/Source/Console/display.cs index b5c8dd8..21845fe 100644 --- a/Project Files/Source/Console/display.cs +++ b/Project Files/Source/Console/display.cs @@ -7018,8 +7018,8 @@ unsafe private static void DrawPanadapterGrid(ref Graphics g, int W, int H, int int grid_step = 0; // spectrum_grid_step; int f_diff = 0; - if ((CurrentDisplayMode == DisplayMode.PANAFALL && (console.NReceivers <= 2 && display_duplex)) || - (CurrentDisplayMode == DisplayMode.PANAFALL && console.NReceivers > 2) || + if ((CurrentDisplayMode == DisplayMode.PANAFALL && (/*console.NReceivers <= 2 && */ display_duplex)) || + // (CurrentDisplayMode == DisplayMode.PANAFALL && console.StitchedReceivers == 3) || (CurrentDisplayMode == DisplayMode.PANADAPTER && display_duplex)) displayduplex = true; if (local_mox && !displayduplex)// || (mox && tx_on_vfob)) @@ -8657,10 +8657,16 @@ private static void DrawWaterfallGrid(ref Graphics g, int W, int H, int rx, bool int grid_max = 0; int grid_min = 0; int f_diff = 0; + bool displayduplex = false; if (rx == 1 && !tx_on_vfob && mox) local_mox = true; if (rx == 2 && tx_on_vfob && mox) local_mox = true; + if ((CurrentDisplayMode == DisplayMode.PANAFALL && (/*console.NReceivers <= 2 && */display_duplex)) || + // (CurrentDisplayMode == DisplayMode.PANAFALL && console.StitchedReceivers == 3) || + (CurrentDisplayMode == DisplayMode.WATERFALL && display_duplex)) displayduplex = true; + + if (rx == 2) { if (local_mox)// && tx_on_vfob) @@ -8685,7 +8691,7 @@ private static void DrawWaterfallGrid(ref Graphics g, int W, int H, int rx, bool { if (local_mox) // && !tx_on_vfob) { - if (!display_duplex) + if (!displayduplex) { low = tx_display_low; high = tx_display_high; @@ -10193,8 +10199,8 @@ unsafe static private bool DrawPanadapter(Graphics g, int W, int H, int rx, bool if (rx == 2 && tx_on_vfob && mox) local_mox = true; if (rx == 1 && tx_on_vfob && mox && !console.RX2Enabled) local_mox = true; - if ((CurrentDisplayMode == DisplayMode.PANAFALL && (console.NReceivers <= 2 && display_duplex)) || - (CurrentDisplayMode == DisplayMode.PANAFALL && console.NReceivers > 2) || + if ((CurrentDisplayMode == DisplayMode.PANAFALL && (/*console.NReceivers <= 2 && */display_duplex)) || + // (CurrentDisplayMode == DisplayMode.PANAFALL && console.StitchedReceivers == 3) || (CurrentDisplayMode == DisplayMode.PANADAPTER && display_duplex)) displayduplex = true; if (rx == 2) @@ -10218,7 +10224,7 @@ unsafe static private bool DrawPanadapter(Graphics g, int W, int H, int rx, bool { if (local_mox) // && !tx_on_vfob) { - if (!display_duplex) + if (!displayduplex) { Low = tx_display_low; High = tx_display_high; @@ -10773,9 +10779,8 @@ unsafe static private bool DrawWaterfall(Graphics g, int W, int H, int rx, bool Color mid_color = Color.Red; Color high_color = Color.Blue; - if ((CurrentDisplayMode == DisplayMode.PANAFALL && (console.NReceivers <= 2 && display_duplex)) || - (CurrentDisplayMode == DisplayMode.PANAFALL && console.NReceivers > 2) || - (CurrentDisplayMode == DisplayMode.PANADAPTER && display_duplex) || + if ((CurrentDisplayMode == DisplayMode.PANAFALL && (/*console.NReceivers <= 2 && */display_duplex)) || + // (CurrentDisplayMode == DisplayMode.PANAFALL && console.StitchedReceivers == 3) || (CurrentDisplayMode == DisplayMode.WATERFALL && display_duplex)) displayduplex = true; if (rx == 2) diff --git a/Project Files/bin/Debug/PowerSDR.exe b/Project Files/bin/Debug/PowerSDR.exe index 1865949..83de843 100644 Binary files a/Project Files/bin/Debug/PowerSDR.exe and b/Project Files/bin/Debug/PowerSDR.exe differ diff --git a/Project Files/bin/Debug/PowerSDR.pdb b/Project Files/bin/Debug/PowerSDR.pdb index 5509be6..14acb8d 100644 Binary files a/Project Files/bin/Debug/PowerSDR.pdb and b/Project Files/bin/Debug/PowerSDR.pdb differ diff --git a/Project Files/bin/Debug/de/PowerSDR.resources.dll b/Project Files/bin/Debug/de/PowerSDR.resources.dll index 2d3b5b5..fa26ca0 100644 Binary files a/Project Files/bin/Debug/de/PowerSDR.resources.dll and b/Project Files/bin/Debug/de/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Debug/es/PowerSDR.resources.dll b/Project Files/bin/Debug/es/PowerSDR.resources.dll index 8c67576..e8c30f2 100644 Binary files a/Project Files/bin/Debug/es/PowerSDR.resources.dll and b/Project Files/bin/Debug/es/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Debug/fr/PowerSDR.resources.dll b/Project Files/bin/Debug/fr/PowerSDR.resources.dll index 55d756e..397cabc 100644 Binary files a/Project Files/bin/Debug/fr/PowerSDR.resources.dll and b/Project Files/bin/Debug/fr/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Debug/it/PowerSDR.resources.dll b/Project Files/bin/Debug/it/PowerSDR.resources.dll index fe9588a..630753b 100644 Binary files a/Project Files/bin/Debug/it/PowerSDR.resources.dll and b/Project Files/bin/Debug/it/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Debug/ja/PowerSDR.resources.dll b/Project Files/bin/Debug/ja/PowerSDR.resources.dll index b82d405..a4c1e4c 100644 Binary files a/Project Files/bin/Debug/ja/PowerSDR.resources.dll and b/Project Files/bin/Debug/ja/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Debug/ko/PowerSDR.resources.dll b/Project Files/bin/Debug/ko/PowerSDR.resources.dll index f12cc8d..70933ec 100644 Binary files a/Project Files/bin/Debug/ko/PowerSDR.resources.dll and b/Project Files/bin/Debug/ko/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Debug/ru/PowerSDR.resources.dll b/Project Files/bin/Debug/ru/PowerSDR.resources.dll index 56b7f1b..08654c6 100644 Binary files a/Project Files/bin/Debug/ru/PowerSDR.resources.dll and b/Project Files/bin/Debug/ru/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Debug/wdsp.dll b/Project Files/bin/Debug/wdsp.dll index ad7ffe1..09cda64 100644 Binary files a/Project Files/bin/Debug/wdsp.dll and b/Project Files/bin/Debug/wdsp.dll differ diff --git a/Project Files/bin/Debug/wdsp.ilk b/Project Files/bin/Debug/wdsp.ilk index f0e9580..309da1a 100644 Binary files a/Project Files/bin/Debug/wdsp.ilk and b/Project Files/bin/Debug/wdsp.ilk differ diff --git a/Project Files/bin/Debug/zh-Hans/PowerSDR.resources.dll b/Project Files/bin/Debug/zh-Hans/PowerSDR.resources.dll index 9131e86..bf3e00c 100644 Binary files a/Project Files/bin/Debug/zh-Hans/PowerSDR.resources.dll and b/Project Files/bin/Debug/zh-Hans/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Debug/zh-Hant/PowerSDR.resources.dll b/Project Files/bin/Debug/zh-Hant/PowerSDR.resources.dll index 9b7ed66..0083bbb 100644 Binary files a/Project Files/bin/Debug/zh-Hant/PowerSDR.resources.dll and b/Project Files/bin/Debug/zh-Hant/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Release/Midi2Cat.dll b/Project Files/bin/Release/Midi2Cat.dll index 17b9350..8325613 100644 Binary files a/Project Files/bin/Release/Midi2Cat.dll and b/Project Files/bin/Release/Midi2Cat.dll differ diff --git a/Project Files/bin/Release/Midi2Cat.pdb b/Project Files/bin/Release/Midi2Cat.pdb index 581dc29..6953d31 100644 Binary files a/Project Files/bin/Release/Midi2Cat.pdb and b/Project Files/bin/Release/Midi2Cat.pdb differ diff --git a/Project Files/bin/Release/PowerSDR.exe b/Project Files/bin/Release/PowerSDR.exe index dd10d53..fbfc4f0 100644 Binary files a/Project Files/bin/Release/PowerSDR.exe and b/Project Files/bin/Release/PowerSDR.exe differ diff --git a/Project Files/bin/Release/PowerSDR.pdb b/Project Files/bin/Release/PowerSDR.pdb index 66f5b12..3049cbe 100644 Binary files a/Project Files/bin/Release/PowerSDR.pdb and b/Project Files/bin/Release/PowerSDR.pdb differ diff --git a/Project Files/bin/Release/de/PowerSDR.resources.dll b/Project Files/bin/Release/de/PowerSDR.resources.dll index 0a70f93..91a9240 100644 Binary files a/Project Files/bin/Release/de/PowerSDR.resources.dll and b/Project Files/bin/Release/de/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Release/es/PowerSDR.resources.dll b/Project Files/bin/Release/es/PowerSDR.resources.dll index 66eb823..e3745b1 100644 Binary files a/Project Files/bin/Release/es/PowerSDR.resources.dll and b/Project Files/bin/Release/es/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Release/fr/PowerSDR.resources.dll b/Project Files/bin/Release/fr/PowerSDR.resources.dll index dd3a70d..1d83721 100644 Binary files a/Project Files/bin/Release/fr/PowerSDR.resources.dll and b/Project Files/bin/Release/fr/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Release/it/PowerSDR.resources.dll b/Project Files/bin/Release/it/PowerSDR.resources.dll index d84265f..040e72f 100644 Binary files a/Project Files/bin/Release/it/PowerSDR.resources.dll and b/Project Files/bin/Release/it/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Release/ja/PowerSDR.resources.dll b/Project Files/bin/Release/ja/PowerSDR.resources.dll index 75f7929..a07df5a 100644 Binary files a/Project Files/bin/Release/ja/PowerSDR.resources.dll and b/Project Files/bin/Release/ja/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Release/ko/PowerSDR.resources.dll b/Project Files/bin/Release/ko/PowerSDR.resources.dll index 4ae7b60..c80ba87 100644 Binary files a/Project Files/bin/Release/ko/PowerSDR.resources.dll and b/Project Files/bin/Release/ko/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Release/ru/PowerSDR.resources.dll b/Project Files/bin/Release/ru/PowerSDR.resources.dll index e5d716b..7114edb 100644 Binary files a/Project Files/bin/Release/ru/PowerSDR.resources.dll and b/Project Files/bin/Release/ru/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Release/zh-Hans/PowerSDR.resources.dll b/Project Files/bin/Release/zh-Hans/PowerSDR.resources.dll index e24757f..2c20fd3 100644 Binary files a/Project Files/bin/Release/zh-Hans/PowerSDR.resources.dll and b/Project Files/bin/Release/zh-Hans/PowerSDR.resources.dll differ diff --git a/Project Files/bin/Release/zh-Hant/PowerSDR.resources.dll b/Project Files/bin/Release/zh-Hant/PowerSDR.resources.dll index f0271c8..313b598 100644 Binary files a/Project Files/bin/Release/zh-Hant/PowerSDR.resources.dll and b/Project Files/bin/Release/zh-Hant/PowerSDR.resources.dll differ diff --git a/ReadMe.md b/ReadMe.md index 95c418e..a8c800e 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,9 +1,12 @@ # OpenHPSDR-PowerSDR -Latest Release v3.4.5 November 20, 2017 +Latest Release v3.4.6 November 20, 2017 Read the RealeaseNotes.md for more information. +# 3.4.6 (2017-11-20) +- Corrected problem with blank waterfall display in Panafall mode. + # 3.4.5 (2017-11-20) - Bug fix for .NET unhandled exception error when starting without radio online. diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 9e22b87..bb1d415 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,4 +1,4 @@ -# PowerSDR_mRX_PS 3.4.5.0 November 20, 2017 +# PowerSDR_mRX_PS 3.4.6.0 November 20, 2017 # 3.2.22 (2015-1-24) @@ -339,3 +339,5 @@ Fixed a bug resulting in incorrect vertical display scale in transmit under cert # 3.4.5 (2017-11-20) - Bug fix for .NET unhandled exception error when starting without radio online. +# 3.4.6 (2017-11-20) +- Corrected problem with blank waterfall display in Panafall mode.