Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improved BATC Spectrum and mute functionality in video windows. #107

Open
wants to merge 156 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
538b921
Update WinterhillProperties.cs
dl1rf Jul 8, 2024
b3d93f7
Merge branch 'tomvdb:main' into main
dl1rf Oct 28, 2024
6658ca7
Fixed: third bandplan row was no longer visible
dl1rf Nov 2, 2024
561602e
Update MainForm.cs
dl1rf Nov 4, 2024
05bb0ec
Update BATCSpectrum.cs
dl1rf Nov 4, 2024
31f2736
Update signal.cs
dl1rf Nov 4, 2024
f060be9
Update signal.cs
dl1rf Nov 4, 2024
183d1ac
show dBb values in BATC Spectrum
dl1rf Nov 4, 2024
6071788
revert commit "Changed to use real fft_strength value."
dl1rf Nov 4, 2024
01517f0
Update BATCSpectrum.cs
dl1rf Nov 5, 2024
e8854d0
private build version string
dl1rf Nov 5, 2024
07355b8
Update BATCSpectrum.cs
dl1rf Nov 5, 2024
a84b626
Update BATCSpectrum.cs
dl1rf Nov 5, 2024
23a03e0
Right Click to spectrum bandplan fixed
dl1rf Nov 5, 2024
65b0694
Right Click to spectrum bandplan fixed
dl1rf Nov 5, 2024
6f4259c
Update BATCSpectrum.cs
dl1rf Nov 5, 2024
6955a4b
Symbol Rate selection Form added.
dl1rf Nov 5, 2024
83ccf44
Update signal.cs
dl1rf Nov 5, 2024
556f3c1
Update BATCSpectrum.cs
dl1rf Nov 5, 2024
cac6daf
Update BATCSpectrum.cs
dl1rf Nov 5, 2024
f2149ce
bandplan.xml added to source control and project
dl1rf Nov 6, 2024
3594bfb
"Tuning Mode" and "Avoid Beacon" checkbox added.
dl1rf Nov 6, 2024
55bf2ad
Update BATCSpectrum.cs
dl1rf Nov 6, 2024
15e5efa
Update MainForm.cs
dl1rf Nov 6, 2024
01fd022
Update BATCSpectrum.cs
dl1rf Nov 6, 2024
75ac334
Update BATCSpectrum.cs
dl1rf Nov 6, 2024
31e711f
no longer used tool strip menus removed.
dl1rf Nov 6, 2024
414364f
Update WinterhillProperties.cs
dl1rf Nov 6, 2024
79db337
Update signal.cs
dl1rf Nov 6, 2024
0fc49c5
Update signal.cs
dl1rf Nov 6, 2024
7b0256b
show tuned gray box in BATC Spectrum on tuner frequency and status.
dl1rf Nov 6, 2024
ac8f9e1
manual tuning improved
dl1rf Nov 6, 2024
669ec9b
Update WinterhillSource.cs
dl1rf Nov 7, 2024
9fb2a39
Update WinterhillSource.cs
dl1rf Nov 7, 2024
5073ac2
Update SRForm.cs
dl1rf Nov 7, 2024
70cc17c
Update BATCSpectrum.cs
dl1rf Nov 7, 2024
b4528e7
Adding Tune Mode Form
dl1rf Nov 7, 2024
2ff6d06
Revert "Adding Tune Mode Form"
dl1rf Nov 7, 2024
73de09b
"quicktune_enabled" removed
dl1rf Nov 7, 2024
f9b17bd
revert QuicktuneControlSettings
dl1rf Nov 7, 2024
0943daa
Update SRForm.cs
dl1rf Nov 7, 2024
331d6de
adding tuneMode settings.
dl1rf Nov 7, 2024
55bb674
Update MainForm.cs
dl1rf Nov 7, 2024
e76933a
Update MainForm.resx
dl1rf Nov 7, 2024
9a1d8e4
Update MainForm.Designer.cs
dl1rf Nov 7, 2024
7cffb28
Update opentuner.csproj
dl1rf Nov 7, 2024
2968dbc
bandplan.xml added to project
dl1rf Nov 8, 2024
a112453
autoTuneToolStripMenu removed
dl1rf Nov 8, 2024
f6c6b94
autoTuneToolStripMenu removed
dl1rf Nov 8, 2024
3742bbc
path to bandplan.xml corrected
dl1rf Nov 8, 2024
78a5cf7
Update WinterhillProperties.cs
dl1rf Nov 8, 2024
82fbc69
Update socket.cs
dl1rf Nov 8, 2024
5970c1a
Update signal.cs
dl1rf Nov 8, 2024
5901e3f
Update BATCSpectrum.cs
dl1rf Nov 8, 2024
7851459
back to main trunk versions
dl1rf Nov 8, 2024
1f6e6a4
adding overpower level line to spectrum
dl1rf Nov 8, 2024
5015a8c
adding overpower level line to spectrum
dl1rf Nov 8, 2024
2768802
Calculations optimized.
dl1rf Nov 8, 2024
e6d9ac3
Calculations optimized
dl1rf Nov 9, 2024
60419e8
Calculation optimized
dl1rf Nov 9, 2024
1755a94
Update BATCSpectrum.cs
dl1rf Nov 9, 2024
34a56e9
Update BATCSpectrum.cs
dl1rf Nov 9, 2024
c67b3ca
show tuned box if receiver has tuned and locked.
dl1rf Nov 9, 2024
d2f9f44
show tuned box if receiver has tuned and locked.
dl1rf Nov 9, 2024
e793364
reduce side wobbling of text in spectrum display.
dl1rf Nov 9, 2024
cf02d9a
reduce side wobbling of text in spectrum display
dl1rf Nov 9, 2024
99121bb
Signal lists renamed to make them more clear to me.
dl1rf Nov 9, 2024
6ef6b26
Signal lists renamed to make them more clear to me.
dl1rf Nov 9, 2024
86397ce
Symbol rate form and functionality added
dl1rf Nov 9, 2024
de31142
Symbol rate form and functionality added
dl1rf Nov 9, 2024
a61f2a2
selectable overpower indication + preparation for auto tune functions
dl1rf Nov 9, 2024
7ece39e
selectable overpower indication + preparation for auto tune functions
dl1rf Nov 9, 2024
4c49793
Merge pull request #1 from dl1rf/devel
dl1rf Nov 9, 2024
c2ab5d9
restore original versions
dl1rf Nov 9, 2024
46e405d
Update BATCSpectrum.cs
dl1rf Nov 10, 2024
d80d593
Update BATCSpectrum.cs
dl1rf Nov 10, 2024
60857ad
Display volume % at top of bar
dl1rf Nov 10, 2024
054864e
750kS symbol rate alignment added
dl1rf Nov 10, 2024
74eb512
Added function GetMuteState. ToggleMute function filled with action.
dl1rf Nov 10, 2024
efc98fa
Right click to video window will mute/unmute audio
dl1rf Nov 10, 2024
14b3696
num_rx need to be initialized with tuner count.
dl1rf Nov 11, 2024
35faf17
tuneMode... names changed to BATCSpectrum...
dl1rf Nov 11, 2024
2a913d6
do not stop streaming if we lost lock
dl1rf Nov 11, 2024
0082100
introduce Thread.ResetAbort();
dl1rf Nov 13, 2024
e231343
better controlled shutdown of web sockets
dl1rf Nov 13, 2024
d82aea5
better controlled udpclient close
dl1rf Nov 13, 2024
de7f70e
settings filename changed
dl1rf Nov 13, 2024
ed35f7c
added: allow mouse click to reconnect the socket
dl1rf Nov 13, 2024
5f72b9c
Update socket.cs
dl1rf Nov 13, 2024
1a802aa
added: spectrum drawing lock
dl1rf Nov 13, 2024
20bbea6
Update BATCSpectrum.cs
dl1rf Nov 13, 2024
fd7a2a1
wrong debug message removed
dl1rf Nov 13, 2024
1d5866d
allow udp streaming even if not locked
dl1rf Nov 13, 2024
51027b9
function "mute_at_startup" fixed
dl1rf Nov 14, 2024
08a5337
Windows Exception prevented
dl1rf Nov 14, 2024
c13b464
Update MinitiounerSource.cs
dl1rf Nov 14, 2024
5f1271b
exception fixed.
dl1rf Nov 15, 2024
2db7f06
show streaming and recording indicator
dl1rf Nov 15, 2024
fed5de8
align symbolrate to stop flickering of callsign
dl1rf Nov 16, 2024
912c9b1
use beacon QRG - offset to setup first tuning QRG
dl1rf Nov 16, 2024
ce1acaa
align GUI window to current available screens
dl1rf Nov 17, 2024
2bec1e4
float[,] rx_blocks changed to RX[] rx_blocks
dl1rf Nov 18, 2024
d4b9f5a
Fix problem with callsign display in BATCSpectrum
dl1rf Nov 18, 2024
5aaa5e7
EventLoop task termination fixed
dl1rf Nov 21, 2024
b1c89e8
TS_Thread was not responding on program shutdown
dl1rf Nov 22, 2024
a9bdfb9
RF level calculation fixed
dl1rf Nov 22, 2024
7fc86af
Fixed: Always recording first tuner
dl1rf Nov 22, 2024
4933b26
Update NimThread.cs
dl1rf Nov 23, 2024
d43b96c
Update TSParserThread.cs
dl1rf Nov 23, 2024
517e30d
Update signal.cs
dl1rf Nov 23, 2024
280021b
Update WinterhillSource.cs
dl1rf Nov 23, 2024
1001efe
Fix BATCSpectrum Callsign update
dl1rf Nov 23, 2024
f8c9e02
0.C
dl1rf Nov 23, 2024
3e3deeb
Log errors with Log.Error
dl1rf Nov 23, 2024
1d6c224
Log.Information changed to Log.Warning
dl1rf Nov 24, 2024
0fc7462
cosmetic
dl1rf Nov 25, 2024
88335e9
Introduce drawing thread
dl1rf Nov 25, 2024
5092431
use mouse right click + shift key to select SRForm
dl1rf Nov 25, 2024
f48cf08
Better shutdown with WinterHill if nothing is streamed.
dl1rf Nov 30, 2024
b27e69a
VideoSource Start function added
dl1rf Nov 30, 2024
1199755
Fixed Dialog Box.
dl1rf Nov 30, 2024
529dc8a
Update UDPClient.cs
dl1rf Nov 30, 2024
29f533c
reset demodstate
dl1rf Dec 6, 2024
768ff58
VideoChangeCB parameter 1 value reduced by 1
dl1rf Dec 6, 2024
7e6a8cf
db_margin and mer rounded to 2 digits.
dl1rf Dec 6, 2024
125f094
introducing new Auto Tune Function.
dl1rf Dec 6, 2024
6d59fc9
Update BATCSpectrumSettingsForm.Designer.cs
dl1rf Dec 6, 2024
db242d9
new invoke media button pressed functionality
dl1rf Dec 7, 2024
86dc95d
Update signal.cs
dl1rf Dec 10, 2024
c1bd32d
Log Exceptions
dl1rf Dec 10, 2024
88f7282
Text corrected
dl1rf Dec 10, 2024
bbc8572
Log Exceptions
dl1rf Dec 10, 2024
98ceccf
Vulnarable package updated
dl1rf Dec 10, 2024
4d6f687
media player close added.
dl1rf Dec 11, 2024
451ad19
Use LNB-A Power Supply Settings as the only available LNB Power Supply
dl1rf Dec 17, 2024
d7b795a
revert last change to support Picotuner Pro
dl1rf Dec 17, 2024
c1d66f7
Media Control Button color change fixed
dl1rf Jan 17, 2025
e19bc55
Save and restore WebChat window position
dl1rf Jan 17, 2025
36e648f
New position of channel info
dl1rf Jan 17, 2025
968c345
use Ctrl Key for Symbol Rate selection
dl1rf Jan 17, 2025
ab4b18d
Provisioning of Build Date changed
dl1rf Jan 17, 2025
3e39eb8
Catch exception if DeserializeObject fail
dl1rf Jan 17, 2025
6cdaabe
save UDP streaming status and restore at next run
dl1rf Jan 17, 2025
23dc637
save properties visibility to settings
dl1rf Jan 17, 2025
81802ba
Fixed: Bandplan not always drawn while resizing the window.
dl1rf Jan 18, 2025
7953762
DATV Reporter Menu Item added
dl1rf Jan 19, 2025
3ef24cd
Update signal.cs
dl1rf Jan 19, 2025
7872e70
Use mouse double click to change video view.
dl1rf Jan 19, 2025
924f20e
do not resize video container if container is windowed
dl1rf Jan 20, 2025
0c206af
Save and restore InfoContainer visibility
dl1rf Jan 17, 2025
946992e
Auto Tune next new implemented
dl1rf Jan 20, 2025
aa61602
Init changed
dl1rf Jan 22, 2025
f0d541b
Limit CallSign text position to container height.
dl1rf Jan 22, 2025
9b5b52f
Update WinterhillProperties.cs
dl1rf Jan 23, 2025
9736c30
Set Nickname in main webchat settings formular
dl1rf Jan 23, 2025
8923673
separate video path for recordings added
dl1rf Jan 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Symbol rate form and functionality added
Symbol Rate Form added.
It is used when the right Mouse button is pressed within a tuner field.
This will force a new tuning with selected symbol rate.
Function is as within QO100 WB Live Tune program.
  • Loading branch information
dl1rf committed Nov 9, 2024
commit 86397ceb0409c86b902a05f88cf93fbd931e2b33
85 changes: 62 additions & 23 deletions ExtraFeatures/BATCSpectrum/BATCSpectrum.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public class BATCSpectrum
private int mousePos_y = 0;

private int fft_data_length = 918;
public bool pluto_control_enabled = false;

public void updateSignalCallsign(string callsign, double freq, float sr)
{
Expand Down Expand Up @@ -279,7 +280,7 @@ private void spectrum_SizeChanged(object sender, EventArgs e)
}
catch (Exception Ex)
{

Log.Error(Ex.Message);
}
}

Expand Down Expand Up @@ -363,11 +364,11 @@ private void drawspectrum_signals(List<signal.Sig> signals)
tmp.DrawLine(whitePen, Convert.ToInt16(s.fft_start * spectrum_wScale), height - Convert.ToInt16(s.fft_strength / height), Convert.ToInt16(s.fft_stop * spectrum_wScale), height - Convert.ToInt16(s.fft_strength / height));
tmp.DrawLine(whitePen, Convert.ToInt16(s.fft_start * spectrum_wScale), height - Convert.ToInt16(s.fft_strength / height), Convert.ToInt16(s.fft_start * spectrum_wScale), height);
tmp.DrawLine(whitePen, Convert.ToInt16(s.fft_stop * spectrum_wScale), height - Convert.ToInt16(s.fft_strength / height), Convert.ToInt16(s.fft_stop * spectrum_wScale), height);
tmp.DrawString(s.callsign + "\n" + Math.Round(s.frequency, 2).ToString("#0.00") + "\n " + (s.sr * 1000).ToString("#Ks") + "\n " + s.dbb.ToString("#0.0dBb"), new Font("Tahoma", 10), Brushes.White, new PointF(s.text_pos * spectrum_wScale - 30.0f, height - Convert.ToSingle(s.fft_strength / height + 50)));
tmp.DrawString(s.callsign + "\n" + s.frequency.ToString("#0.000") + "\n " + (s.sr * 1000).ToString("#Ks") + "\n " + s.dbb.ToString("#0.0dBb"), new Font("Tahoma", 10), Brushes.White, new PointF(s.text_pos * spectrum_wScale - 30.0f, height - Convert.ToSingle(s.fft_strength / height + 50)));
}
else
{
tmp.DrawString(s.callsign + "\n" + Math.Round(s.frequency,2).ToString("#0.00") + "\n " + (s.sr * 1000).ToString("#Ks"), new Font("Tahoma", 10), Brushes.White, new PointF(s.text_pos * spectrum_wScale - 30.0f, height - Convert.ToSingle(s.fft_strength / height + 50)));
tmp.DrawString(s.callsign + "\n" + s.frequency.ToString("#0.000") + "\n " + (s.sr * 1000).ToString("#Ks"), new Font("Tahoma", 10), Brushes.White, new PointF(s.text_pos * spectrum_wScale - 30.0f, height - Convert.ToSingle(s.fft_strength / height + 50)));
}
}
}
Expand All @@ -383,7 +384,7 @@ private void UpdateDrawing()
}
catch (Exception Ex)
{

Log.Error(Ex.Message);
}

}
Expand Down Expand Up @@ -469,15 +470,15 @@ private void drawspectrum(UInt16[] fft_data)
{
y = i * (spectrum_h / _tuners);
tmp.DrawLine(greyPen, 10, y, spectrum_w, y);
tmp.DrawString("RX " + (i+1).ToString(), new Font("Tahoma", 10), Brushes.White, new PointF(5, y));
tmp.DrawString("RX " + (i + 1).ToString(), new Font("Tahoma", 10), Brushes.White, new PointF(5, y));
}

drawspectrum_signals(sigs.signals);
}

private void spectrum_Click(object sender, EventArgs e)
{

int spectrum_h = _spectrum.Height - bandplan_height;
float spectrum_w = _spectrum.Width;
float spectrum_wScale = spectrum_w / fft_data_length;

Expand All @@ -487,33 +488,71 @@ private void spectrum_Click(object sender, EventArgs e)
int X = pos.X;
int Y = pos.Y;

if (me.Button == MouseButtons.Right)
if (Y > spectrum_h)
{
int spectrum_h = _spectrum.Height - bandplan_height;

if (Y > spectrum_h)
if (pluto_control_enabled)
{
int freq = Convert.ToInt32(start_freq + X / (double)spectrum_wScale / fft_data_length * 9.0 * 1000.0);
//UpdateTextBox(txtFreq, freq.ToString());

string tx_freq = get_bandplan_TX_freq(X, Y);
debug("TX-Freq: " + tx_freq + " MHz");
// dh3cs
if (!string.IsNullOrEmpty(tx_freq))
switch (me.Button)
{
//Clipboard.SetText((Convert.ToDecimal(tx_freq) * 1000).ToString()); //DATV Express in Hz
Clipboard.SetText(tx_freq); //DATV-Easy in MHz
TX_Text = " TX: " + tx_freq;
case MouseButtons.Left:
string tx_freq = get_bandplan_TX_freq(X, Y);
debug("TX-Freq: " + tx_freq + " MHz");
// dh3cs
if (!string.IsNullOrEmpty(tx_freq))
{
//Clipboard.SetText((Convert.ToDecimal(tx_freq) * 1000).ToString()); //DATV Express in Hz
Clipboard.SetText(tx_freq); //DATV-Easy in MHz
TX_Text = " TX: " + tx_freq;
}
break;
default:
break;
}
}
}
else
{
selectSignal(X, Y);
}
switch (me.Button)
{
case MouseButtons.Left:
if (Control.ModifierKeys == Keys.Shift)
{

}
}
else
{
selectSignal(X, Y);
}
break;
case MouseButtons.Right:
uint freq = Convert.ToUInt32((10490.5 + (X / spectrum_wScale / 922.0) * 9.0) * 1000.0);

using (opentuner.SRForm srForm = new opentuner.SRForm(freq)) //open up the manual sr select form
{
Point spectrum_screen_location = _spectrum.PointToScreen(_spectrum.Location);
Point new_srForm_location = spectrum_screen_location;
int spectrum_width = _spectrum.Size.Width;
int srForm_width = srForm.Size.Width;

if (X > (srForm_width / 2))
new_srForm_location.X = spectrum_screen_location.X + X - srForm.Size.Width / 2;
if (X > (spectrum_width - srForm.Size.Width / 2))
new_srForm_location.X = spectrum_screen_location.X + (spectrum_width - srForm.Size.Width);

srForm.StartPosition = FormStartPosition.Manual;
srForm.Location = new_srForm_location;
DialogResult result = srForm.ShowDialog();
if (result == DialogResult.OK)
{
OnSignalSelected?.Invoke(determine_rx(Y), freq, srForm.getsr());
}
}
break;
default:
break;
}
}
}

// quick tune functions - From https://github.com/m0dts/QO-100-WB-Live-Tune - Rob Swinbank

Expand Down
63 changes: 63 additions & 0 deletions ExtraFeatures/BATCSpectrum/SRForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading