Skip to content

Commit 2b1343a

Browse files
ClutchplateDudeClutchplateDude
committed
V1.1.16.0 Updates
- Added SharpCap AutoPA support and moved AutoPA settings to its own category in App Settings.
1 parent a4f7837 commit 2b1343a

18 files changed

+1485
-486
lines changed

‎OATControl/DlgAppSettings.xaml‎

Lines changed: 125 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<Window.Resources>
1616
<converters:DoubleToHMSConverter x:Key="RAConverter" />
1717
<converters:DoubleToHMSConverter x:Key="DECConverter" Formatter = "[0:+00;-00]° [1:00]&quot; [2:00]'"/>
18+
<converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" Collapse="True" />
1819
<Style x:Key="CategoryItem" TargetType="ListViewItem" BasedOn="{StaticResource MetroListBoxItem}" >
1920
<Setter Property="FontWeight" Value="Bold" />
2021
<Setter Property="FontSize" Value="14" />
@@ -246,6 +247,7 @@
246247
<ListViewItem Content="General" Style="{StaticResource CategoryItem}"/>
247248
<ListViewItem Content="Autohoming" Style="{StaticResource CategoryItem}"/>
248249
<ListViewItem Content="Target List" Style="{StaticResource CategoryItem}"/>
250+
<ListViewItem Content="Auto PA" Style="{StaticResource CategoryItem}"/>
249251
</ListView>
250252
</Border>
251253
</Border>
@@ -305,77 +307,9 @@
305307
Margin="0,2,0,0"
306308
Command="{Binding ConfigureChecklistCommand}" Padding="0" Style="{StaticResource ImageSquareButtonStyle}" ToolTip="Configure the items on the checklist to display." />
307309
</StackPanel>
308-
<StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Top" Margin="0,20,0,0">
309-
<TextBlock Text="N.I.N.A. Log folder" Style="{StaticResource TextBlockLabel}" VerticalAlignment="Top"/>
310-
<TextBlock Text="The log folder of N.I.N.A. to monitor for Polar Alignment. Only N.I.N.A. V3.1 and later is supported." Style="{StaticResource TextBlockOptionHelp}" VerticalAlignment="Top" HorizontalAlignment="Stretch" Width="Auto"/>
311-
</StackPanel>
312-
<TextBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2"
313-
Style="{StaticResource TextBoxSmall}"
314-
Width="Auto"
315-
HorizontalAlignment="Stretch"
316-
Text="{Binding NinaLogFolder}"
317-
VerticalAlignment="Center" Margin="0,4,20,0"/>
318-
319-
<StackPanel Grid.Row="4" Grid.Column="0" VerticalAlignment="Top">
320-
<TextBlock Text="Monitor N.I.N.A. for TPPA" Style="{StaticResource TextBlockLabel}" VerticalAlignment="Top"/>
321-
<TextBlock Text="If enabled, this will monitor N.I.N.A. and automatically run Polar Alignment adjustments as needed." Style="{StaticResource TextBlockOptionHelp}" VerticalAlignment="Top" HorizontalAlignment="Left"/>
322-
</StackPanel>
323-
<Grid Grid.Row="4" Grid.Column="1" Width="Auto" HorizontalAlignment="Left">
324-
<Grid.RowDefinitions>
325-
<RowDefinition Height="Auto" />
326-
<RowDefinition Height="Auto" />
327-
</Grid.RowDefinitions>
328-
<Grid.ColumnDefinitions>
329-
<ColumnDefinition Width="40" />
330-
<ColumnDefinition Width="*" />
331-
<ColumnDefinition Width="40" />
332-
</Grid.ColumnDefinitions>
333-
<Controls:ToggleSwitchButton Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Margin="5,0,20,0" VerticalAlignment="Center" ThumbIndicatorBrush="#E00" IsChecked="{Binding MonitorNinaForPA}"/>
334-
<TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Text="No" FontSize="10" Margin="6,-5,0,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
335-
<TextBlock Grid.Row="1" Grid.Column="2" Text="Yes" FontSize="10" Margin="5,-5,20,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
336-
</Grid>
337-
338-
<StackPanel Grid.Row="5" Grid.Column="0" VerticalAlignment="Top">
339-
<TextBlock Text="Invert AZ corrections" Style="{StaticResource TextBlockLabel}" VerticalAlignment="Top"/>
340-
<TextBlock Text="If enabled, the corrections for the AZ axis from N.I.N.A. will be inverted." Style="{StaticResource TextBlockOptionHelp}" VerticalAlignment="Top" HorizontalAlignment="Left"/>
341-
</StackPanel>
342-
<Grid Grid.Row="5" Grid.Column="1" Width="Auto" HorizontalAlignment="Left">
343-
<Grid.RowDefinitions>
344-
<RowDefinition Height="Auto" />
345-
<RowDefinition Height="Auto" />
346-
</Grid.RowDefinitions>
347-
<Grid.ColumnDefinitions>
348-
<ColumnDefinition Width="40" />
349-
<ColumnDefinition Width="*" />
350-
<ColumnDefinition Width="40" />
351-
</Grid.ColumnDefinitions>
352-
<Controls:ToggleSwitchButton Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Margin="5,0,20,0" VerticalAlignment="Center" ThumbIndicatorBrush="#E00" IsChecked="{Binding InvertNinaAZCorrections}"/>
353-
<TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Text="No" FontSize="10" Margin="6,-5,0,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
354-
<TextBlock Grid.Row="1" Grid.Column="2" Text="Yes" FontSize="10" Margin="5,-5,20,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
355-
</Grid>
356-
357-
<StackPanel Grid.Row="6" Grid.Column="0" VerticalAlignment="Top">
358-
<TextBlock Text="Invert ALT corrections" Style="{StaticResource TextBlockLabel}" VerticalAlignment="Top"/>
359-
<TextBlock Text="If enabled, the corrections for the ALT axis from N.I.N.A. will be inverted." Style="{StaticResource TextBlockOptionHelp}" VerticalAlignment="Top" HorizontalAlignment="Left"/>
360-
</StackPanel>
361-
<Grid Grid.Row="6" Grid.Column="1" Width="Auto" HorizontalAlignment="Left">
362-
<Grid.RowDefinitions>
363-
<RowDefinition Height="Auto" />
364-
<RowDefinition Height="Auto" />
365-
</Grid.RowDefinitions>
366-
<Grid.ColumnDefinitions>
367-
<ColumnDefinition Width="40" />
368-
<ColumnDefinition Width="*" />
369-
<ColumnDefinition Width="40" />
370-
</Grid.ColumnDefinitions>
371-
<Controls:ToggleSwitchButton Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Margin="5,0,20,0" VerticalAlignment="Center" ThumbIndicatorBrush="#E00" IsChecked="{Binding InvertNinaALTCorrections}"/>
372-
<TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Text="No" FontSize="10" Margin="6,-5,0,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
373-
<TextBlock Grid.Row="1" Grid.Column="2" Text="Yes" FontSize="10" Margin="5,-5,20,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
374-
</Grid>
375-
310+
376311
</Grid>
377312
</TabItem>
378-
379313
<TabItem Header="Autohoming">
380314
<!-- AUTOHOMING -->
381315
<StackPanel Grid.Row="1" Grid.Column="1" Margin="0,0,0,10">
@@ -495,6 +429,128 @@
495429
</StackPanel>
496430
</Grid>
497431
</TabItem>
432+
<TabItem Header="Auto PA" >
433+
<!-- AUTO PA -->
434+
<Grid>
435+
<Grid.RowDefinitions>
436+
<RowDefinition Height="Auto"/>
437+
<RowDefinition Height="Auto"/>
438+
<RowDefinition Height="Auto"/>
439+
<RowDefinition Height="Auto"/>
440+
<RowDefinition Height="Auto"/>
441+
<RowDefinition Height="Auto"/>
442+
<RowDefinition Height="Auto"/>
443+
<RowDefinition Height="Auto"/>
444+
</Grid.RowDefinitions>
445+
<Grid.ColumnDefinitions>
446+
<ColumnDefinition Width="*" />
447+
<ColumnDefinition Width="Auto" />
448+
</Grid.ColumnDefinitions>
449+
450+
<StackPanel Grid.Row="0" Grid.Column="0" VerticalAlignment="Top">
451+
<TextBlock Text="Monitor N.I.N.A. for TPPA" Style="{StaticResource TextBlockLabel}" VerticalAlignment="Top"/>
452+
<TextBlock Text="If enabled, this will monitor N.I.N.A. and automatically run Polar Alignment adjustments as needed." Style="{StaticResource TextBlockOptionHelp}" VerticalAlignment="Top" HorizontalAlignment="Left"/>
453+
</StackPanel>
454+
<Grid Grid.Row="0" Grid.Column="1" Width="Auto" HorizontalAlignment="Left">
455+
<Grid.RowDefinitions>
456+
<RowDefinition Height="Auto" />
457+
<RowDefinition Height="Auto" />
458+
</Grid.RowDefinitions>
459+
<Grid.ColumnDefinitions>
460+
<ColumnDefinition Width="40" />
461+
<ColumnDefinition Width="*" />
462+
<ColumnDefinition Width="40" />
463+
</Grid.ColumnDefinitions>
464+
<Controls:ToggleSwitchButton Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Margin="5,0,20,0" VerticalAlignment="Center" ThumbIndicatorBrush="#E00" IsChecked="{Binding MonitorNinaForPA}"/>
465+
<TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Text="No" FontSize="10" Margin="6,-5,0,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
466+
<TextBlock Grid.Row="1" Grid.Column="2" Text="Yes" FontSize="10" Margin="5,-5,20,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
467+
</Grid>
468+
<StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Top" Margin="20,0,0,0"
469+
Visibility="{Binding MonitorNinaForPA, Converter={StaticResource BoolToVisibilityConverter}}">
470+
<TextBlock Text="N.I.N.A. Log folder" Style="{StaticResource TextBlockLabel}" VerticalAlignment="Top" />
471+
<TextBlock Text="The log folder of N.I.N.A. to monitor for Polar Alignment. Only N.I.N.A. V3.1 and later is supported." Style="{StaticResource TextBlockOptionHelp}" VerticalAlignment="Top" HorizontalAlignment="Stretch" Width="Auto" />
472+
</StackPanel>
473+
<TextBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
474+
Visibility="{Binding MonitorNinaForPA, Converter={StaticResource BoolToVisibilityConverter}}"
475+
Style="{StaticResource TextBoxSmall}"
476+
Width="Auto"
477+
HorizontalAlignment="Stretch"
478+
Text="{Binding NinaLogFolder}"
479+
VerticalAlignment="Center" Margin="20,4,20,0"/>
480+
481+
<StackPanel Grid.Row="3" Grid.Column="0" VerticalAlignment="Top" Margin="0,20,0,0">
482+
<TextBlock Text="Monitor SharpCap for Polar Alignment" Style="{StaticResource TextBlockLabel}" VerticalAlignment="Top"/>
483+
<TextBlock Text="If enabled, this will monitor SharpCap and automatically run Polar Alignment adjustments as needed." Style="{StaticResource TextBlockOptionHelp}" VerticalAlignment="Top" HorizontalAlignment="Left"/>
484+
</StackPanel>
485+
<Grid Grid.Row="3" Grid.Column="1" Width="Auto" HorizontalAlignment="Left" Margin="0,20,0,0">
486+
<Grid.RowDefinitions>
487+
<RowDefinition Height="Auto" />
488+
<RowDefinition Height="Auto" />
489+
</Grid.RowDefinitions>
490+
<Grid.ColumnDefinitions>
491+
<ColumnDefinition Width="40" />
492+
<ColumnDefinition Width="*" />
493+
<ColumnDefinition Width="40" />
494+
</Grid.ColumnDefinitions>
495+
<Controls:ToggleSwitchButton Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Margin="5,0,20,0" VerticalAlignment="Center" ThumbIndicatorBrush="#E00" IsChecked="{Binding MonitorSharpCapForPA}"/>
496+
<TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Text="No" FontSize="10" Margin="6,-5,0,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
497+
<TextBlock Grid.Row="1" Grid.Column="2" Text="Yes" FontSize="10" Margin="5,-5,20,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
498+
</Grid>
499+
<StackPanel Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Top" Margin="20,0,0,0"
500+
Visibility="{Binding MonitorSharpCapForPA, Converter={StaticResource BoolToVisibilityConverter}}">
501+
<TextBlock Text="SharpCap Log folder" Style="{StaticResource TextBlockLabel}" VerticalAlignment="Top" />
502+
<TextBlock Text="The log folder of SharpCap to monitor for Polar Alignment. Only SharpCap 4.x and later is supported." Style="{StaticResource TextBlockOptionHelp}" VerticalAlignment="Top" HorizontalAlignment="Stretch" Width="Auto" />
503+
</StackPanel>
504+
505+
<TextBox Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2"
506+
Visibility="{Binding MonitorSharpCapForPA, Converter={StaticResource BoolToVisibilityConverter}}"
507+
Style="{StaticResource TextBoxSmall}"
508+
Width="Auto"
509+
HorizontalAlignment="Stretch"
510+
Text="{Binding SharpCapLogFolder}"
511+
VerticalAlignment="Center" Margin="20,4,20,0"/>
512+
513+
<StackPanel Grid.Row="6" Grid.Column="0" VerticalAlignment="Top" Margin="0,20,0,0">
514+
<TextBlock Text="Invert AZ corrections" Style="{StaticResource TextBlockLabel}" VerticalAlignment="Top"/>
515+
<TextBlock Text="If enabled, the corrections for the AZ axis will be inverted." Style="{StaticResource TextBlockOptionHelp}" VerticalAlignment="Top" HorizontalAlignment="Left"/>
516+
</StackPanel>
517+
<Grid Grid.Row="6" Grid.Column="1" Width="Auto" HorizontalAlignment="Left" Margin="0,20,0,0">
518+
<Grid.RowDefinitions>
519+
<RowDefinition Height="Auto" />
520+
<RowDefinition Height="Auto" />
521+
</Grid.RowDefinitions>
522+
<Grid.ColumnDefinitions>
523+
<ColumnDefinition Width="40" />
524+
<ColumnDefinition Width="*" />
525+
<ColumnDefinition Width="40" />
526+
</Grid.ColumnDefinitions>
527+
<Controls:ToggleSwitchButton Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Margin="5,0,20,0" VerticalAlignment="Center" ThumbIndicatorBrush="#E00" IsChecked="{Binding InvertAZCorrections}"/>
528+
<TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Text="No" FontSize="10" Margin="6,-5,0,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
529+
<TextBlock Grid.Row="1" Grid.Column="2" Text="Yes" FontSize="10" Margin="5,-5,20,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
530+
</Grid>
531+
532+
<StackPanel Grid.Row="7" Grid.Column="0" VerticalAlignment="Top">
533+
<TextBlock Text="Invert ALT corrections" Style="{StaticResource TextBlockLabel}" VerticalAlignment="Top"/>
534+
<TextBlock Text="If enabled, the corrections for the ALT axis will be inverted." Style="{StaticResource TextBlockOptionHelp}" VerticalAlignment="Top" HorizontalAlignment="Left"/>
535+
</StackPanel>
536+
<Grid Grid.Row="7" Grid.Column="1" Width="Auto" HorizontalAlignment="Left">
537+
<Grid.RowDefinitions>
538+
<RowDefinition Height="Auto" />
539+
<RowDefinition Height="Auto" />
540+
</Grid.RowDefinitions>
541+
<Grid.ColumnDefinitions>
542+
<ColumnDefinition Width="40" />
543+
<ColumnDefinition Width="*" />
544+
<ColumnDefinition Width="40" />
545+
</Grid.ColumnDefinitions>
546+
<Controls:ToggleSwitchButton Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Margin="5,0,20,0" VerticalAlignment="Center" ThumbIndicatorBrush="#E00" IsChecked="{Binding InvertALTCorrections}"/>
547+
<TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Text="No" FontSize="10" Margin="6,-5,0,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
548+
<TextBlock Grid.Row="1" Grid.Column="2" Text="Yes" FontSize="10" Margin="5,-5,20,0" FontWeight="Normal" Style="{StaticResource TextBlockDescription}"/>
549+
</Grid>
550+
551+
</Grid>
552+
</TabItem>
553+
498554
</TabControl>
499555
</DockPanel>
500556
</mah:MetroWindow>

‎OATControl/DlgAppSettings.xaml.cs‎

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,32 @@ public bool MonitorNinaForPA
146146
}
147147
}
148148

149+
public String SharpCapLogFolder
150+
{
151+
get { return _mount.SharpCapLogFolder; }
152+
set
153+
{
154+
if (_mount.SharpCapLogFolder != value)
155+
{
156+
_mount.SharpCapLogFolder = value;
157+
OnPropertyChanged();
158+
}
159+
}
160+
}
161+
162+
public bool MonitorSharpCapForPA
163+
{
164+
get { return _mount.MonitorSharpCapForPA; }
165+
set
166+
{
167+
if (_mount.MonitorSharpCapForPA != value)
168+
{
169+
_mount.MonitorSharpCapForPA = value;
170+
OnPropertyChanged();
171+
}
172+
}
173+
}
174+
149175
public String SelectedBaudRate
150176
{
151177
get { return _serialBaudRate; }
@@ -166,22 +192,22 @@ public ChecklistShowOn ShowChecklist
166192
}
167193
}
168194

169-
public bool InvertNinaALTCorrections
195+
public bool InvertALTCorrections
170196
{
171-
get { return _mount.InvertNinaALTCorrections; }
197+
get { return _mount.InvertALTCorrections; }
172198
set
173199
{
174-
_mount.InvertNinaALTCorrections = value;
200+
_mount.InvertALTCorrections = value;
175201
OnPropertyChanged();
176202
}
177203
}
178204

179-
public bool InvertNinaAZCorrections
205+
public bool InvertAZCorrections
180206
{
181-
get { return _mount.InvertNinaAZCorrections; }
207+
get { return _mount.InvertAZCorrections; }
182208
set
183209
{
184-
_mount.InvertNinaAZCorrections = value;
210+
_mount.InvertAZCorrections = value;
185211
OnPropertyChanged();
186212
}
187213
}
@@ -256,6 +282,9 @@ private void OnCategorySelected(object sender, SelectionChangedEventArgs e)
256282
ContentTabs.SelectedIndex = 2;
257283
SetInitialSortIndicator(this.sortField);
258284
break;
285+
case "Auto PA":
286+
ContentTabs.SelectedIndex = 3;
287+
break;
259288
}
260289
}
261290

‎OATControl/DlgNinaPolarAlignment.xaml.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class ErrorEntry
3737
/// <summary>
3838
/// Interaction logic for DlgNinaPoolarAlignment.xaml
3939
/// </summary>
40-
public partial class DlgNinaPolarAlignment : MetroWindow, INotifyPropertyChanged
40+
public partial class DlgNinaPolarAlignment : MetroWindow, INotifyPropertyChanged, IPolarAlignDialog
4141
{
4242
public class ChecklistItem : INotifyPropertyChanged
4343
{
@@ -296,18 +296,18 @@ public void SetStatus(string state, string statusDetails)
296296
ErrorMessage = statusDetails;
297297
var _closeTime = DateTime.UtcNow + TimeSpan.FromSeconds(5);
298298
var timer = new DispatcherTimer();
299-
timer.Interval = TimeSpan.FromSeconds(0.2); // Set your delay here
299+
timer.Interval = TimeSpan.FromSeconds(0.1); // Set your delay here
300300
timer.Tick += (s, e) =>
301301
{
302302
if (DateTime.UtcNow < _closeTime)
303303
{
304-
TimeLeft = $"({(_closeTime - DateTime.UtcNow).TotalSeconds.ToString("F1")})";
304+
TimeLeft = $"({((_closeTime - DateTime.UtcNow).TotalSeconds+1).ToString("F0")})";
305305
return; // Still within the delay period
306306
}
307307
timer.Stop(); // Stop the timer so it only runs once
308308

309309
// Your code to execute after the delay
310-
this.Close();
310+
_closeCommand.Execute(null);
311311
};
312312
timer.Start();
313313
break;

0 commit comments

Comments
 (0)