Subversion Repositories Projects

Rev

Rev 442 | Rev 450 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 442 Rev 449
Line 74... Line 74...
74 
    this->data = handler->data;
 74 
    this->data = handler->data;
75 
    o_Settings   = t_Settings;
 75 
    o_Settings   = t_Settings;
76 
}
 76 
}
Line 77... Line 77...
77 
 
 77 
 
78 
// Motordaten übernehmen.
 - 
 
79 
void dlg_MotorMixer::set_MotorConfig(sRxData RX)
 - 
 
80 
{
 78 
// Motordaten übernehmen.
81 
//FIXME: put this in libMK/Handler.cpp and fill motor values in KopterData
 79 
//FIXME: put this in libMK/Handler.cpp and fill motor values in KopterData
- 
 
 80 
/*
- 
 
 81 
void dlg_MotorMixer::set_MotorConfig(sRxData RX)
82 
/*
 82 
{
Line 83... Line 83...
83 
    int Pos = 0;
 83 
    int Pos = 0;
Line 84... Line 84...
84 
 
 84 
 
Line 94... Line 94...
94 
            Pos++;
 94 
            Pos++;
95 
        }
 95 
        }
96 
    }
 96 
    }
Line 97... Line 97...
97 
 
 97 
 
98 
    set_MotorData();
 - 
 
99 
*/
 98 
    set_MotorData();
- 
 
 99 
}
Line 100... Line 100...
100 
}
 100 
*/
101 
 
 101 
 
102 
// Motordaten aus GUI übernehmen
 102 
// Motordaten aus GUI übernehmen
103 
void dlg_MotorMixer::get_MotorData()
 103 
void dlg_MotorMixer::get_MotorData()
Line 104... Line 104...
104 
{
 104 
{
105 
    sMotorData motorData;
 - 
 
Line 106... Line 105...
106 
 
 105 
    sMotorData motorData;
107 
    char * mixerName = le_NAME->text().toAscii().data();
 106 
 
108 
    motorData.mixer_name = string(mixerName);
 107 
    motorData.mixer_name = le_NAME->text().toAscii().data();
109 
 
 108 
 
Line 138... Line 137...
138 
 
 137 
 
139 
// Motordaten anzeigen
 138 
// Motordaten anzeigen
140 
void dlg_MotorMixer::set_MotorData()
 139 
void dlg_MotorMixer::set_MotorData()
141 
{
 140 
{
142 
    sMotorData motorData = handler->data->motor;
 141 
    sMotorData motorData = handler->data->motor;
Line 143... Line 142...
143 
    le_NAME->setText(motorData.mixer_name.c_str());
 142 
    le_NAME->setText(motorData.mixer_name);
144 
 
 143 
 
145 
    sb_GAS_1->setValue(motorData.mixer_gas[0]);
 144 
    sb_GAS_1->setValue(motorData.mixer_gas[0]);
146 
    sb_GAS_2->setValue(motorData.mixer_gas[1]);
 145 
    sb_GAS_2->setValue(motorData.mixer_gas[1]);
Line 359... Line 358...
359 
        get_MotorData();
 358 
        get_MotorData();
Line 360... Line 359...
360 
 
 359 
 
Line 361... Line 360...
361 
        QSettings Setting(Filename, QSettings::IniFormat);
 360 
        QSettings Setting(Filename, QSettings::IniFormat);
362 
 
 361 
 
363 
        Setting.beginGroup("Info");
 362 
        Setting.beginGroup("Info");
364 
            Setting.setValue("Name",         data->motor.mixer_name.c_str());
 363 
            Setting.setValue("Name",         data->motor.mixer_name);
Line 365... Line 364...
365 
            Setting.setValue("Version",      data->motor.mixer_version);
 364 
            Setting.setValue("Version",      data->motor.mixer_version);
366 
        Setting.endGroup();
 365 
        Setting.endGroup();