Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 2400 → Rev 2401

/MKLiveView/v1.0/Source/MainWindow.xaml.cs
773,6 → 773,7
else
Dispatcher.Invoke(() => wpActiveMarker.Position = wpList[iIndex]);
 
Dispatcher.Invoke(() => tbWPStatusHeight.Text = dtWaypoints.Rows[iIndex][5].ToString() + " m");
}
void _clearHomePos()
{
1835,6 → 1836,7
iVal = data[27] + i_16;
Dispatcher.Invoke((Action)(() => tbWP.Text = ((double)iVal / (double)10).ToString("0.0 m")));
Dispatcher.Invoke((Action)(() => lblWPRouteDistanceWP.Content = ((double)iVal / (double)10).ToString("0.0 m")));
Dispatcher.Invoke((Action)(() => tbWPStatusDistanceWP.Text = ((double)iVal / (double)10).ToString("0.0 m")));
 
i_16 = data[45];
i_16 = (Int16)(i_16 << 8);
1844,6 → 1846,7
 
Dispatcher.Invoke((Action)(() => tbWPIndex.Text = data[48].ToString())); //Waypoint index
Dispatcher.Invoke((Action)(() => lblWPIndexNC.Content = data[48].ToString()));
Dispatcher.Invoke((Action)(() => lblWPStatusIndexNC.Content = data[48].ToString()));
if(data[48] > 0 && _wpIndex != data[48] -1 && wpList.Count >= data[48] -1)
{
_setActiveWP(data[48]-1);
1889,6 → 1892,7
 
Dispatcher.Invoke((Action)(() => tbWPCount.Text = data[49].ToString())); //Waypoints count
Dispatcher.Invoke((Action)(() => lblWPCountNC.Content = data[49].ToString())); //Waypoints count
Dispatcher.Invoke((Action)(() => lblWPStatusCountNC.Content = data[49].ToString())); //Waypoints count
_wpCount = data[49];
Dispatcher.Invoke((Action)(() => tbTopSats.Text = data[50].ToString())); //Satellites
 
1968,6 → 1972,7
 
//Target hold time
Dispatcher.Invoke((Action)(() => lblWPHoldTime.Content = data[73].ToString()+ " s"));
Dispatcher.Invoke((Action)(() => tbWPStatusHoldTime.Text = data[73].ToString()+ " s"));
 
//--------------- NC Error ------------------------
Dispatcher.Invoke((Action)(() => tbNCErr.Text = data[69].ToString())); //NC Errornumber
2652,8 → 2657,15
GridMotors.Margin = new Thickness(GridMotors.Margin.Left, 36 * UIScaleTopSlider.Value, GridMotors.Margin.Right, GridMotors.Margin.Bottom);
if (GridSideBar != null)
GridSideBar.Margin = new Thickness(GridSideBar.Margin.Left, 36 * UIScaleTopSlider.Value, GridSideBar.Margin.Right, GridSideBar.Margin.Bottom);
if (WPStatus != null)
WPStatus.Margin = new Thickness(WPStatus.Margin.Left, 36 * UIScaleTopSlider.Value, WPStatus.Margin.Right, WPStatus.Margin.Bottom);
if (GridOSD != null)
GridOSD.Margin = new Thickness(GridOSD.Margin.Left, 36 * UIScaleTopSlider.Value, GridOSD.Margin.Right, GridOSD.Margin.Bottom);
{
if(WPStatus.Visibility == Visibility.Visible)
GridOSD.Margin = new Thickness(GridOSD.Margin.Left, 36 * UIScaleTopSlider.Value + WPStatus.Margin.Bottom, GridOSD.Margin.Right, GridOSD.Margin.Bottom);
else
GridOSD.Margin = new Thickness(GridOSD.Margin.Left, 36 * UIScaleTopSlider.Value, GridOSD.Margin.Right, GridOSD.Margin.Bottom);
}
if (GridData != null)
GridData.Margin = new Thickness(GridData.Margin.Left, 36 * UIScaleTopSlider.Value, GridData.Margin.Right, GridData.Margin.Bottom);
if (GridWP != null)
4292,6 → 4304,13
}
}
 
private void checkBoxShowWPStatus_Click(object sender, RoutedEventArgs e)
{
if (WPStatus.Visibility == Visibility.Visible)
GridOSD.Margin = new Thickness(GridOSD.Margin.Left, 36 * UIScaleTopSlider.Value + 36, GridOSD.Margin.Right, GridOSD.Margin.Bottom);
else
GridOSD.Margin = new Thickness(GridOSD.Margin.Left, 36 * UIScaleTopSlider.Value, GridOSD.Margin.Right, GridOSD.Margin.Bottom);
}
 
private void btnLoadGPXLog_Click(object sender, RoutedEventArgs e)
{