Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 2321 → Rev 2320

/MKLiveView/v1.0/Source/MainWindow.xaml.cs
2486,15 → 2486,6
if(sVal != "") _iThresholdRC = Convert.ToInt32(sVal);
sVal = ini.IniReadValue("threshold", "MagFieldThreshold");
if(sVal != "") _iThresholdMagField = Convert.ToInt32(sVal);
 
sVal = ini.IniReadValue("waypoints", "wpcolor");
if(sVal != "") comboBoxWPColor.SelectedIndex = Convert.ToInt32(sVal);
sVal = ini.IniReadValue("waypoints", "poicolor");
if(sVal != "") comboBoxPOIColor.SelectedIndex = Convert.ToInt32(sVal);
sVal = ini.IniReadValue("waypoints", "fscolor");
if(sVal != "") comboBoxFSColor.SelectedIndex = Convert.ToInt32(sVal);
sVal = ini.IniReadValue("waypoints", "coptercolor");
if(sVal != "") comboBoxCopterColor.SelectedIndex = Convert.ToInt32(sVal);
}
catch (Exception e)
{
2573,11 → 2564,6
ini.IniWriteValue("threshold", "MaxDistance", _dThresholdDistanceMax.ToString());
ini.IniWriteValue("threshold", "RCThreshold", _iThresholdRC.ToString());
ini.IniWriteValue("threshold", "MagFieldThreshold", _iThresholdMagField.ToString());
 
ini.IniWriteValue("waypoints", "wpcolor", comboBoxWPColor.SelectedIndex.ToString());
ini.IniWriteValue("waypoints", "poicolor", comboBoxPOIColor.SelectedIndex.ToString());
ini.IniWriteValue("waypoints", "fscolor", comboBoxFSColor.SelectedIndex.ToString());
ini.IniWriteValue("waypoints", "coptercolor", comboBoxCopterColor.SelectedIndex.ToString());
}
catch (Exception e)
{
2822,6 → 2808,7
}
});
}
 
private void comboBoxCopterColor_DropDownClosed(object sender, EventArgs e)
{
Dispatcher.Invoke(() => {
2834,6 → 2821,7
((CustomMarkerCopter)(copter.Shape)).setColor("red");
});
}
 
private void btnLoadWPLFile_Click(object sender, RoutedEventArgs e)
{
_readWPLFile();