Skip to content

Commit 5b176f7

Browse files
committed
[scolv] Robustness fixes for Nearby Cities tab
- Guard _citiesMaxCount against zero/negative config value (default 20) - Use QOverload<int>::of() for QComboBox signal (cleaner Qt5 syntax) - Show "-" instead of empty string for CITYTYPE_UNKNOWN in type column - Remove extra blank lines in anonymous namespace
1 parent f05c0f4 commit 5b176f7

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

apps/gui-qt/scolv/mainframe.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,6 @@ static const char *compassDir(double az) {
169169

170170

171171

172-
173-
174172
}
175173

176174

@@ -1027,6 +1025,7 @@ MainFrame::MainFrame(){
10271025
// Nearby Cities config
10281026
try { _citiesMaxDist = SCApp->configGetDouble("cities.maxDist"); } catch ( ... ) {}
10291027
try { _citiesMaxCount = SCApp->configGetInt("cities.maxCount"); } catch ( ... ) {}
1028+
if ( _citiesMaxCount <= 0 ) _citiesMaxCount = 20;
10301029
try { _citiesMinPopulation = SCApp->configGetInt("cities.minPopulation"); } catch ( ... ) {}
10311030
try { _citiesUseFullState = SCApp->configGetBool("cities.useFullState"); } catch ( ... ) {}
10321031

@@ -1038,7 +1037,7 @@ MainFrame::MainFrame(){
10381037
connect(_ui.setRegionBtn, &QPushButton::clicked,
10391038
this, &MainFrame::onSetRegionName);
10401039
connect(_ui.regionFormatCombo,
1041-
static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
1040+
QOverload<int>::of(&QComboBox::currentIndexChanged),
10421041
this, &MainFrame::onRegionFormatChanged);
10431042
connect(_ui.citiesUseFullState, &QCheckBox::toggled,
10441043
this, [this](bool){ updateCitiesTab(_currentOrigin.get()); });
@@ -1990,7 +1989,7 @@ void MainFrame::updateCitiesTab(DataModel::Origin *origin) {
19901989
entries.push_back({
19911990
Math::Geo::deg2km(dist), az,
19921991
QString::fromStdString(city.name()),
1993-
QString(city.type().toString()),
1992+
city.type() == Math::Geo::CITYTYPE_UNKNOWN ? QString("-") : QString(city.type().toString()),
19941993
regionDisplay,
19951994
QString::fromStdString(city.country()),
19961995
city.population(),

apps/gui-qt/scolv/mainframe.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ namespace Seiscomp {
3232
namespace Gui {
3333

3434

35-
3635
class EventListView;
3736
class EventSummary;
3837
class EventEdit;

0 commit comments

Comments
 (0)