X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2Fui.cpp;h=bbe7dbdb15db5ae6572324b73ac1de31dbd3068b;hb=c8f8dc657e7321aff362a3c88862388ef2fb1b20;hp=4cd660624cdeebd25f0f0f9c4c1a79278ca2c7bb;hpb=392826deaf802ac0960ed3924a3f98b9d18d381b;p=blobs.git

diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index 4cd6606..bbe7dbd 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -1,3 +1,4 @@
+#include "BodyPanel.hpp"
 #include "CreaturePanel.hpp"
 #include "RecordsPanel.hpp"
 #include "string.hpp"
@@ -8,6 +9,7 @@
 #include "../app/Assets.hpp"
 #include "../creature/Creature.hpp"
 #include "../graphics/Viewport.hpp"
+#include "../math/const.hpp"
 #include "../world/Body.hpp"
 #include "../world/Simulation.hpp"
 
@@ -29,7 +31,11 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 , born(new Label(assets.fonts.medium))
 , age(new Label(assets.fonts.medium))
 , mass(new Label(assets.fonts.medium))
+, size(new Label(assets.fonts.medium))
 , goal(new Label(assets.fonts.medium))
+, pos(new Label(assets.fonts.medium))
+, tile(new Label(assets.fonts.medium))
+, head(new Label(assets.fonts.medium))
 , composition(new Panel)
 , stats{nullptr}
 , props{nullptr}
@@ -42,6 +48,8 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 	age_label->Text("Age");
 	Label *mass_label = new Label(assets.fonts.medium);
 	mass_label->Text("Mass");
+	Label *size_label = new Label(assets.fonts.medium);
+	size_label->Text("Size");
 	Label *goal_label = new Label(assets.fonts.medium);
 	goal_label->Text("Goal");
 
@@ -52,6 +60,7 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 		->Add(born_label)
 		->Add(age_label)
 		->Add(mass_label)
+		->Add(size_label)
 		->Add(goal_label);
 	Panel *info_value_panel = new Panel;
 	info_value_panel
@@ -60,6 +69,7 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 		->Add(born)
 		->Add(age)
 		->Add(mass)
+		->Add(size)
 		->Add(goal);
 	Panel *info_panel = new Panel;
 	info_panel
@@ -68,6 +78,32 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 		->Add(info_label_panel)
 		->Add(info_value_panel);
 
+	Label *pos_label = new Label(assets.fonts.medium);
+	pos_label->Text("Pos");
+	Label *tile_label = new Label(assets.fonts.medium);
+	tile_label->Text("Tile");
+	Label *head_label = new Label(assets.fonts.medium);
+	head_label->Text("Heading");
+
+	Panel *loc_label_panel = new Panel;
+	loc_label_panel
+		->Direction(Panel::VERTICAL)
+		->Add(pos_label)
+		->Add(tile_label)
+		->Add(head_label);
+	Panel *loc_value_panel = new Panel;
+	loc_value_panel
+		->Direction(Panel::VERTICAL)
+		->Add(pos)
+		->Add(tile)
+		->Add(head);
+	Panel *loc_panel = new Panel;
+	loc_panel
+		->Direction(Panel::HORIZONTAL)
+		->Spacing(10.0f)
+		->Add(loc_label_panel)
+		->Add(loc_value_panel);
+
 	Label *stat_label[7];
 	for (int i = 0; i < 7; ++i) {
 		stat_label[i] = new Label(assets.fonts.medium);
@@ -91,6 +127,8 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 		->Spacing(2)
 		->Direction(Panel::VERTICAL);
 	Panel *stat_meter_panel = new Panel;
+	stat_label[0]->Layout();
+	stats[0]->Layout();
 	stat_meter_panel
 		->Spacing(stat_label[0]->Size().y - stats[0]->Size().y + 2)
 		->Direction(Panel::VERTICAL);
@@ -105,8 +143,8 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 		->Add(stat_label_panel)
 		->Add(stat_meter_panel);
 
-	Label *prop_label[8];
-	for (int i = 0; i < 8; ++i) {
+	Label *prop_label[9];
+	for (int i = 0; i < 9; ++i) {
 		prop_label[i] = new Label(assets.fonts.medium);
 		props[i] = new Label(assets.fonts.medium);
 	}
@@ -117,7 +155,8 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 	prop_label[4]->Text("Lifetime");
 	prop_label[5]->Text("Fertility");
 	prop_label[6]->Text("Mutability");
-	prop_label[7]->Text("Offspring mass");
+	prop_label[7]->Text("Adaptability");
+	prop_label[8]->Text("Offspring mass");
 
 	Panel *prop_label_panel = new Panel;
 	prop_label_panel
@@ -127,7 +166,7 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 	prop_meter_panel
 		->Spacing(2)
 		->Direction(Panel::VERTICAL);
-	for (int i = 0; i < 8; ++i) {
+	for (int i = 0; i < 9; ++i) {
 		prop_label_panel->Add(prop_label[i]);
 		prop_meter_panel->Add(props[i]);
 	}
@@ -141,13 +180,14 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 	panel
 		.Add(name)
 		->Add(info_panel)
+		->Add(loc_panel)
 		->Add(composition)
 		->Add(stat_panel)
 		->Add(prop_panel)
 		->Padding(glm::vec2(10.0f))
 		->Spacing(10.0f)
 		->Direction(Panel::VERTICAL)
-		->Background(glm::vec4(0.7f, 0.7f, 0.7f, 1.0f));
+		->Background(glm::vec4(1.0f, 1.0f, 1.0f, 0.7f));
 }
 
 CreaturePanel::~CreaturePanel() {
@@ -156,7 +196,6 @@ CreaturePanel::~CreaturePanel() {
 
 void CreaturePanel::Show(creature::Creature &cr) {
 	c = &cr;
-	name->Text(c->Name());
 	born->Text(TimeString(c->Born()));
 
 	if (c->Parents().empty()) {
@@ -183,29 +222,32 @@ void CreaturePanel::Hide() noexcept {
 void CreaturePanel::Draw(graphics::Viewport &viewport) noexcept {
 	if (!c) return;
 
+	name->Text(c->Name());
 	age->Text(TimeString(c->Age()));
 	mass->Text(MassString(c->Mass()));
+	size->Text(LengthString(c->Size()));
 	if (c->Goals().empty()) {
 		goal->Text("none");
 	} else {
 		goal->Text(c->Goals()[0]->Describe());
 	}
 
+	pos->Text(VectorString(c->GetSituation().Position(), 2));
+	tile->Text(c->GetSituation().GetTileType().label + (
+		c->GetSituation().OnGround()
+			? (c->GetSituation().Moving() ? " (moving)" : " (standing)")
+			: (c->GetSituation().Moving() ? " (flying)" : " (hovering)")
+	));
+	head->Text(VectorString(c->GetSituation().Heading(), 2));
+
 	const creature::Composition &comp = c->GetComposition();
 	if (comp.size() < components.size()) {
+		components.clear();
 		composition->Clear();
-		while (comp.size() < components.size()) {
-			delete components.back();
-			components.pop_back();
-		}
-		for (auto l : components) {
-			composition->Add(l);
-		}
-	} else {
-		while (comp.size() > components.size()) {
-			components.emplace_back(new Label(assets.fonts.medium));
-			composition->Add(components.back());
-		}
+	}
+	while (comp.size() > components.size()) {
+		components.emplace_back(new Label(assets.fonts.medium));
+		composition->Add(components.back());
 	}
 	{
 		int i = 0;
@@ -228,115 +270,233 @@ void CreaturePanel::Draw(graphics::Viewport &viewport) noexcept {
 		}
 	}
 
-	props[0]->Text(DecimalString(c->Strength(), 2));
-	props[1]->Text(DecimalString(c->Stamina(), 2));
-	props[2]->Text(DecimalString(c->Dexerty(), 2));
-	props[3]->Text(DecimalString(c->Intelligence(), 2));
+	props[0]->Text(DecimalString(c->Strength(), 2) + " / " + DecimalString(c->GetProperties().Strength(), 2));
+	props[1]->Text(DecimalString(c->Stamina(), 2) + " / " + DecimalString(c->GetProperties().Stamina(), 2));
+	props[2]->Text(DecimalString(c->Dexerty(), 2) + " / " + DecimalString(c->GetProperties().Dexerty(), 2));
+	props[3]->Text(DecimalString(c->Intelligence(), 2) + " / " + DecimalString(c->GetProperties().Intelligence(), 2));
 	props[4]->Text(TimeString(c->Lifetime()));
-	props[5]->Text(PercentageString(c->Fertility()));
+	props[5]->Text(PercentageString(c->Fertility()) + " / " + PercentageString(c->GetProperties().Fertility()));
 	props[6]->Text(PercentageString(c->Mutability()));
-	props[7]->Text(MassString(c->OffspringMass()));
+	props[7]->Text(PercentageString(c->Adaptability()));
+	props[8]->Text(MassString(c->OffspringMass()));
 
 	const glm::vec2 margin(20.0f);
 	panel.Position(glm::vec2(viewport.Width() - margin.x - panel.Size().x, margin.y));
+	panel.Layout();
 	panel.Draw(assets, viewport);
 }
 
 
-RecordsPanel::RecordsPanel(world::Simulation &sim)
-: sim(sim)
-, live(new Label(sim.Assets().fonts.medium))
-, records()
-, holders()
+BodyPanel::BodyPanel(app::Assets &assets)
+: assets(assets)
+, body(nullptr)
+, name(new Label(assets.fonts.large))
+, mass(new Label(assets.fonts.medium))
+, radius(new Label(assets.fonts.medium))
+, soi(new Label(assets.fonts.medium))
+, operiod(new Label(assets.fonts.medium))
+, rperiod(new Label(assets.fonts.medium))
+, atm(new Label(assets.fonts.medium))
+, sma(new Label(assets.fonts.medium))
+, ecc(new Label(assets.fonts.medium))
+, inc(new Label(assets.fonts.medium))
+, asc(new Label(assets.fonts.medium))
+, arg(new Label(assets.fonts.medium))
+, mna(new Label(assets.fonts.medium))
 , panel() {
-	Label *live_label = new Label(sim.Assets().fonts.medium);
-	live_label->Text("Creatures alive");
-
+	Label *mass_label = new Label(assets.fonts.medium);
+	mass_label->Text("Mass");
+	Label *radius_label = new Label(assets.fonts.medium);
+	radius_label->Text("Radius");
+	Label *soi_label = new Label(assets.fonts.medium);
+	soi_label->Text("SOI");
+	Label *operiod_label = new Label(assets.fonts.medium);
+	operiod_label->Text("Orb. period");
+	Label *rperiod_label = new Label(assets.fonts.medium);
+	rperiod_label->Text("Rot. period");
+	Label *atm_label = new Label(assets.fonts.medium);
+	atm_label->Text("Atmosphere");
+	Label *sma_label = new Label(assets.fonts.medium);
+	sma_label->Text("SMA");
+	Label *ecc_label = new Label(assets.fonts.medium);
+	ecc_label->Text("Eccentricity");
+	Label *inc_label = new Label(assets.fonts.medium);
+	inc_label->Text("Inclination");
+	Label *asc_label = new Label(assets.fonts.medium);
+	asc_label->Text("Asc. node");
+	Label *arg_label = new Label(assets.fonts.medium);
+	arg_label->Text("Arg. Periapsis");
+	Label *mna_label = new Label(assets.fonts.medium);
+	mna_label->Text("Mean anomaly");
 	Panel *label_panel = new Panel;
 	label_panel
 		->Direction(Panel::VERTICAL)
-		->Add(live_label);
-
+		->Add(mass_label)
+		->Add(radius_label)
+		->Add(soi_label)
+		->Add(operiod_label)
+		->Add(rperiod_label)
+		->Add(atm_label)
+		->Add(sma_label)
+		->Add(ecc_label)
+		->Add(inc_label)
+		->Add(asc_label)
+		->Add(arg_label)
+		->Add(mna_label);
 	Panel *value_panel = new Panel;
 	value_panel
 		->Direction(Panel::VERTICAL)
-		->Add(live);
+		->Add(mass)
+		->Add(radius)
+		->Add(soi)
+		->Add(operiod)
+		->Add(rperiod)
+		->Add(atm)
+		->Add(sma)
+		->Add(ecc)
+		->Add(inc)
+		->Add(asc)
+		->Add(arg)
+		->Add(mna);
+	Panel *info_panel = new Panel;
+	info_panel
+		->Direction(Panel::HORIZONTAL)
+		->Spacing(10.0f)
+		->Add(label_panel)
+		->Add(value_panel);
 
-	Label *holder_label = new Label(sim.Assets().fonts.medium);
-	holder_label->Text("Holder");
-	Panel *holder_panel = new Panel;
-	holder_panel
+	panel
+		.Add(name)
+		->Add(info_panel)
+		->Padding(glm::vec2(10.0f))
+		->Spacing(10.0f)
 		->Direction(Panel::VERTICAL)
-		->Add(holder_label);
+		->Background(glm::vec4(1.0f, 1.0f, 1.0f, 0.7f));
+}
 
-	records.reserve(sim.Records().size());
-	for (const auto &r : sim.Records()) {
-		Label *label = new Label(sim.Assets().fonts.medium);
-		label->Text(r.name + " record");
-		label_panel->Add(label);
-		Label *value = new Label(sim.Assets().fonts.medium);
-		value->Text("none");
-		value_panel->Add(value);
-		records.push_back(value);
-		Label *holder = new Label(sim.Assets().fonts.medium);
-		holder->Text("nobody");
-		holder_panel->Add(holder);
-		holders.push_back(holder);
+BodyPanel::~BodyPanel() {
+}
+
+void BodyPanel::Show(world::Body &b) {
+	body = &b;
+	name->Text(b.Name());
+	mass->Text(MassString(b.Mass()));
+	radius->Text(LengthString(b.Radius()));
+	soi->Text(LengthString(b.SphereOfInfluence()));
+	operiod->Text(TimeString(b.OrbitalPeriod()));
+	rperiod->Text(TimeString(b.RotationalPeriod()));
+	atm->Text(b.HasAtmosphere() ? assets.data.resources[b.Atmosphere()].label : std::string("none"));
+	sma->Text(LengthString(b.GetOrbit().SemiMajorAxis()));
+	ecc->Text(DecimalString(b.GetOrbit().Eccentricity(), 3));
+	inc->Text(AngleString(b.GetOrbit().Inclination()));
+	asc->Text(AngleString(b.GetOrbit().LongitudeAscending()));
+	arg->Text(AngleString(b.GetOrbit().ArgumentPeriapsis()));
+	mna->Text(AngleString(b.GetOrbit().MeanAnomaly()));
+}
+
+void BodyPanel::Hide() noexcept {
+	body = nullptr;
+}
+
+void BodyPanel::Draw(graphics::Viewport &viewport) noexcept {
+	if (!Shown()) return;
+
+	const glm::vec2 margin(20.0f);
+	panel.Position(glm::vec2(viewport.Width() - margin.x - panel.Size().x, margin.y));
+	panel.Layout();
+	panel.Draw(assets, viewport);
+}
+
+
+RecordsPanel::RecordsPanel(world::Simulation &sim)
+: sim(sim)
+, records()
+, holders()
+, panel()
+, shown(true) {
+	Label *rank_label = new Label(sim.Assets().fonts.medium);
+	rank_label->Text("Rank");
+
+	Panel *rank_panel = new Panel;
+	rank_panel
+		->Direction(Panel::VERTICAL)
+		->Add(rank_label);
+
+	for (int i = 0; i < world::Record::MAX; ++i) {
+		rank_label = new Label(sim.Assets().fonts.medium);
+		rank_label->Text(std::to_string(i + 1));
+		rank_panel->Add(rank_label);
 	}
 
 	panel
 		.Direction(Panel::HORIZONTAL)
 		->Padding(glm::vec2(10.0f))
-		->Spacing(10.0f)
-		->Background(glm::vec4(0.7f, 0.7f, 0.7f, 1.0f))
-		->Add(label_panel)
-		->Add(value_panel)
-		->Add(holder_panel);
+		->Spacing(45.0f)
+		->Background(glm::vec4(1.0f, 1.0f, 1.0f, 0.7f))
+		->Add(rank_panel);
+
+	records.reserve(sim.Records().size() * (world::Record::MAX + 1));
+	holders.reserve(sim.Records().size() * (world::Record::MAX + 1));
+	int ri = 0;
+	for (const auto &r : sim.Records()) {
+		Panel *by_panel = new Panel;
+		by_panel
+			->Direction(Panel::VERTICAL);
+		Panel *val_panel = new Panel;
+		val_panel
+			->Direction(Panel::VERTICAL);
+		Panel *tab_panel = new Panel;
+		tab_panel
+			->Direction(Panel::HORIZONTAL)
+			->Spacing(10.0f)
+			->Add(by_panel)
+			->Add(val_panel);
+		Label *rec_label = new Label(sim.Assets().fonts.medium);
+		rec_label->Text(r.name);
+		Panel *rec_panel = new Panel;
+		rec_panel
+			->Direction(Panel::VERTICAL)
+			->Add(rec_label)
+			->Add(tab_panel);
+		for (int i = 0; i < world::Record::MAX; ++i) {
+			Label *val_label = new Label(sim.Assets().fonts.medium);
+			val_panel->Add(val_label);
+			records.push_back(val_label);
+			Label *holder_label = new Label(sim.Assets().fonts.medium);
+			by_panel->Add(holder_label);
+			holders.push_back(holder_label);
+		}
+		Panel *group_panel = new Panel;
+		group_panel
+			->Direction(Panel::HORIZONTAL)
+			->Spacing(10.0f)
+			->Add(rec_panel);
+		panel.Add(group_panel);
+		++ri;
+	}
 }
 
 RecordsPanel::~RecordsPanel() {
 }
 
 void RecordsPanel::Draw(graphics::Viewport &viewport) noexcept {
-	live->Text(NumberString(sim.LiveCreatures().size()));
-	int i = 0;
+	if (!shown) return;
+
+	int ri = 0;
 	for (const auto &r : sim.Records()) {
-		if (!r) continue;
-		switch (r.type) {
-			default:
-			case world::Record::VALUE:
-				records[i]->Text(DecimalString(r.value, 2));
-				break;
-			case world::Record::LENGTH:
-				records[i]->Text(LengthString(r.value));
-				break;
-			case world::Record::MASS:
-				records[i]->Text(MassString(r.value));
+		for (int i = 0; i < world::Record::MAX; ++i) {
+			if (!r.rank[i]) {
 				break;
-			case world::Record::PERCENTAGE:
-				records[i]->Text(PercentageString(r.value));
-				break;
-			case world::Record::TIME:
-				records[i]->Text(TimeString(r.value));
-				break;
-		}
-		std::string str(r.holder->Name());
-		bool first = true;
-		for (auto p : r.holder->Parents()) {
-			if (first) {
-				first = false;
-				str += " of ";
-			} else {
-				str += " and ";
 			}
-			str += p->Name();
+			records[ri * world::Record::MAX + i]->Text(r.ValueString(i));
+			holders[ri * world::Record::MAX + i]->Text(r.rank[i].holder->Name());
 		}
-		holders[i]->Text(str);
-		++i;
+		++ri;
 	}
 
 	const glm::vec2 margin(20.0f);
 	panel.Position(glm::vec2(margin.x, margin.y));
+	panel.Layout();
 	panel.Draw(sim.Assets(), viewport);
 }
 
@@ -344,9 +504,12 @@ void RecordsPanel::Draw(graphics::Viewport &viewport) noexcept {
 TimePanel::TimePanel(world::Simulation &sim)
 : sim(sim)
 , body(nullptr)
+, live(new Label(sim.Assets().fonts.medium))
 , time(new Label(sim.Assets().fonts.medium))
 , clock(new Label(sim.Assets().fonts.medium))
 , panel() {
+	Label *live_label = new Label(sim.Assets().fonts.medium);
+	live_label->Text("Alive");
 	Label *time_label = new Label(sim.Assets().fonts.medium);
 	time_label->Text("Time");
 	Label *clock_label = new Label(sim.Assets().fonts.medium);
@@ -355,12 +518,14 @@ TimePanel::TimePanel(world::Simulation &sim)
 	Panel *label_panel = new Panel;
 	label_panel
 		->Direction(Panel::VERTICAL)
+		->Add(live_label)
 		->Add(time_label)
 		->Add(clock_label);
 
 	Panel *value_panel = new Panel;
 	value_panel
 		->Direction(Panel::VERTICAL)
+		->Add(live)
 		->Add(time)
 		->Add(clock);
 
@@ -368,7 +533,7 @@ TimePanel::TimePanel(world::Simulation &sim)
 		.Direction(Panel::HORIZONTAL)
 		->Padding(glm::vec2(10.0f))
 		->Spacing(10.0f)
-		->Background(glm::vec4(0.7f, 0.7f, 0.7f, 1.0f))
+		->Background(glm::vec4(1.0f, 1.0f, 1.0f, 0.7f))
 		->Add(label_panel)
 		->Add(value_panel);
 }
@@ -377,6 +542,7 @@ TimePanel::~TimePanel() {
 }
 
 void TimePanel::Draw(graphics::Viewport &viewport) noexcept {
+	live->Text(NumberString(sim.LiveCreatures().size()));
 	time->Text(TimeString(sim.Time()));
 	if (body) {
 		clock->Text(TimeString(std::fmod(sim.Time(), body->RotationalPeriod())));
@@ -386,10 +552,35 @@ void TimePanel::Draw(graphics::Viewport &viewport) noexcept {
 
 	const glm::vec2 margin(20.0f);
 	panel.Position(glm::vec2(margin.x, viewport.Height() - margin.y - panel.Size().y));
+	panel.Layout();
 	panel.Draw(sim.Assets(), viewport);
 }
 
 
+namespace {
+std::ostream &custom_fixed(std::ostream &out, double n, int d) {
+	double f = n;
+	int p = d;
+	while (f > 1.0 && p > 0) {
+		--p;
+		f *= 0.1;
+	}
+	if (p > 0) {
+		out << std::fixed << std::setprecision(p) << n;
+	} else {
+		out.unsetf(std::ios_base::floatfield);
+		out << std::setprecision(d) << n;
+	}
+	return out;
+}
+}
+
+std::string AngleString(double a) {
+	std::stringstream s;
+	s << std::fixed << std::setprecision(2) << std::fmod(a * 180.0 * PI_inv, 360.0) << "°";
+	return s.str();
+}
+
 std::string DecimalString(double n, int p) {
 	std::stringstream s;
 	s << std::fixed << std::setprecision(p) << n;
@@ -398,28 +589,38 @@ std::string DecimalString(double n, int p) {
 
 std::string LengthString(double m) {
 	std::stringstream s;
-	s << std::fixed << std::setprecision(3);
-	if (m > 1500.0) {
-		s << (m * 0.001) << "km";
-	} else if (m < 0.1) {
-		s << (m * 1000.0) << "mm";
+	if (m > 1.5e9) {
+		custom_fixed(s, m * 1.0e-9, 4) << "Gm";
+	} else if (m > 1.5e6) {
+		custom_fixed(s, m * 1.0e-6, 4) << "Mm";
+	} else if (m > 1.5e3) {
+		custom_fixed(s, m * 1.0e-3, 4) << "km";
+	} else if (m < 1.5e-3) {
+		custom_fixed(s, m * 1.0e3, 4) << "mm";
+	} else if (m < 1.5) {
+		custom_fixed(s, m * 1.0e2, 4) << "cm";
 	} else {
-		s << m << "m";
+		custom_fixed(s, m, 4) << "m";
 	}
 	return s.str();
 }
 
 std::string MassString(double kg) {
 	std::stringstream s;
-	s << std::fixed << std::setprecision(3);
-	if (kg > 1500.0) {
-		s << (kg * 0.001) << "t";
+	if (kg > 1.5e12) {
+		custom_fixed(s, kg * 1.0e-12, 4) << "Gt";
+	} else if (kg > 1.5e9) {
+		custom_fixed(s, kg * 1.0e-9, 4) << "Mt";
+	} else if (kg > 1.5e6) {
+		custom_fixed(s, kg * 1.0e-6, 4) << "kt";
+	} else if (kg > 1.5e3) {
+		custom_fixed(s, kg * 1.0e-3, 4) << "t";
+	} else if (kg < 1.0e-3) {
+		custom_fixed(s, kg * 1.0e6, 4) << "mg";
 	} else if (kg < 1.0) {
-		s << (kg * 1000.0) << "g";
-	} else if (kg < 0.001) {
-		s << (kg * 1.0e6) << "mg";
+		custom_fixed(s, kg * 1.0e3, 4) << "g";
 	} else {
-		s << kg << "kg";
+		custom_fixed(s, kg, 4) << "kg";
 	}
 	return s.str();
 }
@@ -436,16 +637,21 @@ std::string PercentageString(double n) {
 
 std::string TimeString(double s) {
 	int is = int(s);
+	int md = 1;
+	int sd = 1;
 	std::stringstream ss;
+	ss << std::setfill('0');
 	if (is >= 3600) {
 		ss << (is / 3600) << "h ";
 		is %= 3600;
+		md = 2;
 	}
 	if (is >= 60) {
-		ss << (is / 60) << "m ";
+		ss << std::setw(md) << (is / 60) << "m ";
 		is %= 60;
+		sd = 2;
 	}
-	ss << is << 's';
+	ss << std::setw(sd) << is << 's';
 	return ss.str();
 }