VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-29 21:42:26 -04:00
Code Issues Projects Releases Wiki Activity

add new columns to satellite tracker table (time to next event, pass duration),

Browse Source
This commit is contained in:
DreamNik 2021-09-01 21:03:14 +03:00
parent feaacd390f
commit 82c2a1c775
4 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/feature/satellitetracker/satellitetrackergui.cpp
View File

@ -989,6 +989,8 @@ void SatelliteTrackerGUI::resizeTable()
ui->satTable->setItem(row, SAT_COL_NAME, new QTableWidgetItem("Satellite123")); ui->satTable->setItem(row, SAT_COL_NAME, new QTableWidgetItem("Satellite123"));
ui->satTable->setItem(row, SAT_COL_AZ, new QTableWidgetItem("360")); ui->satTable->setItem(row, SAT_COL_AZ, new QTableWidgetItem("360"));
ui->satTable->setItem(row, SAT_COL_EL, new QTableWidgetItem("-90")); ui->satTable->setItem(row, SAT_COL_EL, new QTableWidgetItem("-90"));
ui->satTable->setItem(row, SAT_COL_TNE, new QTableWidgetItem("9999:99 AOS"));
ui->satTable->setItem(row, SAT_COL_DUR, new QTableWidgetItem("999:99"));
ui->satTable->setItem(row, SAT_COL_AOS, new QTableWidgetItem("+1 10:17")); ui->satTable->setItem(row, SAT_COL_AOS, new QTableWidgetItem("+1 10:17"));
ui->satTable->setItem(row, SAT_COL_LOS, new QTableWidgetItem("+1 10:17")); ui->satTable->setItem(row, SAT_COL_LOS, new QTableWidgetItem("+1 10:17"));
ui->satTable->setItem(row, SAT_COL_MAX_EL, new QTableWidgetItem("90")); ui->satTable->setItem(row, SAT_COL_MAX_EL, new QTableWidgetItem("90"));
@ -1022,6 +1024,19 @@ QString SatelliteTrackerGUI::formatDaysTime(qint64 days, QDateTime dateTime)
return dt.time().toString(QString("hh:mm %1").arg(days)); return dt.time().toString(QString("hh:mm %1").arg(days));
} }
QString SatelliteTrackerGUI::formatSecondsHHMM(qint64 seconds)
{
char const* sign = "";
if(seconds < 0)
{
sign = "-";
seconds = -seconds;
}
return QString("%1%2:%3").arg(sign).arg(seconds/60).arg(seconds%60,2,10,QChar('0'));
}
// Table item showing some text, but sorted by datetime set as user data // Table item showing some text, but sorted by datetime set as user data
class DateTimeSortedTableWidgetItem : public QTableWidgetItem { class DateTimeSortedTableWidgetItem : public QTableWidgetItem {
public: public:
@ -1113,9 +1128,14 @@ void SatelliteTrackerGUI::updateTable(SatelliteState *satState)
if (satState->m_passes.size() > 0) if (satState->m_passes.size() > 0)
{ {
// Get number of days to AOS/LOS // Get number of days to AOS/LOS
QDate currentDate = QDate::currentDate(); QDateTime currentDateTime = QDateTime::currentDateTime();
int daysToAOS = currentDate.daysTo(satState->m_passes[0]->m_aos.date()); int daysToAOS = currentDateTime.daysTo(satState->m_passes[0]->m_aos);
int daysToLOS = currentDate.daysTo(satState->m_passes[0]->m_los.date()); int daysToLOS = currentDateTime.daysTo(satState->m_passes[0]->m_los);
if( satState->m_passes[ 0 ]->m_aos > currentDateTime )
items[SAT_COL_TNE]->setText(formatSecondsHHMM(currentDateTime.secsTo(satState->m_passes[0]->m_aos))+" AOS");
else
items[SAT_COL_TNE]->setText(formatSecondsHHMM(currentDateTime.secsTo(satState->m_passes[0]->m_los))+" LOS");
items[SAT_COL_DUR]->setText(formatSecondsHHMM(satState->m_passes[0]->m_aos.secsTo(satState->m_passes[0]->m_los)));
items[SAT_COL_AOS]->setText(formatDaysTime(daysToAOS, satState->m_passes[0]->m_aos)); items[SAT_COL_AOS]->setText(formatDaysTime(daysToAOS, satState->m_passes[0]->m_aos));
items[SAT_COL_AOS]->setData(Qt::UserRole, satState->m_passes[0]->m_aos); items[SAT_COL_AOS]->setData(Qt::UserRole, satState->m_passes[0]->m_aos);
items[SAT_COL_LOS]->setText(formatDaysTime(daysToLOS, satState->m_passes[0]->m_los)); items[SAT_COL_LOS]->setText(formatDaysTime(daysToLOS, satState->m_passes[0]->m_los));
@ -1128,6 +1148,8 @@ void SatelliteTrackerGUI::updateTable(SatelliteState *satState)
} }
else else
{ {
items[SAT_COL_TNE]->setText("");
items[SAT_COL_DUR]->setText("");
items[SAT_COL_AOS]->setText(""); items[SAT_COL_AOS]->setText("");
items[SAT_COL_LOS]->setText(""); items[SAT_COL_LOS]->setText("");
items[SAT_COL_MAX_EL]->setData(Qt::DisplayRole, QVariant()); items[SAT_COL_MAX_EL]->setData(Qt::DisplayRole, QVariant());

3
plugins/feature/satellitetracker/satellitetrackergui.h
View File

@ -84,6 +84,8 @@ private:
SAT_COL_NAME, SAT_COL_NAME,
SAT_COL_AZ, SAT_COL_AZ,
SAT_COL_EL, SAT_COL_EL,
SAT_COL_TNE,
SAT_COL_DUR,
SAT_COL_AOS, SAT_COL_AOS,
SAT_COL_LOS, SAT_COL_LOS,
SAT_COL_MAX_EL, SAT_COL_MAX_EL,
@ -118,6 +120,7 @@ private:
QAction *createCheckableItem(QString& text, int idx, bool checked); QAction *createCheckableItem(QString& text, int idx, bool checked);
void updateTimeToAOS(); void updateTimeToAOS();
QString formatDaysTime(qint64 days, QDateTime dateTime); QString formatDaysTime(qint64 days, QDateTime dateTime);
QString formatSecondsHHMM(qint64 seconds);
void leaveEvent(QEvent*); void leaveEvent(QEvent*);
void enterEvent(QEvent*); void enterEvent(QEvent*);

10
plugins/feature/satellitetracker/satellitetrackergui.ui
View File

@ -580,6 +580,16 @@
<string>Elevation in degrees to satellite from antenna location</string> <string>Elevation in degrees to satellite from antenna location</string>
</property> </property>
</column> </column>
<column>
<property name="text">
<string>Next</string>
</property>
</column>
<column>
<property name="text">
<string>Dur</string>
</property>
</column>
<column> <column>
<property name="text"> <property name="text">
<string>AOS</string> <string>AOS</string>

2
plugins/feature/satellitetracker/satellitetrackersettings.h
View File

@ -27,7 +27,7 @@
class Serializable; class Serializable;
#define SAT_COL_COLUMNS 14 #define SAT_COL_COLUMNS 16
struct SatelliteTrackerSettings struct SatelliteTrackerSettings
{ {