Skip to content

Commit 5a7b1a2

Browse files
authored
log: Cleanup incorrect eol usages (#1684)
1 parent ab6a691 commit 5a7b1a2

File tree

4 files changed

+19
-13
lines changed

4 files changed

+19
-13
lines changed

library/src/scene_impl.cxx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,11 @@ class scene_impl::internals
158158
this->Window.getCamera().resetToBounds();
159159
}
160160

161-
// Print info about scene and coloring
161+
// Display coloring information
162162
this->Window.PrintColoringDescription(log::VerboseLevel::DEBUG);
163+
log::debug("");
164+
165+
// Print scene description
163166
this->Window.PrintSceneDescription(log::VerboseLevel::DEBUG);
164167
}
165168

vtkext/private/module/F3DColoringInfoHandler.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ std::optional<F3DColoringInfoHandler::ColoringInfo> F3DColoringInfoHandler::SetC
120120

121121
if (!quiet)
122122
{
123-
F3DLog::Print(F3DLog::Severity::Debug, "No array to color with\n");
123+
F3DLog::Print(F3DLog::Severity::Debug, "No array to color with");
124124
}
125125
}
126126
else if (!arrayName.has_value())
@@ -138,7 +138,7 @@ std::optional<F3DColoringInfoHandler::ColoringInfo> F3DColoringInfoHandler::SetC
138138
this->CurrentColoringIter.reset();
139139
if (!quiet)
140140
{
141-
F3DLog::Print(F3DLog::Severity::Warning, "Unknown scalar array: \"" + arrayName.value() + "\"\n");
141+
F3DLog::Print(F3DLog::Severity::Warning, "Unknown scalar array: \"" + arrayName.value() + "\"");
142142
}
143143
}
144144
}

vtkext/private/module/vtkF3DRenderer.cxx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ vtkSmartPointer<vtkTexture> GetTexture(const std::string& filePath, bool isSRGB
149149
std::string fullPath = vtksys::SystemTools::CollapseFullPath(filePath);
150150
if (!vtksys::SystemTools::FileExists(fullPath))
151151
{
152-
F3DLog::Print(F3DLog::Severity::Warning, "Texture file does not exist " + fullPath + "\n");
152+
F3DLog::Print(F3DLog::Severity::Warning, "Texture file does not exist " + fullPath);
153153
}
154154
else
155155
{
@@ -171,7 +171,7 @@ vtkSmartPointer<vtkTexture> GetTexture(const std::string& filePath, bool isSRGB
171171
}
172172
else
173173
{
174-
F3DLog::Print(F3DLog::Severity::Warning, "Cannot open texture file " + fullPath + "\n");
174+
F3DLog::Print(F3DLog::Severity::Warning, "Cannot open texture file " + fullPath);
175175
}
176176
}
177177
}
@@ -614,7 +614,7 @@ void vtkF3DRenderer::ConfigureGridUsingCurrentActors()
614614
std::stringstream stream;
615615
stream << "Using grid unit square size = " << tmpUnitSquare << "\n"
616616
<< "Grid origin set to [" << gridPos[0] << ", " << gridPos[1] << ", " << gridPos[2]
617-
<< "]\n\n";
617+
<< "]\n";
618618
this->GridInfo = stream.str();
619619

620620
vtkNew<vtkF3DOpenGLGridMapper> gridMapper;
@@ -1877,7 +1877,7 @@ void vtkF3DRenderer::ConfigureActorsProperties()
18771877
if (this->SurfaceColor.value().size() != 3)
18781878
{
18791879
F3DLog::Print(F3DLog::Severity::Warning,
1880-
std::string("Invalid surface color provided, not applying\n"));
1880+
std::string("Invalid surface color provided, not applying"));
18811881
}
18821882
else
18831883
{
@@ -1891,7 +1891,7 @@ void vtkF3DRenderer::ConfigureActorsProperties()
18911891
if (this->EmissiveFactor.value().size() != 3)
18921892
{
18931893
F3DLog::Print(F3DLog::Severity::Warning,
1894-
std::string("Invalid emissive factor provided, not applying\n"));
1894+
std::string("Invalid emissive factor provided, not applying"));
18951895
}
18961896
else
18971897
{
@@ -2416,11 +2416,11 @@ std::string vtkF3DRenderer::GetColoringDescription()
24162416
{
24172417
stream << "Coloring using " << (this->UseCellColoring ? "cell" : "point") << " array named "
24182418
<< info.value().Name << (this->EnableColoring ? ", " : " (forced), ")
2419-
<< vtkF3DRenderer::ComponentToString(this->ComponentForColoring) << "\n";
2419+
<< vtkF3DRenderer::ComponentToString(this->ComponentForColoring);
24202420
}
24212421
else
24222422
{
2423-
stream << "Not coloring\n";
2423+
stream << "Not coloring";
24242424
}
24252425
return stream.str();
24262426
}
@@ -2555,7 +2555,7 @@ void vtkF3DRenderer::ConfigureRangeAndCTFForColoring(
25552555
if (this->ComponentForColoring >= info.MaximumNumberOfComponents)
25562556
{
25572557
F3DLog::Print(F3DLog::Severity::Warning,
2558-
std::string("Invalid component index: ") + std::to_string(this->ComponentForColoring) + "\n");
2558+
std::string("Invalid component index: ") + std::to_string(this->ComponentForColoring));
25592559
return;
25602560
}
25612561

@@ -2572,7 +2572,7 @@ void vtkF3DRenderer::ConfigureRangeAndCTFForColoring(
25722572
else
25732573
{
25742574
F3DLog::Print(F3DLog::Severity::Warning,
2575-
std::string("Invalid scalar range provided, using automatic range\n"));
2575+
std::string("Invalid scalar range provided, using automatic range"));
25762576
}
25772577
}
25782578

vtkext/private/module/vtkF3DRenderer.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ class vtkF3DRenderer : public vtkOpenGLRenderer
158158
/**
159159
* Return description about the current rendering status
160160
* Currently contains information about the camera and the grid if any
161+
* Returns a multiline string containing the scene description
161162
*/
162163
std::string GetSceneDescription();
163164

@@ -321,6 +322,7 @@ class vtkF3DRenderer : public vtkOpenGLRenderer
321322

322323
/**
323324
* Get information about the current coloring
325+
* Returns a single line string containing the coloring description
324326
*/
325327
virtual std::string GetColoringDescription();
326328

@@ -406,7 +408,8 @@ class vtkF3DRenderer : public vtkOpenGLRenderer
406408

407409
/**
408410
* Generate a padded metadata description
409-
* using the internal importer
411+
* using the internal importer.
412+
* Returns a multiline string containing the meta data description
410413
*/
411414
std::string GenerateMetaDataDescription();
412415

0 commit comments

Comments
 (0)