Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 2378 → Rev 2379

/MKLiveView/v1.0/Source/MainWindow.xaml.cs
629,6 → 629,11
if(_bGPXLog && dtGPX.Rows.Count > 0)
_saveGPXLog();
}
private void Window_Closed(object sender, EventArgs e)
{
Application.Current.Shutdown();
}
 
#endregion events
 
#region GMap
2330,7 → 2335,7
//Event_Flag
bData[17] = Convert.ToByte(dr[13]);
//Index
bData[18] = index > 0 ? (byte)index : Convert.ToByte((int)dr[0]);
bData[18] = index > -1 ? (byte)index : Convert.ToByte((int)dr[0]);
//Type
bData[19] = Convert.ToByte(dr[1]);
//WP_EventChannelValue
2717,6 → 2722,8
if(sVal != "") comboBoxFSColor.SelectedIndex = Convert.ToInt32(sVal);
sVal = ini.IniReadValue("waypoints", "coptercolor");
if(sVal != "") comboBoxCopterColor.SelectedIndex = Convert.ToInt32(sVal);
sVal = ini.IniReadValue("waypoints", "landingcolor");
if(sVal != "") comboBoxLandingColor.SelectedIndex = Convert.ToInt32(sVal);
sVal = ini.IniReadValue("waypoints", "routecolor");
if(sVal != "") comboBoxRouteColor.SelectedIndex = Convert.ToInt32(sVal);
sVal = ini.IniReadValue("waypoints", "showWPRoute");
2822,6 → 2829,7
ini.IniWriteValue("waypoints", "poicolor", comboBoxPOIColor.SelectedIndex.ToString());
ini.IniWriteValue("waypoints", "fscolor", comboBoxFSColor.SelectedIndex.ToString());
ini.IniWriteValue("waypoints", "coptercolor", comboBoxCopterColor.SelectedIndex.ToString());
ini.IniWriteValue("waypoints", "landingcolor", comboBoxLandingColor.SelectedIndex.ToString());
ini.IniWriteValue("waypoints", "routecolor", comboBoxRouteColor.SelectedIndex.ToString());
ini.IniWriteValue("waypoints", "showWPRoute", _bShowWPRoute.ToString());
 
3470,7 → 3478,7
}
});
}
private void comboBoxWPColor_DropDownClosed(object sender, EventArgs e)
private void comboBoxWPColor_DropDownClosed(object sender, EventArgs e)
{
_MarkerColorSelection(sender, 0);
}
3590,7 → 3598,7
{
DataRow dr = dtWaypoints.Rows[0];
dr[13] = _Simulate ? 3 : 0;
_sendWayPoint(dr, 1, 's', true);
_sendWayPoint(dr, 0, 's', true);
rectSimulate.Visibility = _Simulate ? Visibility.Visible : Visibility.Hidden;
}
}
4093,7 → 4101,6
}
}
 
 
private void btnLoadGPXLog_Click(object sender, RoutedEventArgs e)
{
_loadGPXLog();