Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 480 → Rev 481

/QMK-Groundstation/trunk/Forms/wdg_Settings.cpp
279,7 → 279,7
 
void wdg_Settings::slot_LoadParameter() // DONE 0.71g
{
QString Filename = QFileDialog::getOpenFileName(this, "Mikrokopter Parameter laden", Config->DIR.Parameter + "", "Mikrokopter Parameter(*.mkp);;Alle Dateien (*)");
QString Filename = QFileDialog::getOpenFileName(this, "Mikrokopter Parameter laden", Config->DIR.Parameter + "/", "Mikrokopter Parameter(*.mkp);;Alle Dateien (*)");
 
if (!Filename.isEmpty())
{
345,10 → 345,17
Setting.beginGroup("Camera");
ParameterSet[Set][P_SERVO_NICK_CONT] = Setting.value("ServoNickControl", 100).toInt();
ParameterSet[Set][P_SERVO_NICK_COMP] = Setting.value("ServoNickCompensation", 40).toInt();
ParameterSet[Set][P_SERVO_NICK_COMPI] = Setting.value("ServoNickInvert", 0).toInt();
ParameterSet[Set][P_SERVO_NICK_MIN] = Setting.value("ServoNickMin", 50).toInt();
ParameterSet[Set][P_SERVO_NICK_MAX] = Setting.value("ServoNickMax", 150).toInt();
ParameterSet[Set][P_SERVO_NICK_REFR] = Setting.value("ServoNickRefreshRate", 5).toInt();
 
ParameterSet[Set][P_SERVO_ROLL_CONT] = Setting.value("ServoRollControl", 100).toInt();
ParameterSet[Set][P_SERVO_ROLL_COMP] = Setting.value("ServoRollCompensation", 40).toInt();
ParameterSet[Set][P_SERVO_ROLL_MIN] = Setting.value("ServoRollMin", 50).toInt();
ParameterSet[Set][P_SERVO_ROLL_MAX] = Setting.value("ServoRollMax", 150).toInt();
 
ParameterSet[Set][P_SERVO_COMPI] = Setting.value("ServoInvert", 0).toInt();
 
ParameterSet[Set][P_SERVO_REFR] = Setting.value("ServoNickRefreshRate", 5).toInt();
Setting.endGroup();
 
Setting.beginGroup("Others");
505,9 → 512,20
ParameterSet[Set][P_SERVO_NICK_COMP] = sb_6_2->value();
ParameterSet[Set][P_SERVO_NICK_MIN] = sb_6_3->value();
ParameterSet[Set][P_SERVO_NICK_MAX] = sb_6_4->value();
ParameterSet[Set][P_SERVO_NICK_REFR] = sb_6_5->value();
ParameterSet[Set][P_SERVO_NICK_COMPI] = cb_6_6->isChecked();
// ParameterSet[Set][P_SERVO_NICK_COMPI] = cb_6_6->isChecked();
 
ParameterSet[Set][P_SERVO_ROLL_CONT] = get_Value(cb_6_7);
ParameterSet[Set][P_SERVO_ROLL_COMP] = sb_6_8->value();
ParameterSet[Set][P_SERVO_ROLL_MIN] = sb_6_10->value();
ParameterSet[Set][P_SERVO_ROLL_MAX] = sb_6_11->value();
 
ParameterSet[Set][P_SERVO_REFR] = sb_6_5->value();
 
if (cb_6_6->isChecked())
ParameterSet[Set][P_SERVO_COMPI] = ParameterSet[Set][P_SERVO_COMPI] | 0x01;
if (cb_6_9->isChecked())
ParameterSet[Set][P_SERVO_COMPI] = ParameterSet[Set][P_SERVO_COMPI] | 0x02;
 
// Seite 7
ParameterSet[Set][P_GAS_MIN] = sb_7_1->value();
ParameterSet[Set][P_GAS_MAX] = sb_7_2->value();
531,9 → 549,8
ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] | 0x04;
if (tb_9_9->text() == QString("1"))
ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] | 0x08;
// if (cb_4_7->isChecked())
// ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] | 0x10;
 
 
ParameterSet[Set][P_LOOP_GAS_LIMIT] = get_Value(cb_9_1);
ParameterSet[Set][P_LOOP_THRESHOLD] = sb_9_2->value();
ParameterSet[Set][P_WINKEL_NICK] = sb_9_3->value();
581,7 → 598,7
{
int Set = sb_Set->value() + 5;
 
QString Filename = QFileDialog::getSaveFileName(this, "Mikrokopter Parameter speichern", Config->DIR.Parameter + "" + le_SetName->text(), "Mikrokopter Parameter(*.mkp);;Alle Dateien (*)");
QString Filename = QFileDialog::getSaveFileName(this, "Mikrokopter Parameter speichern", Config->DIR.Parameter + "/" + le_SetName->text(), "Mikrokopter Parameter(*.mkp);;Alle Dateien (*)");
 
if (!Filename.isEmpty())
{
638,10 → 655,16
Setting.beginGroup("Camera");
Setting.setValue("ServoNickControl", ParameterSet[Set][P_SERVO_NICK_CONT]);
Setting.setValue("ServoNickCompensation", ParameterSet[Set][P_SERVO_NICK_COMP]);
Setting.setValue("ServoNickInvert", ParameterSet[Set][P_SERVO_NICK_COMPI]);
Setting.setValue("ServoNickMin", ParameterSet[Set][P_SERVO_NICK_MIN]);
Setting.setValue("ServoNickMax", ParameterSet[Set][P_SERVO_NICK_MAX]);
Setting.setValue("ServoNickRefreshRate", ParameterSet[Set][P_SERVO_NICK_REFR]);
 
Setting.setValue("ServoRollControl", ParameterSet[Set][P_SERVO_ROLL_CONT]);
Setting.setValue("ServoRollCompensation", ParameterSet[Set][P_SERVO_ROLL_COMP]);
Setting.setValue("ServoRollMin", ParameterSet[Set][P_SERVO_ROLL_MIN]);
Setting.setValue("ServoRollMax", ParameterSet[Set][P_SERVO_ROLL_MAX]);
 
Setting.setValue("ServoInvert", ParameterSet[Set][P_SERVO_COMPI]);
Setting.setValue("ServoNickRefreshRate", ParameterSet[Set][P_SERVO_REFR]);
Setting.endGroup();
 
Setting.beginGroup("Others");
811,8 → 834,16
sb_6_2->setValue(FCSettings[P_SERVO_NICK_COMP]);
sb_6_3->setValue(FCSettings[P_SERVO_NICK_MIN]);
sb_6_4->setValue(FCSettings[P_SERVO_NICK_MAX]);
sb_6_5->setValue(FCSettings[P_SERVO_NICK_REFR]);
cb_6_6->setChecked(FCSettings[P_SERVO_NICK_COMPI]);
 
cb_6_7 = setCombo(cb_6_7, Set, FCSettings[P_SERVO_ROLL_CONT]);
sb_6_8->setValue(FCSettings[P_SERVO_ROLL_COMP]);
sb_6_10->setValue(FCSettings[P_SERVO_ROLL_MIN]);
sb_6_11->setValue(FCSettings[P_SERVO_ROLL_MAX]);
 
cb_6_6->setChecked(FCSettings[P_SERVO_COMPI] & 0x01);
cb_6_9->setChecked(FCSettings[P_SERVO_COMPI] & 0x02);
 
sb_6_5->setValue(FCSettings[P_SERVO_REFR]);
}
// Seite 7
{