Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions 4 .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
id: meta
uses: docker/metadata-action@v5
with:
images: joinfs/joinfs-console
images: ${{ secrets.DOCKERHUB_USERNAME }}/joinfs-console
tags: |
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
Expand Down
21 changes: 8 additions & 13 deletions 21 .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@

*.pfx
*.p12
/JoinFS/.vs
/JoinFS/bin
/JoinFS/obj
/JoinFS-XP/JoinFS-XP64/x64/Release
*.pfx
.claude
/.vs
/JoinFS-XP/.vs
/JoinFS-XP/JoinFS-XP64/x64/Debug
/.vs
/JoinFS/Installer/bin
/JoinFS/Installer/obj
/JoinFS.Tests/bin
/JoinFS.Tests/obj
/RecordingXRay/bin
/RecordingXRay/obj
/JoinFS-XP/JoinFS-XP64/x64/Release
/JoinFS-XP/x64
/JoinFS/.vs
**/bin/
**/obj/
.github/workflows/
11 changes: 10 additions & 1 deletion 11 JoinFS/Forms/AircraftForm.Designer.cs

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

35 changes: 22 additions & 13 deletions 35 JoinFS/Forms/AircraftForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -350,19 +350,8 @@ void AddAircraft(Sim.Aircraft aircraft)
if (aircraft.variableSet != null)
{
// COM frequencies
// Try Float first, if not available then try Integer
var com1Value = aircraft.variableSet.GetFloat(vuidCom1);
if (com1Value == 0)
{
com1Value = aircraft.variableSet.GetInteger(vuidCom1) / 100f;
}
item.com1 = com1Value.ToString("F3");
var com2Value = aircraft.variableSet.GetFloat(vuidCom2);
if (com2Value == 0)
{
com2Value = aircraft.variableSet.GetInteger(vuidCom2) / 100f;
}
item.com2 = com2Value.ToString("F3");
item.com1 = aircraft.variableSet.GetFrequency(vuidCom1).ToString("F3");
item.com2 = aircraft.variableSet.GetFrequency(vuidCom2).ToString("F3");
// squawk
item.squawk = aircraft.variableSet.GetInteger(vuidSquawk).ToString();
// rules
Expand Down Expand Up @@ -1107,6 +1096,7 @@ private void Context_Aircraft_Opening(object sender, System.ComponentModel.Cance
{
// disable all options
Context_Aircraft_Substitute.Enabled = false;
Context_Aircraft_ExplainMatch.Enabled = false;
Context_Aircraft_Callsign.Enabled = false;
Context_Aircraft_FlightPlan.Enabled = false;
Context_Aircraft_Variables.Enabled = false;
Expand Down Expand Up @@ -1149,6 +1139,8 @@ private void Context_Aircraft_Opening(object sender, System.ComponentModel.Cance
{
// allow substitution
Context_Aircraft_Substitute.Enabled = true;
// allow explaining how the current model match was chosen
Context_Aircraft_ExplainMatch.Enabled = aircraft.subModel != null && aircraft.subTrace != null;
// enable flight plan
Context_Aircraft_FlightPlan.Enabled = true;
// enable variables
Expand Down Expand Up @@ -1288,6 +1280,23 @@ private void Context_Aircraft_Substitute_Click(object sender, EventArgs e)
}
}

private void Context_Aircraft_ExplainMatch_Click(object sender, EventArgs e)
{
Sim.Aircraft aircraft;

lock (main.conch)
{
// get aircraft
aircraft = GetAircraft(GetSelectedItem());
}

// check for a computed match to explain
if (aircraft != null && aircraft.subTrace != null)
{
new MatchExplainForm(main, aircraft).ShowDialog();
}
}

private void Context_Aircraft_Callsign_Click(object sender, EventArgs e)
{
string model = "";
Expand Down
12 changes: 12 additions & 0 deletions 12 JoinFS/Forms/AircraftForm.resx
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@
<data name="Context_Aircraft_Substitute.Size" type="System.Drawing.Size, System.Drawing">
<value>226, 22</value>
</data>
<data name="Context_Aircraft_ExplainMatch.Size" type="System.Drawing.Size, System.Drawing">
<value>226, 22</value>
</data>
<data name="ColBroadcast.Width" type="System.Int32, mscorlib">
<value>65</value>
</data>
Expand Down Expand Up @@ -252,6 +255,9 @@
<data name="&gt;&gt;Context_Aircraft_AdjustHeight.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Context_Aircraft_ExplainMatch.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
Expand Down Expand Up @@ -390,6 +396,9 @@
<data name="Context_Aircraft_AdjustHeight.Text" xml:space="preserve">
<value>Adjust Height...</value>
</data>
<data name="Context_Aircraft_ExplainMatch.Text" xml:space="preserve">
<value>Explain Match...</value>
</data>
<data name="Label_FlightPlan2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
Expand Down Expand Up @@ -486,6 +495,9 @@
<data name="&gt;&gt;Context_Aircraft_AdjustHeight.Name" xml:space="preserve">
<value>Context_Aircraft_AdjustHeight</value>
</data>
<data name="&gt;&gt;Context_Aircraft_ExplainMatch.Name" xml:space="preserve">
<value>Context_Aircraft_ExplainMatch</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
Expand Down
216 changes: 216 additions & 0 deletions 216 JoinFS/Forms/MatchExplainForm.Designer.cs

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

Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.