17 changes: 16 additions & 1 deletion devel-docs/BugsAndFeatures
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
BUGS

---------------
342904

We have a data source file where we log temperatures. The unit in this case is °C (alt-167).

When plotting this, the axis labels get a ? in a black box. When adding an Annotation or changing the ? black box in the label dialogue, we can enter alt-167 and get the correct º Symbol.

---------------

Bug 318141

When double clicking on an element in the available or selected list in the "Differentiate Curves" dialog nothing happens. It should trigger an add or remove action depending on the list in which the item resides. This is a bug because the behavior is inconsistent with other dialogs, which have the same layout (e.g. Data Wizard)

Reproducible: Always


Manuel
---------------
Expand Down
2 changes: 1 addition & 1 deletion src/datasources/ascii/asciisource.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void AsciiSource::reset()
_reader.clear();
_haveWarned = false;

_valid = false;
//_valid = false;
_fileSize = 0;
_lastFileSize = 0;
_haveHeader = false;
Expand Down
2 changes: 2 additions & 0 deletions src/datasources/fitstable/fitstable.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ bool FitsTableSource::init() {
fits_close_file( _fptr, &status );
_fptr = 0L;
_valid = false;
free(naxes);
return false;
}
_scalars.clear();
Expand Down Expand Up @@ -386,6 +387,7 @@ bool FitsTableSource::init() {
fits_report_error(stderr,status);
_fptr = 0L;
_valid = false;
free(naxes);
return false;
} /* can't read number of HDUs, so quit */

Expand Down
17 changes: 10 additions & 7 deletions src/datasources/its/its.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,12 @@ ITSfile *ITSopen(char *filename) {
its->fp_data = open(filename, O_RDONLY);
if (its->fp_data<0) {
its->status = ITS_NOOPEN;
return (its);
free(index_filename);
return (its);
}

its->fp_index = open(index_filename, O_RDONLY);
free(index_filename);
if (its->fp_index<0) {
its->status = ITS_NOOPEN;
return (its);
Expand Down Expand Up @@ -135,7 +137,7 @@ int ITSnframes(ITSfile *its) {

int ITSreadimage(ITSfile *its, int frame, int i_img, ITSimage *I) {
int nframes;
unsigned offset;
off_t offset;
int nr;
uint64_t index;
unsigned char buf_in[1024];
Expand Down Expand Up @@ -201,11 +203,12 @@ int ITSreadimage(ITSfile *its, int frame, int i_img, ITSimage *I) {

// Now read in the actual image
offset = lseek(its->fp_data, i_img*(img_size + 4), SEEK_CUR);
nr = read(its->fp_data, &(I->x), 2);
nr += read(its->fp_data, &(I->y), 2);
nr += read(its->fp_data, I->img, img_size);

if (nr != img_size + 4) {
if (offset>=0) {
nr = read(its->fp_data, &(I->x), 2);
nr += read(its->fp_data, &(I->y), 2);
nr += read(its->fp_data, I->img, img_size);
}
if ((offset<0) || (nr != img_size + 4)) {
I->w = I->h = I->x = I->y = 0;
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/datasources/qimagesource/qimagesource.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class QImageSource::Config {
class DataInterfaceQImageVector : public DataSource::DataInterface<DataVector>
{
public:
DataInterfaceQImageVector(QImage* img) : _image(img) {}
DataInterfaceQImageVector(QImage* img) : _image(img), _frameCount(0) {}

// read one element
int read(const QString&, DataVector::ReadInfo&);
Expand Down
2 changes: 1 addition & 1 deletion src/datasources/tiff16source/tiff16source.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class Tiff16Source::Config {
class DataInterfaceTiff16Vector : public DataSource::DataInterface<DataVector>
{
public:
DataInterfaceTiff16Vector(unsigned short **z) : _z(z) {}
DataInterfaceTiff16Vector(unsigned short **z) : _z(z), _frameCount(0) {}

// read one element
int read(const QString&, DataVector::ReadInfo&);
Expand Down
60 changes: 41 additions & 19 deletions src/kst/bindings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title></title>
<meta name="generator" content="LibreOffice 6.0.6.2 (Linux)"/>
<meta name="created" content="2018-10-10T15:04:34.244752003"/>
<meta name="changed" content="2018-10-12T23:45:59.369628861"/>
<meta name="changed" content="2018-11-16T15:45:21.950831842"/>
<style type="text/css">
@page { margin: 2cm }
p { margin-bottom: 0.25cm; line-height: 115% }
Expand Down Expand Up @@ -152,61 +152,83 @@
<p style="margin-bottom: 0cm; line-height: 100%"><font size="4" style="font-size: 16pt"><b>File
navigation</b></font></p>
<table width="435" cellpadding="4" cellspacing="0">
<col width="100">
<col width="19">
<col width="290">
<col width="138">
<col width="18">
<col width="252">
<tr valign="top">
<td width="100" style="background: transparent" style="border-top: 1px solid #000000; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0.1cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<td width="138" style="background: transparent" style="border-top: 1px solid #000000; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0.1cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="right"><b>Page Up</b></p>
</td>
<td width="19" style="background: transparent" style="border-top: 1px solid #000000; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0.1cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<td width="18" style="background: transparent" style="border-top: 1px solid #000000; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0.1cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="left"><b>:</b></p>
</td>
<td width="290" style="border: 1px solid #000000; padding: 0.1cm">
<td width="252" style="border: 1px solid #000000; padding: 0.1cm">
<p>Move earlier in file by one screen</p>
</td>
</tr>
<tr valign="top">
<td width="100" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<td width="138" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="right"><b>SHIFT+Page Up</b></p>
</td>
<td width="18" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="left"><b>:</b></p>
</td>
<td width="252" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: 1px solid #000000; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0.1cm">
<p>Move earlier in file by 1/5th screen</p>
</td>
</tr>
<tr valign="top">
<td width="138" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="right"><b>Page Down</b></p>
</td>
<td width="19" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<td width="18" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="left"><b>:</b></p>
</td>
<td width="290" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: 1px solid #000000; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0.1cm">
<td width="252" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: 1px solid #000000; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0.1cm">
<p>Move later in file by one screen</p>
</td>
</tr>
<tr valign="top">
<td width="100" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<td width="138" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="right"><b>SHIFT+Page Down</b></p>
</td>
<td width="18" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="left"><b>:</b></p>
</td>
<td width="252" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: 1px solid #000000; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0.1cm">
<p>Move later in file by 1/5th screen</p>
</td>
</tr>
<tr valign="top">
<td width="138" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="right"><b>End</b></p>
</td>
<td width="19" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<td width="18" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="left"><b>:</b></p>
</td>
<td width="290" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: 1px solid #000000; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0.1cm">
<td width="252" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: 1px solid #000000; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0.1cm">
<p>Move to the end of the file</p>
</td>
</tr>
<tr valign="top">
<td width="100" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<td width="138" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="right"><b>SHIFT+END</b></p>
</td>
<td width="19" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<td width="18" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="left"><b>:</b></p>
</td>
<td width="290" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: 1px solid #000000; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0.1cm">
<td width="252" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: 1px solid #000000; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0.1cm">
<p>Read to the end of the file</p>
</td>
</tr>
<tr valign="top">
<td width="100" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<td width="138" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="right"><b>P</b></p>
</td>
<td width="19" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<td width="18" style="background: transparent" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0cm">
<p align="left"><b>:</b></p>
</td>
<td width="290" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: 1px solid #000000; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0.1cm">
<td width="252" style="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: 1px solid #000000; padding-top: 0cm; padding-bottom: 0.1cm; padding-left: 0.1cm; padding-right: 0.1cm">
<p>Toggle live updates (pause)</p>
</td>
</tr>
Expand Down
Binary file modified src/kst/bindings.odt
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion src/libkst/datasource.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ void DataSource::_initializeShortName() {
_datasourcenum++;
}

bool DataSource::isValid() const {
bool Kst::DataSource::isValid() const
{
return _valid;
}

Expand Down
2 changes: 1 addition & 1 deletion src/libkst/datasource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ class KSTCORE_EXPORT ValidateDataSourceThread : public QObject, public QRunnable
void dataSourceInvalid(int requestID);

private:
ObjectStore *_store;
//ObjectStore *_store;
QString _file;
int _requestID;
};
Expand Down
8 changes: 4 additions & 4 deletions src/libkst/matrixscriptinterface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ QString MatrixCommonSI::store(QString & command) {
/******************************************************/
/* Data Matrix */
/******************************************************/
DataMatrixSI::DataMatrixSI(DataMatrixPtr it) {
_datamatrix = it;
DataMatrixSI::DataMatrixSI(DataMatrixPtr it) : _datamatrix(it) {
//_datamatrix = it;
_matrix = it;

_fnMap.insert("change",&DataMatrixSI::change);
Expand Down Expand Up @@ -207,8 +207,8 @@ QString DataMatrixSI::startY(QString& command) {
/******************************************************/
/* Editable Matrix */
/******************************************************/
EditableMatrixSI::EditableMatrixSI(EditableMatrixPtr it) {
_editablematrix = it;
EditableMatrixSI::EditableMatrixSI(EditableMatrixPtr it) : _editablematrix(it) {
//_editablematrix = it;
_matrix = it;

_fnMap.insert("load", &EditableMatrixSI::load);
Expand Down
12 changes: 6 additions & 6 deletions src/libkst/scalarscriptinterface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace Kst {
/******************************************************/
/* Generated Scalars */
/******************************************************/
ScalarGenSI::ScalarGenSI(ScalarPtr it) {
scalar=it;
ScalarGenSI::ScalarGenSI(ScalarPtr it) : scalar(it) {
//scalar=it;
}

QString ScalarGenSI::doCommand(QString x) {
Expand Down Expand Up @@ -68,8 +68,8 @@ QByteArray ScalarGenSI::endEditUpdate() {
/******************************************************/
/* Data Scalars */
/******************************************************/
ScalarDataSI::ScalarDataSI(DataScalarPtr it) {
scalar=it;
ScalarDataSI::ScalarDataSI(DataScalarPtr it) : scalar(it) {
//scalar=it;
}

QString ScalarDataSI::doCommand(QString x) {
Expand Down Expand Up @@ -118,8 +118,8 @@ QByteArray ScalarDataSI::endEditUpdate() {
/******************************************************/
/* Vector Scalars */
/******************************************************/
ScalarVectorSI::ScalarVectorSI(VScalarPtr it) {
scalar=it;
ScalarVectorSI::ScalarVectorSI(VScalarPtr it) : scalar(it) {
//scalar=it;
}

QString ScalarVectorSI::doCommand(QString x) {
Expand Down
8 changes: 4 additions & 4 deletions src/libkst/stringscriptinterface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

namespace Kst {

StringGenSI::StringGenSI(StringPtr it) {
str=it;
StringGenSI::StringGenSI(StringPtr it) : str(it) {
//str=it;
}

QString StringGenSI::doCommand(QString x) {
Expand Down Expand Up @@ -63,8 +63,8 @@ QByteArray StringGenSI::endEditUpdate() {

/////////////////////////////////////////////////////////////////////////////////////

StringDataSI::StringDataSI(DataStringPtr it) {
str=it;
StringDataSI::StringDataSI(DataStringPtr it) : str(it) {
//str=it;
}

QString StringDataSI::doCommand(QString x) {
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/datasourcedialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ void DataSourceDialog::updateTypeActivated(int idx)
_updateBox->setEnabled(false);
return;
}
_updateBox->setEnabled(true);
switch (idx) {
_updateBox->setEnabled(true);
case 0: _datasource->startUpdating(DataSource::Timer); break;
case 1: _datasource->startUpdating(DataSource::File); break;
case 2: _datasource->startUpdating(DataSource::None); break;
Expand Down
2 changes: 2 additions & 0 deletions src/libkstapp/differentiatecurvesdialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ DifferentiateCurvesDialog::DifferentiateCurvesDialog(QWidget *parent)
connect(_down, SIGNAL(clicked()), this, SLOT(downButtonClicked()));
connect(_availableListBox, SIGNAL(itemSelectionChanged()), this, SLOT(updateButtons()));
connect(_selectedListBox, SIGNAL(itemSelectionChanged()), this, SLOT(updateButtons()));
connect(_availableListBox, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(addButtonClicked()));
connect(_selectedListBox, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(removeButtonClicked()));

// Use the standard icons
_up->setIcon(KstGetIcon("kst_uparrow"));
Expand Down
4 changes: 2 additions & 2 deletions src/libkstapp/legenditem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void LegendItem::paint(QPainter *painter) {

// generate string list of relation names
QStringList names;
bool allAuto = true;
//bool allAuto = true;
bool sameX = true;
bool sameYUnits = true;

Expand All @@ -100,7 +100,7 @@ void LegendItem::paint(QPainter *painter) {
for (int i = 0; i<count; i++) {
RelationPtr relation = legendItems.at(i);
if (relation->descriptiveNameIsManual()) {
allAuto = false;
//allAuto = false;
}
if (relation->xLabelInfo() != label_info) {
sameX = false;
Expand Down
Loading