Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 525 → Rev 537

/QMK-Groundstation/trunk/Forms/dlg_Preferences.ui
7,7 → 7,7
<x>0</x>
<y>0</y>
<width>589</width>
<height>272</height>
<height>287</height>
</rect>
</property>
<property name="windowTitle">
530,7 → 530,7
<string/>
</property>
<property name="icon">
<iconset resource="../MKTool.qrc">
<iconset>
<normaloff>:/Actions/Images/Actions/Folder-Open.png</normaloff>:/Actions/Images/Actions/Folder-Open.png</iconset>
</property>
</widget>
555,7 → 555,7
<string/>
</property>
<property name="icon">
<iconset resource="../MKTool.qrc">
<iconset>
<normaloff>:/Actions/Images/Actions/Folder-Open.png</normaloff>:/Actions/Images/Actions/Folder-Open.png</iconset>
</property>
</widget>
580,7 → 580,7
<string/>
</property>
<property name="icon">
<iconset resource="../MKTool.qrc">
<iconset>
<normaloff>:/Actions/Images/Actions/Folder-Open.png</normaloff>:/Actions/Images/Actions/Folder-Open.png</iconset>
</property>
</widget>
817,7 → 817,7
<string/>
</property>
<property name="icon">
<iconset resource="../MKTool.qrc">
<iconset>
<normaloff>:/Actions/Images/Actions/Folder-Open.png</normaloff>:/Actions/Images/Actions/Folder-Open.png</iconset>
</property>
</widget>
/QMK-Groundstation/trunk/Forms/mktool.cpp
1735,6 → 1735,9
lb_Analog[a]->setText(Settings->Analog1.Label[a]);
}
config_Plot();
 
// Im Settings-Dialog dieFirmware-Version setzen.
f_Settings->Version = QString("%1").arg(RX.Decode[0]) + QString("%1").arg(RX.Decode[1]) + QString(RX.Decode[4] + 'a');
}
break;
}
/QMK-Groundstation/trunk/Forms/wdg_Settings.cpp
277,7 → 277,7
}
}
 
void wdg_Settings::slot_LoadParameter() // DONE 0.71g
void wdg_Settings::slot_LoadParameter() // DONE 0.75a
{
QString Filename = QFileDialog::getOpenFileName(this, "Mikrokopter Parameter laden", Config->DIR.Parameter + "/", "Mikrokopter Parameter(*.mkp);;Alle Dateien (*)");
 
436,7 → 436,7
return Combo->currentText().toInt();
}
 
void wdg_Settings::store_ParameterSet(int Set) // DONE 0.71h
void wdg_Settings::store_ParameterSet(int Set) // DONE 0.75a
{
char *Name = le_SetName->text().toLatin1().data();
 
594,11 → 594,11
ParameterSet[Set][P_NAV_PH_LOGINTIME] = sb_13_5->value();
}
 
void wdg_Settings::slot_SaveParameter() // DONE 0.71g
void wdg_Settings::slot_SaveParameter() // DONE 0.75a
{
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 + "/" + Version + "_" + le_SetName->text(), "Mikrokopter Parameter(*.mkp);;Alle Dateien (*)");
 
if (!Filename.isEmpty())
{
645,6 → 645,7
Setting.beginGroup("Gyro");
Setting.setValue("P", ParameterSet[Set][P_GYRO_P]);
Setting.setValue("I", ParameterSet[Set][P_GYRO_I]);
Setting.setValue("D", ParameterSet[Set][P_GYRO_D]);
Setting.setValue("DynamicStability", ParameterSet[Set][P_DYNAMIC_STAB]);
Setting.setValue("ACC_Gyro-Factor", ParameterSet[Set][P_GYRO_ACC_FAKTOR]);
Setting.setValue("ACC_Gyro-Compensation", ParameterSet[Set][P_GYRO_ACC_ABGL]);
/QMK-Groundstation/trunk/Forms/wdg_Settings.h
39,6 → 39,7
void show_FCSettings(int Set, int FCSettings[MaxParameter]);
char *GetFCSettings();
void set_Config(cSettings *pConfig);
QString Version;
 
private:
int Settings[MaxParameter];
/QMK-Groundstation/trunk/global.h
58,7 → 58,7
#endif
 
static const QString QA_NAME = "QMK-Groundstation";
static const QString QA_VERSION_NR = "0.8.15";
static const QString QA_VERSION_NR = "1.0.0";
 
#ifdef _BETA_
static const QString QA_VERSION = QA_VERSION_NR + " (BETA)";
83,7 → 83,7
#endif
 
 
static const QString QA_DATE = "09.07.2009";
static const QString QA_DATE = "19.07.2009";
static const QString QA_YEAR = "2008-2009";
static const QString QA_AUTHOR = "Manuel Schrape";
static const QString QA_EMAIL = "manuel.schrape@gmx.de";