diff --git a/Framework/Algorithms/src/FindPeakBackground.cpp b/Framework/Algorithms/src/FindPeakBackground.cpp
index f5de226028bff2fb6f34e25ccc26c37f68d85f66..8884e017d58c4ba64246a68f03f15e22e53c3d0d 100644
--- a/Framework/Algorithms/src/FindPeakBackground.cpp
+++ b/Framework/Algorithms/src/FindPeakBackground.cpp
@@ -157,7 +157,7 @@ void FindPeakBackground::exec() {
Statistics stats = getStatistics(maskedY);
Ymean = stats.mean;
Yvariance = stats.standard_deviation * stats.standard_deviation;
- Ysigma = std::sqrt((moment4(maskedY, n - l0, Ymean) -
+ Ysigma = std::sqrt((moment4(maskedY, xn, Ymean) -
(xn - 3.0) / (xn - 1.0) * Yvariance) /
xn);
MantidVec::const_iterator it =
diff --git a/Framework/ICat/src/GSoap/stdsoap2.cpp b/Framework/ICat/src/GSoap/stdsoap2.cpp
index fcef2db1c46087ac78ab012c76fc7dc869439347..78c5d975fe5f612616f50e8be4e5fb32dc381ceb 100644
--- a/Framework/ICat/src/GSoap/stdsoap2.cpp
+++ b/Framework/ICat/src/GSoap/stdsoap2.cpp
@@ -8188,9 +8188,11 @@ void *SOAP_FMAC2 soap_id_lookup(struct soap *soap, const char *id, void **p,
void *s, **r = &ip->link;
q = (void **)ip->link;
while (q) {
- *r = (void *)soap_malloc(soap, sizeof(void *));
- if (!*r)
+ void **tmp = (void **)soap_malloc(soap, sizeof(void *));
+ if (!tmp)
return NULL;
+ *r = (void*)tmp;
+
s = *q;
*q = *r;
r = (void **)*r;
@@ -10040,7 +10042,7 @@ int SOAP_FMAC2 soap_element_start_end_out(struct soap *soap, const char *tag) {
if (soap->mode & SOAP_XML_CANONICAL) {
struct soap_nlist *np;
for (tp = soap->attributes; tp; tp = tp->next) {
- if (tp->visible && tp->name)
+ if (tp->visible && tp->name[0])
soap_utilize_ns(soap, tp->name);
}
for (np = soap->nlist; np; np = np->next) {
diff --git a/MantidPlot/src/Graph.cpp b/MantidPlot/src/Graph.cpp
index db3b3e6fcd290c43819c2df94f5f38d021aee8a4..f147c078e4ad2bfb4bfa4d86e70023fb3ff7fd4c 100644
--- a/MantidPlot/src/Graph.cpp
+++ b/MantidPlot/src/Graph.cpp
@@ -1436,7 +1436,8 @@ void Graph::setAxisScale(int axis, double start, double end, int type, double st
QwtScaleWidget *rightAxis = d_plot->axisWidget(QwtPlot::yRight);
if(rightAxis)
{
- if (type == ScaleTransformation::Log10 && (start <= 0 || start == DBL_MAX))
+ //if (type == ScaleTransformation::Log10 && (start <= 0 || start == DBL_MAX))
+ if (type == GraphOptions::Log10 && (start <= 0 || start == DBL_MAX))
{
start = sp->getMinPositiveValue();
}
diff --git a/MantidPlot/src/ImportASCIIDialog.cpp b/MantidPlot/src/ImportASCIIDialog.cpp
index 44c2ff0105b2c0636fe4a8fcebce9f9dbdcb0dcd..075910ef35fb89d929af75626a20ae8a6845b781 100644
--- a/MantidPlot/src/ImportASCIIDialog.cpp
+++ b/MantidPlot/src/ImportASCIIDialog.cpp
@@ -450,62 +450,67 @@ void ImportASCIIDialog::preview()
void ImportASCIIDialog::previewTable()
{
- if (!d_preview_table)
- return;
+ if (!d_preview_table)
+ return;
- if (!d_preview_table->isVisible())
- d_preview_table->show();
+ if (!d_preview_table->isVisible())
+ d_preview_table->show();
- if (d_current_path.trimmed().isEmpty()){
- d_preview_table->clear();
- d_preview_table->resetHeader();
- return;
- }
+ if (d_current_path.trimmed().isEmpty()){
+ d_preview_table->clear();
+ d_preview_table->resetHeader();
+ return;
+ }
- int importMode = d_import_mode->currentIndex();
- if (importMode == NewTables)
- importMode = Table::Overwrite;
- else
- importMode -= 2;
-
- d_preview_table->resetHeader();
- d_preview_table->importASCII(d_current_path, columnSeparator(), d_ignored_lines->value(),
- d_rename_columns->isChecked(), d_strip_spaces->isChecked(),
- d_simplify_spaces->isChecked(), d_import_comments->isChecked(),
- d_comment_string->text(), (Table::ImportMode)importMode,
- boxEndLine->currentIndex(), d_preview_lines_box->value());
-
- if (d_import_dec_separators->isChecked())
- d_preview_table->updateDecimalSeparators(decimalSeparators());
- if (!d_preview_table->isVisible())
- d_preview_table->show();
+ int importMode = d_import_mode->currentIndex();
+ if (importMode == NewTables) {
+ importMode = (ImportASCIIDialog::ImportMode)Table::Overwrite;
+ } else {
+ importMode -= 2;
+ }
+
+ d_preview_table->resetHeader();
+ d_preview_table->importASCII(d_current_path, columnSeparator(), d_ignored_lines->value(),
+ d_rename_columns->isChecked(), d_strip_spaces->isChecked(),
+ d_simplify_spaces->isChecked(), d_import_comments->isChecked(),
+ d_comment_string->text(), (Table::ImportMode)importMode,
+ boxEndLine->currentIndex(), d_preview_lines_box->value());
+
+ if (d_import_dec_separators->isChecked())
+ d_preview_table->updateDecimalSeparators(decimalSeparators());
+
+ if (!d_preview_table->isVisible())
+ d_preview_table->show();
}
-void ImportASCIIDialog::previewMatrix()
-{
- if (!d_preview_matrix)
- return;
+void ImportASCIIDialog::previewMatrix() {
+ if (!d_preview_matrix)
+ return;
- if (d_current_path.trimmed().isEmpty()){
- d_preview_matrix->clear();
- return;
- }
+ if (d_current_path.trimmed().isEmpty()) {
+ d_preview_matrix->clear();
+ return;
+ }
- int importMode = d_import_mode->currentIndex();
- if (importMode == NewMatrices)
- importMode = Matrix::Overwrite;
- else
- importMode -= 2;
+ int importMode = d_import_mode->currentIndex();
+ if (importMode == NewMatrices) {
+ importMode = (ImportASCIIDialog::ImportMode)Matrix::Overwrite;
+ } else {
+ // Overwrite-2 => NewColumns (in both Matrix::importMode and
+ // ImportASCIIDialog::importMode)
+ importMode -= 2;
+ }
- QLocale locale = d_preview_matrix->locale();
- if(d_import_dec_separators->isChecked())
- locale = decimalSeparators();
+ QLocale locale = d_preview_matrix->locale();
+ if (d_import_dec_separators->isChecked())
+ locale = decimalSeparators();
- d_preview_matrix->importASCII(d_current_path, columnSeparator(), d_ignored_lines->value(),
- d_strip_spaces->isChecked(), d_simplify_spaces->isChecked(),
- d_comment_string->text(), importMode, locale,
- boxEndLine->currentIndex(), d_preview_lines_box->value());
- d_preview_matrix->resizeColumnsToContents();
+ d_preview_matrix->importASCII(
+ d_current_path, columnSeparator(), d_ignored_lines->value(),
+ d_strip_spaces->isChecked(), d_simplify_spaces->isChecked(),
+ d_comment_string->text(), importMode, locale, boxEndLine->currentIndex(),
+ d_preview_lines_box->value());
+ d_preview_matrix->resizeColumnsToContents();
}
void ImportASCIIDialog::changePreviewFile(const QString& path)
@@ -542,8 +547,8 @@ void ImportASCIIDialog::setNewWindowsOnly(bool on)
if (on){
d_import_mode->clear();
d_import_mode->addItem(tr("New Table"));
- d_import_mode->addItem(tr("New Matrice"));
- d_import_mode->addItem(tr("New Workspace"));
+ d_import_mode->addItem(tr("New Matrix"));
+ d_import_mode->addItem(tr("New Workspace"));
}
d_preview_button->setChecked(false);