Skip to content

Commit 271dc7f

Browse files
committed
When adding multiple items to rlz_cbx or rlz_or_stat_cbx, add both text and data
1 parent c18d54f commit 271dc7f

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

svir/dialogs/load_hcurves_as_layer_dialog.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ def populate_rlz_or_stat_cbx(self):
7070
self.rlzs_or_stats = [
7171
name for name in self.npz_file['all'].dtype.names
7272
if name not in ('custom_site_id', 'lon', 'lat')]
73-
self.rlz_or_stat_cbx.addItems(self.rlzs_or_stats)
73+
for rlz_or_stat in self.rlzs_or_stats:
74+
self.rlz_or_stat_cbx.addItem(rlz_or_stat, rlz_or_stat)
7475

7576
def on_rlz_or_stat_changed(self):
7677
rlz_or_stat = self.rlz_or_stat_cbx.currentData()

svir/dialogs/load_hmaps_as_layer_dialog.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ def populate_rlz_or_stat_cbx(self):
117117
if name not in ('custom_site_id', 'lon', 'lat', 'vs30')]
118118
self.rlz_or_stat_cbx.clear()
119119
self.rlz_or_stat_cbx.setEnabled(True)
120-
self.rlz_or_stat_cbx.addItems(self.rlzs_or_stats)
120+
for rlz_or_stat in self.rlzs_or_stats:
121+
self.rlz_or_stat_cbx.addItem(rlz_or_stat, rlz_or_stat)
121122

122123
def on_rlz_or_stat_changed(self):
123124
self.dataset = self.npz_file['all'][self.rlz_or_stat_cbx.currentData()]

svir/dialogs/load_output_as_layer_dialog.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,8 @@ def populate_rlz_or_stat_cbx(self):
413413
if len(self.rlzs_or_stats) == 1:
414414
self.rlz_or_stat_cbx.addItem('mean', self.rlzs_or_stats[0])
415415
else:
416-
self.rlz_or_stat_cbx.addItems(self.rlzs_or_stats)
416+
for rlz_or_stat in self.rlzs_or_stats:
417+
self.rlz_or_stat_cbx.addItem(rlz_or_stat, rlz_or_stat)
417418

418419
def populate_loss_type_cbx(self, loss_types):
419420
self.loss_type_cbx.clear()

svir/dialogs/viewer_dock.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,8 @@ def load_damages_rlzs_aggr(
802802
if len(rlzs) == 1:
803803
self.rlz_cbx.addItem('mean', rlzs[0])
804804
else:
805-
self.rlz_cbx.addItems(rlzs)
805+
for rlz in rlzs:
806+
self.rlz_cbx.addItem(rlz, rlz)
806807
self.rlz_cbx.blockSignals(False)
807808

808809
loss_types = composite_risk_model_attrs['loss_types']
@@ -2022,7 +2023,7 @@ def write_export_file(self, filename):
20222023
writer.writerow(row)
20232024
elif self.output_type == 'damages-rlzs_aggr':
20242025
csv_file.write(
2025-
"# Realization: %s\r\n" % self.rlz_cbx.currentText())
2026+
"# Realization: %s\r\n" % self.rlz_cbx.currentData())
20262027
csv_file.write(
20272028
"# Loss type: %s\r\n" % self.loss_type_cbx.currentText())
20282029
csv_file.write(

0 commit comments

Comments
 (0)