Fix crash if some columns in .csv file is missing

pull/1852/head
srcejon 2023-10-22 10:25:40 +01:00
rodzic 1b392ee53c
commit 3b0512bd29
1 zmienionych plików z 17 dodań i 9 usunięć

Wyświetl plik

@ -19,6 +19,7 @@
#include <QStandardPaths>
#include <QColorDialog>
#include <QFileDialog>
#include <QDebug>
#include "gui/dialpopup.h"
#include "util/db.h"
@ -771,6 +772,8 @@ void SpectrumMarkersDialog::on_aMarkersImport_clicked()
m_annotationMarkers.clear();
while (CSV::readRow(in, &cols))
{
if (cols.size() >= 7)
{
m_annotationMarkers.push_back(SpectrumAnnotationMarker());
m_annotationMarkers.back().m_startFrequency = cols[startCol].toLongLong();
@ -782,6 +785,11 @@ void SpectrumMarkersDialog::on_aMarkersImport_clicked()
int b = cols[blueCol].toInt();
m_annotationMarkers.back().m_markerColor = QColor(r, g, b);
}
else
{
qWarning() << "SpectrumMarkersDialog::on_aMarkersImport_clicked: Missing data in " << cols;
}
}
m_annotationMarkerIndex = 0;
ui->aMarker->setMaximum(m_annotationMarkers.size() - 1);