Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

specify namespace to which functions belong #31

Merged
merged 1 commit into from
Aug 1, 2023
Merged

specify namespace to which functions belong #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
specify namespace to which functions belong 
This should take care of issue [#30](#30).
  • Loading branch information
@alxpl
alxpl committed Aug 1, 2023
commit afca5696c4f477dcae4a0484dad2d7314884f020
16 changes: 8 additions & 8 deletions libscidavis/src/importOPJ.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe
}
case Origin::Text:
table->column(j)->setColumnMode(SciDAVis::ColumnMode::Text);
for (int i = 0; i < min((int)column.data.size(), maxrows); ++i) {
for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i) {
scidavis_column->setTextAt(i, column.data[i].as_string());
}
break;
Expand Down Expand Up @@ -379,7 +379,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe
default:
format = "dd.MM.yyyy";
}
for (int i = 0; i < min((int)column.data.size(), maxrows); ++i)
for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i)
scidavis_column->setValueAt(i, column.data[i].as_double());
table->column(j)->setColumnMode(SciDAVis::ColumnMode::DateTime);
DateTime2StringFilter *filter =
Expand Down Expand Up @@ -423,7 +423,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe
format = "hh:mm:ss.zzz";
break;
}
for (int i = 0; i < min((int)column.data.size(), maxrows); ++i)
for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i)
scidavis_column->setValueAt(i, column.data[i].as_double());
table->column(j)->setColumnMode(SciDAVis::ColumnMode::DateTime);
DateTime2StringFilter *filter =
Expand All @@ -443,7 +443,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe
format = "M";
break;
}
for (int i = 0; i < min((int)column.data.size(), maxrows); ++i)
for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i)
scidavis_column->setValueAt(i, column.data[i].as_double());
table->column(j)->setColumnMode(SciDAVis::ColumnMode::Month);
DateTime2StringFilter *filter =
Expand All @@ -463,7 +463,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe
format = "d";
break;
}
for (int i = 0; i < min((int)column.data.size(), maxrows); ++i)
for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i)
scidavis_column->setValueAt(i, column.data[i].as_double());
table->column(j)->setColumnMode(SciDAVis::ColumnMode::Day);
DateTime2StringFilter *filter =
Expand Down Expand Up @@ -554,7 +554,7 @@ bool ImportOPJ::importTables(const OriginFile &opj)
#endif
QVector<qreal> values;
values.resize(rowCount * columnCount);
for (int i = 0; i < min((int)values.size(), (int)layer.data.size()); i++) {
for (int i = 0; i < std::min((int)values.size(), (int)layer.data.size()); i++) {
values[i] = layer.data[i];
}
Matrix->setCells(values);
Expand Down Expand Up @@ -1006,15 +1006,15 @@ bool ImportOPJ::importGraphs(const OriginFile &opj)
grid->enableZeroLineX(0);
grid->enableZeroLineY(0);

vector<Origin::GraphAxisFormat> formats;
std::vector<Origin::GraphAxisFormat> formats;
formats.push_back(layer.yAxis.formatAxis[0]); // left
formats.push_back(layer.yAxis.formatAxis[1]); // right
formats.push_back(layer.xAxis.formatAxis[0]); // bottom
formats.push_back(layer.xAxis.formatAxis[1]); // top
graph->setXAxisTitle(parseOriginText(decodeMbcs(formats[2].label.text.c_str())));
graph->setYAxisTitle(parseOriginText(decodeMbcs(formats[0].label.text.c_str())));

vector<Origin::GraphAxisTick> ticks;
std::vector<Origin::GraphAxisTick> ticks;
ticks.push_back(layer.yAxis.tickAxis[0]); // left
ticks.push_back(layer.yAxis.tickAxis[1]); // right
ticks.push_back(layer.xAxis.tickAxis[0]); // bottom
Expand Down
Loading