Skip to content

Merge from upstream #2

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Merge from upstream #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3d058df
libscidavis/CMakeLists.txt: fix build if sip-4 installed.
Nowa-Ammerlaan Apr 16, 2022
fa60c7a
Merge pull request #25 from AndrewAmmerlaan/master
alxpl Apr 16, 2022
9eece99
Merge pull request #24 from highperformancecoder/master
alxpl May 8, 2022
94695c5
Fix bug #427: Color Change in Plot Details
gbm19 May 14, 2022
a938471
Merge pull request #26 from gbm19/bugfixes
highperformancecoder May 15, 2022
123b2f7
was like "step size", became like "number of steps"
BillKek Nov 10, 2022
0d218b8
Merge pull request #28 from BillKek/master
highperformancecoder Nov 10, 2022
afca569
specify namespace to which functions belong
alxpl Aug 1, 2023
3bb9bec
Merge pull request #31 from SciDAVis/alxpl-patch-2
highperformancecoder Aug 1, 2023
a1a7b44
Update minigzip.c
alxpl Feb 4, 2024
f8e9a1c
Merge pull request #1 from alxpl/alxpl-patch-1
alxpl Feb 4, 2024
1fde84a
Merge pull request #32 from alxpl/master
highperformancecoder Feb 4, 2024
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
3 changes: 3 additions & 0 deletions 3rdparty/minigzip/minigzip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
#include "zlib.h"
#include <stdio.h>

#include <stdlib.h>
#include <string.h>

#ifdef STDC
# include <string.h>
# include <stdlib.h>
Expand Down
2 changes: 1 addition & 1 deletion libscidavis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ if( SCRIPTING_PYTHON )
set(scidavis_PyQt_HDR ${scidavis_SIP_OUTPUT_DIR}/sipAPIscidavis.h)
if( SIP_VERSION VERSION_GREATER_EQUAL 5 )
set( scidavis_SIP_HDR ${CMAKE_CURRENT_BINARY_DIR}/python/sip.h )
target_include_directories( libscidavis PUBLIC
target_include_directories( libscidavis BEFORE PUBLIC
"${CMAKE_CURRENT_BINARY_DIR}/python"
"${scidavis_SIP_OUTPUT_DIR}"
)
Expand Down
2 changes: 2 additions & 0 deletions libscidavis/src/PlotDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1549,7 +1549,9 @@ void PlotDialog::setActiveCurve(CurveTreeItem *item)
style = 6;
boxConnect->setCurrentIndex(style);

penWidget->blockSignals(true);
penWidget->setPen(c->pen());
penWidget->blockSignals(false);
fillGroupBox->blockSignals(true);
fillGroupBox->setChecked(c->brush().style() != Qt::NoBrush);
fillGroupBox->blockSignals(false);
Expand Down
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
6 changes: 3 additions & 3 deletions scidavis/translations/scidavis_ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4146,13 +4146,13 @@ Are you sure you want to continue?</source>
<location filename="../../libscidavis/src/AxesDialog.cpp" line="153" />
<location filename="../../libscidavis/src/AxesDialog.cpp" line="452" />
<source>Major Ticks</source>
<translation>Шаг основной разметки</translation>
<translation>Шагов основной разметки</translation>
</message>
<message>
<location filename="../../libscidavis/src/AxesDialog.cpp" line="160" />
<location filename="../../libscidavis/src/AxesDialog.cpp" line="461" />
<source>Minor Ticks</source>
<translation>Шаг дополнительной разметки</translation>
<translation>Шагов дополнительной разметки</translation>
</message>
<message>
<location filename="../../libscidavis/src/AxesDialog.cpp" line="181" />
Expand Down Expand Up @@ -14491,4 +14491,4 @@ floating point values
<translation>Таблица</translation>
</message>
</context>
</TS>
</TS>
Loading