|
 |
fb32dee |
diff -Naur original/libscidavis/src/importOPJ.cpp patched/libscidavis/src/importOPJ.cpp
|
|
|
fb32dee |
--- original/libscidavis/src/importOPJ.cpp 2023-08-01 12:56:02.928503676 +0300
|
|
|
fb32dee |
+++ patched/libscidavis/src/importOPJ.cpp 2023-08-01 14:00:34.408322342 +0300
|
|
|
fb32dee |
@@ -323,7 +323,7 @@
|
|
|
fb32dee |
}
|
|
|
fb32dee |
case Origin::Text:
|
|
|
fb32dee |
table->column(j)->setColumnMode(SciDAVis::ColumnMode::Text);
|
|
|
fb32dee |
- for (int i = 0; i < min((int)column.data.size(), maxrows); ++i) {
|
|
|
fb32dee |
+ for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i) {
|
|
|
fb32dee |
scidavis_column->setTextAt(i, column.data[i].as_string());
|
|
|
fb32dee |
}
|
|
|
fb32dee |
break;
|
|
|
fb32dee |
@@ -379,7 +379,7 @@
|
|
|
fb32dee |
default:
|
|
|
fb32dee |
format = "dd.MM.yyyy";
|
|
|
fb32dee |
}
|
|
|
fb32dee |
- for (int i = 0; i < min((int)column.data.size(), maxrows); ++i)
|
|
|
fb32dee |
+ for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i)
|
|
|
fb32dee |
scidavis_column->setValueAt(i, column.data[i].as_double());
|
|
|
fb32dee |
table->column(j)->setColumnMode(SciDAVis::ColumnMode::DateTime);
|
|
|
fb32dee |
DateTime2StringFilter *filter =
|
|
|
fb32dee |
@@ -423,7 +423,7 @@
|
|
|
fb32dee |
format = "hh:mm:ss.zzz";
|
|
|
fb32dee |
break;
|
|
|
fb32dee |
}
|
|
|
fb32dee |
- for (int i = 0; i < min((int)column.data.size(), maxrows); ++i)
|
|
|
fb32dee |
+ for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i)
|
|
|
fb32dee |
scidavis_column->setValueAt(i, column.data[i].as_double());
|
|
|
fb32dee |
table->column(j)->setColumnMode(SciDAVis::ColumnMode::DateTime);
|
|
|
fb32dee |
DateTime2StringFilter *filter =
|
|
|
fb32dee |
@@ -443,7 +443,7 @@
|
|
|
fb32dee |
format = "M";
|
|
|
fb32dee |
break;
|
|
|
fb32dee |
}
|
|
|
fb32dee |
- for (int i = 0; i < min((int)column.data.size(), maxrows); ++i)
|
|
|
fb32dee |
+ for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i)
|
|
|
fb32dee |
scidavis_column->setValueAt(i, column.data[i].as_double());
|
|
|
fb32dee |
table->column(j)->setColumnMode(SciDAVis::ColumnMode::Month);
|
|
|
fb32dee |
DateTime2StringFilter *filter =
|
|
|
fb32dee |
@@ -463,7 +463,7 @@
|
|
|
fb32dee |
format = "d";
|
|
|
fb32dee |
break;
|
|
|
fb32dee |
}
|
|
|
fb32dee |
- for (int i = 0; i < min((int)column.data.size(), maxrows); ++i)
|
|
|
fb32dee |
+ for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i)
|
|
|
fb32dee |
scidavis_column->setValueAt(i, column.data[i].as_double());
|
|
|
fb32dee |
table->column(j)->setColumnMode(SciDAVis::ColumnMode::Day);
|
|
|
fb32dee |
DateTime2StringFilter *filter =
|
|
|
fb32dee |
@@ -554,7 +554,7 @@
|
|
|
fb32dee |
#endif
|
|
|
fb32dee |
QVector<qreal> values;
|
|
|
fb32dee |
values.resize(rowCount * columnCount);
|
|
|
fb32dee |
- for (int i = 0; i < min((int)values.size(), (int)layer.data.size()); i++) {
|
|
|
fb32dee |
+ for (int i = 0; i < std::min((int)values.size(), (int)layer.data.size()); i++) {
|
|
|
fb32dee |
values[i] = layer.data[i];
|
|
|
fb32dee |
}
|
|
|
fb32dee |
Matrix->setCells(values);
|
|
|
fb32dee |
@@ -1006,7 +1006,7 @@
|
|
|
fb32dee |
grid->enableZeroLineX(0);
|
|
|
fb32dee |
grid->enableZeroLineY(0);
|
|
|
fb32dee |
|
|
|
fb32dee |
- vector<Origin::GraphAxisFormat> formats;
|
|
|
fb32dee |
+ std::vector<Origin::GraphAxisFormat> formats;
|
|
|
fb32dee |
formats.push_back(layer.yAxis.formatAxis[0]); // left
|
|
|
fb32dee |
formats.push_back(layer.yAxis.formatAxis[1]); // right
|
|
|
fb32dee |
formats.push_back(layer.xAxis.formatAxis[0]); // bottom
|
|
|
fb32dee |
@@ -1014,7 +1014,7 @@
|
|
|
fb32dee |
graph->setXAxisTitle(parseOriginText(decodeMbcs(formats[2].label.text.c_str())));
|
|
|
fb32dee |
graph->setYAxisTitle(parseOriginText(decodeMbcs(formats[0].label.text.c_str())));
|
|
|
fb32dee |
|
|
|
fb32dee |
- vector<Origin::GraphAxisTick> ticks;
|
|
|
fb32dee |
+ std::vector<Origin::GraphAxisTick> ticks;
|
|
|
fb32dee |
ticks.push_back(layer.yAxis.tickAxis[0]); // left
|
|
|
fb32dee |
ticks.push_back(layer.yAxis.tickAxis[1]); // right
|
|
|
fb32dee |
ticks.push_back(layer.xAxis.tickAxis[0]); // bottom
|