Fix {ctype} sign macro displaying Empty for non-element ctypes

This commit is contained in:
Tamás Bálint Misius
2019-04-02 19:50:01 +02:00
parent 58a3411255
commit c8df51a8b3

View File

@@ -116,11 +116,11 @@ String sign::getText(Simulation *sim)
}
else if (between_curlies == "type")
{
formatted_text << (part ? sim->BasicParticleInfo(*part) : (formatted_text.Size() ? String::Build("empty") : String::Build("Empty")));
formatted_text << (part ? sim->BasicParticleInfo(*part) : (formatted_text.Size() ? "empty" : "Empty"));
}
else if (between_curlies == "ctype")
{
formatted_text << ((part && part->ctype && sim->IsValidElement(part->ctype)) ? sim->ElementResolve(part->ctype, -1) : (formatted_text.Size() ? String::Build("empty") : String::Build("Empty")));
formatted_text << (part ? ((part->ctype && sim->IsValidElement(part->ctype)) ? sim->ElementResolve(part->ctype, -1) : String::Build(part->ctype)) : (formatted_text.Size() ? "empty" : "Empty"));
}
else if (between_curlies == "life")
{