Skip to content

Commit 3f3f65d

Browse files
committed
1. Fix for gauges derived from CompositeBaseGauge not being able to be excluded from effects.
2. Restoration of an image needed by the 2D F-15E ADI.
1 parent 688445f commit 3f3f65d

File tree

4 files changed

+24
-3
lines changed

4 files changed

+24
-3
lines changed

Aircraft F-15E Plugin/Aircraft F-15E Plugin.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,5 +952,11 @@
952952
<SubType>Designer</SubType>
953953
</Resource>
954954
</ItemGroup>
955+
<ItemGroup>
956+
<Resource Include="Gauges\Instruments\ADI_Pointer.xaml">
957+
<Generator>MSBuild:Compile</Generator>
958+
<SubType>Designer</SubType>
959+
</Resource>
960+
</ItemGroup>
955961
<Import Project="..\HeliosPlugin.targets" />
956962
</Project>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Canvas Width="40.000" Height="50.000"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
5+
<Canvas Width="40.000" Height="50.000">
6+
<Path StrokeThickness="1.0" Stroke="#ff7e7e7e" StrokeMiterLimit="1.0" Fill="#fff0f0f0" Data="F1 M 18.668,49.500 L 21.970,49.500 C 23.271,49.500 24.427,48.673 24.841,47.447 L 39.341,4.467 C 39.998,2.517 38.538,0.500 36.469,0.500 L 3.531,0.500 C 1.445,0.500 -0.017,2.547 0.673,4.504 L 15.809,47.484 C 16.234,48.692 17.381,49.500 18.668,49.500 Z"/>
7+
</Canvas>
8+
</Canvas>

Aircraft F-15E Plugin/Gauges/Instruments/ADI_V1.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public ADIGauge_V1(string name, Size size, string device)
4848
_ball.Clip = new EllipseGeometry(center, 150d, 150d);
4949
Components.Add(_ball);
5050

51-
Components.Add(new GaugeImage("{F-15E}/Gauges/Instruments/ADI_Gradiant.xaml", new Rect(50d, 50d, 300d, 300d)));
51+
Components.Add(new GaugeImage("{helios}/Gauges/Common/Circular-Shading.xaml", new Rect(50d, 50d, 300d, 300d)));
5252

5353
_pitchAdjustCalibaration = new CalibrationPointCollectionDouble(-1.0d, -30d, 1.0d, 30d);
5454
_wingsNeedle = new GaugeNeedle("{F-15E}/Gauges/Instruments/ADI_Wings.xaml", new Point(50d, 194d), new Size(300d, 55d), new Point(0d, 0d));

Helios/HeliosVisual.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public bool IsDefaultHidden
196196
}
197197
}
198198
/// <summary>
199-
/// Whether this control will have effects applied to is on rendering.
199+
/// Whether this control will have effects applied to it on rendering.
200200
/// </summary>
201201
public virtual bool EffectsExclusion
202202
{
@@ -210,13 +210,20 @@ public virtual bool EffectsExclusion
210210
{
211211
hv.EffectsExclusion = value;
212212
}
213-
if(this is BaseGauge bg)
213+
if (this is BaseGauge bg)
214214
{
215215
foreach (GaugeComponent gc in bg.Components)
216216
{
217217
gc.EffectsExclusion = value;
218218
}
219219
}
220+
if (this is CompositeBaseGauge cbg)
221+
{
222+
foreach (GaugeComponent gc in cbg.Components)
223+
{
224+
gc.EffectsExclusion = value;
225+
}
226+
}
220227
OnPropertyChanged("EffectsExclusion", !value, value, true);
221228
OnEffectsExclusionChanged();
222229
Refresh();

0 commit comments

Comments
 (0)