Skip to content
Snippets Groups Projects
Commit 673a5e64 authored by Van Herck, Walter's avatar Van Herck, Walter
Browse files

Fix possible absence of whitespace for projection files

parent 39350c5b
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
namespace namespace
{ {
const int bin_centers_colwidth = 12; const int bin_centers_colwidth = 12;
const int bin_values_colwidth = 20; const int bin_values_colwidth = 20;
...@@ -42,7 +41,7 @@ QString to_double_str(double value) ...@@ -42,7 +41,7 @@ QString to_double_str(double value)
auto str = PythonFormatting::printDouble(value); auto str = PythonFormatting::printDouble(value);
return QString("%1").arg(QString::fromStdString(str), -bin_centers_colwidth); return QString("%1").arg(QString::fromStdString(str), -bin_centers_colwidth);
} }
} } // unnamed namespace
SaveProjectionsAssistant::SaveProjectionsAssistant() = default; SaveProjectionsAssistant::SaveProjectionsAssistant() = default;
SaveProjectionsAssistant::~SaveProjectionsAssistant() = default; SaveProjectionsAssistant::~SaveProjectionsAssistant() = default;
...@@ -97,13 +96,12 @@ QString SaveProjectionsAssistant::projectionsToString(const QString& projections ...@@ -97,13 +96,12 @@ QString SaveProjectionsAssistant::projectionsToString(const QString& projections
auto bin_centers = projData.bin_centers; auto bin_centers = projData.bin_centers;
for (int i_point = 0; i_point < bin_centers.size(); ++i_point) { for (int i_point = 0; i_point < bin_centers.size(); ++i_point) {
out << to_double_str(bin_centers[i_point]); out << to_double_str(bin_centers[i_point]) << QString(" ");
for (auto& data : projData.projections) { for (auto& data : projData.projections) {
out << to_scientific_str(data.bin_values[i_point]); out << to_scientific_str(data.bin_values[i_point]);
} }
out << "\n"; out << "\n";
} }
return result; return result;
} }
...@@ -128,14 +126,12 @@ SaveProjectionsAssistant::projectionsData(const QString& projectionsType, ...@@ -128,14 +126,12 @@ SaveProjectionsAssistant::projectionsData(const QString& projectionsType,
data.axis_value = item->getItemValue(VerticalLineItem::P_POSX).toDouble(); data.axis_value = item->getItemValue(VerticalLineItem::P_POSX).toDouble();
hist.reset(m_hist2d->projectionY(data.axis_value)); hist.reset(m_hist2d->projectionY(data.axis_value));
} }
data.bin_values = QVector<double>::fromStdVector(hist->getBinValues()); data.bin_values = QVector<double>::fromStdVector(hist->getBinValues());
if (result.bin_centers.isEmpty()) if (result.bin_centers.isEmpty())
result.bin_centers = QVector<double>::fromStdVector(hist->getBinCenters()); result.bin_centers = QVector<double>::fromStdVector(hist->getBinCenters());
result.projections.push_back(data); result.projections.push_back(data);
} }
return result; return result;
} }
...@@ -153,7 +149,6 @@ QVector<SessionItem*> SaveProjectionsAssistant::projectionItems(const QString& p ...@@ -153,7 +149,6 @@ QVector<SessionItem*> SaveProjectionsAssistant::projectionItems(const QString& p
return item1->getItemValue(propertyName).toDouble() return item1->getItemValue(propertyName).toDouble()
< item2->getItemValue(propertyName).toDouble(); < item2->getItemValue(propertyName).toDouble();
}); });
return result; return result;
} }
...@@ -165,7 +160,7 @@ QString SaveProjectionsAssistant::projectionFileHeader(ProjectionsData& projecti ...@@ -165,7 +160,7 @@ QString SaveProjectionsAssistant::projectionFileHeader(ProjectionsData& projecti
QString xcol, ycol; QString xcol, ycol;
projectionsData.is_horizontal ? xcol = "# x" : xcol = "# y"; projectionsData.is_horizontal ? xcol = "# x" : xcol = "# y";
projectionsData.is_horizontal ? ycol = "y=" : ycol = "x="; projectionsData.is_horizontal ? ycol = " y=" : ycol = " x=";
QString result; QString result;
result.append(QString("%1").arg(xcol, -bin_centers_colwidth)); result.append(QString("%1").arg(xcol, -bin_centers_colwidth));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment