Skip to content

Commit d1794df

Browse files
authored
Merge pull request #35 from ChrisHal/fix_issue_34
avoid trailing space in sweep item label, fixes issue #34
2 parents 3eac61e + 2f18931 commit d1794df

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

QtPMbrowser/pmbrowserwindow.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,11 @@ void PMbrowserWindow::populateTreeView()
8888
auto seriesitem = new QTreeWidgetItem(grpitem, QStringList(label2));
8989
seriesitem->setData(0, Qt::UserRole, QVariant::fromValue(&series));
9090
for(auto& sweep : series.Children) {
91-
QString label3 = QString("sweep %1").arg(sweep.extractInt32(SwSweepCount))
92-
+" "+qs_from_sv(sweep.getString(SwLabel));
91+
QString label3 = QString("sweep %1").arg(sweep.extractInt32(SwSweepCount));
92+
auto sw_label = qs_from_sv(sweep.getString(SwLabel));
93+
if (sw_label.length() > 0) {
94+
label3 += ' ' + sw_label;
95+
}
9396
auto sweepitem = new QTreeWidgetItem(seriesitem, QStringList(label3));
9497
sweepitem->setData(0, Qt::UserRole, QVariant::fromValue(&sweep));
9598
for(auto& trace : sweep.Children) {

0 commit comments

Comments
 (0)