mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Coding style adaptations

Browse Source
This commit is contained in:
Alexander Bock
2022-04-10 23:25:37 +02:00
parent dc9ffaa0e7
commit c206da4a98
64 changed files with 944 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/fieldlinessequence/fieldlinessequencemodule.cpp
View File

@@ -67,7 +67,8 @@ void FieldlinesSequenceModule::internalInitialize(const ghoul::Dictionary&) {
factory->registerClass<RenderableFieldlinesSequence>("RenderableFieldlinesSequence");
}
std::vector<documentation::Documentation> FieldlinesSequenceModule::documentations() const {
std::vector<documentation::Documentation> FieldlinesSequenceModule::documentations() const
{
return {
RenderableFieldlinesSequence::Documentation()
};

8
modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
View File

@@ -185,7 +185,7 @@ namespace {
// Extra variables such as rho, p or t
std::optional<std::vector<std::string>> extraVariables;
// Which variable in CDF file to trace. b is default for fieldline
std::optional<std::string> tracingVariable;
@@ -207,11 +207,11 @@ namespace {
// [[codegen::verbatim(ColorQuantityInfo.description)]]
std::optional<int> colorQuantity;
// List of ranges for which their corresponding parameters values will be
// List of ranges for which their corresponding parameters values will be
// colorized by. Should be entered as {min value, max value} per range
std::optional<std::vector<glm::vec2>> colorTableRanges;
// Enables flow, showing the direction, but not accurate speed, that particles
// Enables flow, showing the direction, but not accurate speed, that particles
// would be traveling
std::optional<bool> flowEnabled;
@@ -221,7 +221,7 @@ namespace {
// [[codegen::verbatim(MaskingQuantityInfo.description)]]
std::optional<int> maskingQuantity;
// List of ranges for which their corresponding parameters values will be
// List of ranges for which their corresponding parameters values will be
// masked by. Should be entered as {min value, max value} per range
std::optional<std::vector<glm::vec2>> maskingRanges;

4
modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
View File

@@ -89,7 +89,7 @@ namespace openspace::fls {
* vector at each line vertex
*/
bool convertCdfToFieldlinesState(FieldlinesState& state, const std::string& cdfPath,
const std::unordered_map<std::string,
const std::unordered_map<std::string,
std::vector<glm::vec3>>& seedMap,
double manualTimeOffset,
const std::string& tracingVar,
@@ -310,7 +310,7 @@ void prepareStateAndKameleonForExtras(ccmc::Kameleon* kameleon,
std::string& str = extraScalarVars[i];
bool success = kameleon->doesVariableExist(str) && kameleon->loadVariable(str);
if (!success &&
(model == fls::Model::Batsrus &&
(model == fls::Model::Batsrus &&
(str == TAsPOverRho || str == "T" || str == "t"))
)
{

4
modules/fieldlinessequence/util/kameleonfieldlinehelper.h
View File

@@ -37,8 +37,8 @@ class FieldlinesState;
namespace fls {
bool convertCdfToFieldlinesState(FieldlinesState& state, const std::string& cdfPath,
const std::unordered_map<std::string, std::vector<glm::vec3>>& seedMap,
double manualTimeOffset, const std::string& tracingVar,
const std::unordered_map<std::string, std::vector<glm::vec3>>& seedMap,
double manualTimeOffset, const std::string& tracingVar,
std::vector<std::string>& extraVars, std::vector<std::string>& extraMagVars);
} // namespace fls