Skip to content

Commit 5f75e9d

Browse files
committed
code simplified
1 parent 1a1a12b commit 5f75e9d

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

source/Gui/BrowserWindow.cpp

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ void _BrowserWindow::processSimulationList()
649649
ImGui::TableNextColumn();
650650
processHeightField(treeTO);
651651
ImGui::TableNextColumn();
652-
processNumParticlesField(treeTO, NumParticlesFormat::Kilo);
652+
processNumObjectsField(treeTO, true);
653653
ImGui::TableNextColumn();
654654
processSizeField(treeTO, true);
655655
ImGui::TableNextColumn();
@@ -750,7 +750,7 @@ void _BrowserWindow::processGenomeList()
750750
ImGui::TableNextColumn();
751751
processNumDownloadsField(treeTO);
752752
ImGui::TableNextColumn();
753-
processNumParticlesField(treeTO, NumParticlesFormat::Standard);
753+
processNumObjectsField(treeTO, false);
754754
ImGui::TableNextColumn();
755755
processSizeField(treeTO, false);
756756
ImGui::TableNextColumn();
@@ -951,19 +951,14 @@ void _BrowserWindow::processHeightField(NetworkResourceTreeTO const& treeTO)
951951
}
952952
}
953953

954-
void _BrowserWindow::processNumParticlesField(NetworkResourceTreeTO const& treeTO, NumParticlesFormat const& format)
954+
void _BrowserWindow::processNumObjectsField(NetworkResourceTreeTO const& treeTO, bool kobjects)
955955
{
956956
if (treeTO->isLeaf()) {
957957
auto& leaf = treeTO->getLeaf();
958-
switch (format) {
959-
case NumParticlesFormat::Standard:
960-
AlienImGui::Text(StringHelper::format(leaf.rawTO->particles));
961-
break;
962-
case NumParticlesFormat::Kilo:
958+
if (kobjects) {
963959
AlienImGui::Text(StringHelper::format(leaf.rawTO->particles / 1000) + " K");
964-
break;
965-
default:
966-
break;
960+
} else {
961+
AlienImGui::Text(StringHelper::format(leaf.rawTO->particles));
967962
}
968963
}
969964
}

source/Gui/BrowserWindow.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,7 @@ class _BrowserWindow : public _AlienWindow
7777
void processNumDownloadsField(NetworkResourceTreeTO const& treeTO);
7878
void processWidthField(NetworkResourceTreeTO const& treeTO);
7979
void processHeightField(NetworkResourceTreeTO const& treeTO);
80-
enum class NumParticlesFormat
81-
{
82-
Standard,
83-
Kilo,
84-
};
85-
void processNumParticlesField(NetworkResourceTreeTO const& treeTO, NumParticlesFormat const& format);
80+
void processNumObjectsField(NetworkResourceTreeTO const& treeTO, bool kobjects);
8681
void processSizeField(NetworkResourceTreeTO const& treeTO, bool kbyte);
8782
void processVersionField(NetworkResourceTreeTO const& treeTO);
8883

0 commit comments

Comments
 (0)