refs #250, formatting, minor tweaks and fixes

* changed return type for updateFromVatsimDataFileStation
* improved resolution for own aircraft
* convenience method findFirstByCallsign
* automatically convert frequency to MHz for ATC station
* improved output in toQString
* GUI, flight plan formatting
* corrected logging for network context
* override keyword in listmodelbase
This commit is contained in:
Klaus Basan
2014-05-28 01:27:52 +02:00
parent 6353edd50a
commit 0a4c47c800
9 changed files with 105 additions and 74 deletions

View File

@@ -236,32 +236,6 @@
<item row="5" column="0" colspan="4">
<widget class="QPlainTextEdit" name="pte_Route"/>
</item>
<item row="0" column="0" rowspan="4">
<widget class="QGroupBox" name="gb_Type">
<property name="title">
<string>1. Type</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QRadioButton" name="rb_TypeVfr">
<property name="text">
<string>VFR</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="rb_TypeIfr">
<property name="text">
<string>IFR</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="7" column="0">
<widget class="QLineEdit" name="le_DestinationAirport">
<property name="inputMask">
@@ -396,6 +370,57 @@
</property>
</widget>
</item>
<item row="1" column="0" rowspan="3">
<widget class="QGroupBox" name="gb_Type">
<property name="title">
<string/>
</property>
<property name="flat">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="vl_Type">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<widget class="QRadioButton" name="rb_TypeVfr">
<property name="text">
<string>VFR</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="rb_TypeIfr">
<property name="text">
<string>IFR</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_Type">
<property name="text">
<string>1. Type</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>

View File

@@ -117,7 +117,7 @@ namespace BlackGui
QModelIndex i1 = index.sibling(index.row(), 0);
QModelIndex i2 = index.sibling(index.row(), this->columnCount(index) - 1);
emit this->dataChanged(i1, i2);
emit this->dataChanged(i1, i2); // which range has been changed
}
/*

View File

@@ -49,17 +49,17 @@ namespace BlackGui
virtual ~CListModelBase() {}
//! \copydoc QAbstractListModel::columnCount()
virtual int columnCount(const QModelIndex &modelIndex) const;
virtual int columnCount(const QModelIndex &modelIndex) const override;
//! \copydoc QAbstractItemModel::headerData()
virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const;
virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
//! Column to property index
virtual int columnToPropertyIndex(int column) const;
//! Index to property index
virtual int indexToPropertyIndex(const QModelIndex &index) const
{
{
return this->columnToPropertyIndex(index.column());
}
@@ -103,10 +103,10 @@ namespace BlackGui
}
//! \copydoc QAbstractListModel::data()
virtual QVariant data(const QModelIndex &index, int role) const;
virtual QVariant data(const QModelIndex &index, int role) const override;
//! \copydoc QAbstractListModel::rowCount()
virtual int rowCount(const QModelIndex &index = QModelIndex()) const;
virtual int rowCount(const QModelIndex &index = QModelIndex()) const override;
//! \copydoc QAbstractTableModel::flags
Qt::ItemFlags flags(const QModelIndex &index) const override;
@@ -142,6 +142,6 @@ namespace BlackGui
//! Clear the list
virtual void clear();
};
};
}
#endif // guard