Commit ef1abca0 authored by Hahn, Steven's avatar Hahn, Steven
Browse files

Remove clang-format changes to MantidQt/* and MantidPlot/*

parent 483c041a
......@@ -114,9 +114,8 @@ public:
QwtDoubleRect boundingRect() const override;
void setBoundingRect(double xs, double ys, double xe, double ye);
//! Recalculates the bounding rectangle in values coordinates using the
//pixel coordinats when the scales change
void updateBoundingRect();
//! Recalculates the bounding rectangle in values coordinates using the pixel coordinats when the scales change
void updateBoundingRect();
//! Returns the state of #d_editable.
bool editable() const { return d_editable; }
......@@ -129,10 +128,10 @@ public:
private:
void draw(QPainter *p, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
const QRect &r) const override;
double theta(int xs, int ys, int xe, int ye) const;
double theta(int xs, int ys, int xe, int ye) const;
//! Flag specifying if the start arrow is visible
bool d_start_arrow;
//! Flag specifying if the start arrow is visible
bool d_start_arrow;
//! Flag specifying if the end arrow is visible
bool d_end_arrow;
......
......@@ -46,10 +46,10 @@ public:
QwtDoubleRect boundingRect() const override;
QwtSymbol::Style minStyle() { return min_style; };
void setMinStyle(QwtSymbol::Style s) { min_style = s; };
QwtSymbol::Style minStyle(){return min_style;};
void setMinStyle(QwtSymbol::Style s){min_style = s;};
QwtSymbol::Style maxStyle(){return max_style;};
QwtSymbol::Style maxStyle(){return max_style;};
void setMaxStyle(QwtSymbol::Style s){max_style = s;};
void setMeanStyle(QwtSymbol::Style s){mean_style = s;};
......@@ -82,10 +82,9 @@ private:
void draw(QPainter *painter, const QwtScaleMap &xMap,
const QwtScaleMap &yMap, int from, int to) const override;
void drawBox(QPainter *painter, const QwtScaleMap &xMap,
const QwtScaleMap &yMap, double *dat, int size) const;
using DataCurve::drawSymbols; // Unhide base class method (avoids Intel
// compiler warning)
void drawSymbols(QPainter *painter, const QwtScaleMap &xMap,
const QwtScaleMap &yMap, double *dat, int size) const;
using DataCurve::drawSymbols; // Unhide base class method (avoids Intel compiler warning)
void drawSymbols(QPainter *painter, const QwtScaleMap &xMap,
const QwtScaleMap &yMap, double *dat, int size) const;
QwtSymbol::Style min_style, max_style, mean_style, p99_style, p1_style;
......
......@@ -44,10 +44,10 @@ class CanvasPicker: public QObject
public:
explicit CanvasPicker(Graph *plot);
bool eventFilter(QObject *, QEvent *) override;
void selectPoints(int n);
void selectPeak(const QPoint &p);
void selectPoints(int n);
void selectPeak(const QPoint& p);
//! Disable editing of #d_editing_marker on a TAB-key event.
//! Disable editing of #d_editing_marker on a TAB-key event.
/**\brief Called by Graph::focusNextPrevChild ()
*/
void disableEditing();
......
......@@ -58,8 +58,8 @@ public:
ContourLinesEditor(const QLocale& locale = QLocale::system(), int precision = 6, QWidget* parent = 0);
~ContourLinesEditor() override;
//! Use this function to initialize the values.
void setSpectrogram(Spectrogram *sp);
//! Updates levels in the target spectrogram and replots it.
void setSpectrogram(Spectrogram *sp);
//! Updates levels in the target spectrogram and replots it.
void updateContourLevels();
void updateContourPens();
//! Updates cell items when spectrogram contour lines changed.
......
......@@ -41,9 +41,9 @@ public:
bool setDataFromTable(Table *t, const QString &signalColName,
const QString &responseColName, int = 1,
int = -1) override;
//! Returns the size of the signal data set
int signalDataSize() { return d_n_signal; };
//! Returns the size of the response data set
//! Returns the size of the signal data set
int signalDataSize(){return d_n_signal;};
//! Returns the size of the response data set
int responseDataSize(){return d_n_response;};
protected:
......@@ -54,9 +54,9 @@ protected:
private:
void output() override;
//! Size of the signal data set
int d_n_signal;
//! Size of the response data set
//! Size of the signal data set
int d_n_signal;
//! Size of the response data set
int d_n_response;
};
......
......@@ -98,7 +98,7 @@ public:
};
bool fatalError(const QXmlParseException &) override { return false; };
QString errorString() const override { return errorStr; };
QString parentName() { return d_widget_name; };
QString parentName(){return d_widget_name;};
private:
bool metFitTag;
......
......@@ -50,28 +50,26 @@ class DataPickerTool : public QwtPlotPicker, public PlotToolInterface
~DataPickerTool() override;
Mode getMode()const{return d_mode;}
bool eventFilter(QObject *obj, QEvent *event) override;
bool keyEventFilter(QKeyEvent *ke);
QwtPlotCurve *selectedCurve() const { return d_selected_curve; }
bool keyEventFilter(QKeyEvent *ke);
QwtPlotCurve *selectedCurve() const { return d_selected_curve; }
int rtti() const override {
return PlotToolInterface::Rtti_DataPicker;
};
signals:
/** Emitted whenever a new message should be presented to the user.
*
* You don't have to connect to this signal if you alreay specified a reciever
*during initialization.
*/
void statusText(const QString&);
signals:
/** Emitted whenever a new message should be presented to the user.
*
* You don't have to connect to this signal if you alreay specified a reciever during initialization.
*/
void statusText(const QString&);
//! Emitted whenever a new data point has been selected.
void selected(QwtPlotCurve*, int);
protected:
void append(const QPoint &point) override;
void setSelection(QwtPlotCurve *curve, int point_index);
private:
ApplicationWindow *d_app;
void setSelection(QwtPlotCurve *curve, int point_index);
private:
ApplicationWindow *d_app;
QwtPlotMarker d_selection_marker;
Mode d_mode;
QwtPlotCurve *d_selected_curve;
......
......@@ -49,7 +49,7 @@ public:
public slots:
void accept() override;
void setCurveNames(const QStringList &names);
void setCurveNames(const QStringList& names);
void setOperationType(ApplicationWindow::Analysis operation){d_operation = operation;}
void setCurentDataSet(const QString& s);
......
......@@ -46,8 +46,8 @@ class ExponentialFit : public Fit
return par[0] * exp(-par[1] * x) + par[2];
};
private:
void init();
private:
void init();
void customizeFitResults() override;
void calculateFitCurveData(double *X, double *Y) override;
......@@ -69,8 +69,8 @@ class TwoExpFit : public Fit
par[4];
};
private:
void init();
private:
void init();
void customizeFitResults() override;
void calculateFitCurveData(double *X, double *Y) override;
};
......@@ -90,8 +90,8 @@ class ThreeExpFit : public Fit
par[4] * exp(-x * par[5]) + par[6];
};
private:
void init();
private:
void init();
void customizeFitResults() override;
void calculateFitCurveData(double *X, double *Y) override;
};
......
......@@ -81,8 +81,8 @@ private slots:
protected slots:
//! Accept changes
void accept() override;
//! Display help
void help();
//! Display help
void help();
};
#endif // ExportDialog_H
......@@ -47,9 +47,8 @@ class Filter : public QObject
Filter(ApplicationWindow *parent, Graph *g = 0, const QString& name = QString());
~Filter() override;
//! Actually does the job. Should be reimplemented in derived
// classes.
virtual bool run();
//! Actually does the job. Should be reimplemented in derived classes.
virtual bool run();
virtual void setDataCurve(int curve, double start, double end);
bool setDataFromCurve(const QString& curveTitle, Graph *g = 0);
......
......@@ -60,26 +60,24 @@ class Fit : public Filter
Fit(ApplicationWindow *parent, Table *t, const QString& name = QString());
~Fit() override;
//! Actually does the fit. Should be reimplemented in derived
// classes.
virtual void fit();
//! Actually does the fit. Should be reimplemented in derived classes.
virtual void fit();
bool run() override {
fit();
return true;
};
//! Sets the data set to be used for weighting
bool setWeightingData(WeightingMethod w,
const QString &colName = QString::null);
bool setWeightingData(WeightingMethod w, const QString& colName = QString::null);
void setDataCurve(int curve, double start, double end) override;
bool setDataFromTable(Table *t, const QString &xColName,
const QString &yColName, int from = 1,
int to = -1) override;
QString resultFormula() { return d_result_formula; };
QString formula() { return d_formula; };
virtual void setFormula(const QString&){};
QString resultFormula(){return d_result_formula;};
QString formula(){return d_formula;};
virtual void setFormula(const QString&){};
int numParameters(){return d_p;};
QStringList parameterNames(){return d_param_names;};
......@@ -102,9 +100,9 @@ class Fit : public Filter
QString legendInfo() override;
//! Returns a vector with the fit results
double *results() { return d_results; };
double* results(){return d_results;};
//! Returns a vector with the standard deviations of the results
//! Returns a vector with the standard deviations of the results
double* errors();
//! Returns the sum of squares of the residuals from the best-fit line
......
......@@ -59,9 +59,9 @@ public:
return new FunctionCurve(*this);
}
double startRange() { return d_from; };
double endRange() { return d_to; };
void setRange(double from, double to);
double startRange(){return d_from;};
double endRange(){return d_to;};
void setRange(double from, double to);
QStringList formulas(){return d_formulas;};
void setFormulas(const QStringList& lst){d_formulas = lst;};
......
......@@ -80,9 +80,9 @@ protected slots:
public slots:
void accept() override;
void acceptFunction();
void acceptParametric();
void acceptPolar();
void acceptFunction();
void acceptParametric();
void acceptPolar();
void setCurveToModify(Graph *g, int curve);
void insertParamFunctionsList(const QStringList& xList, const QStringList& yList);
void insertPolarFunctionsList(const QStringList& rList, const QStringList& thetaList);
......
......@@ -67,14 +67,8 @@ public:
Graph3D (const QString& label, QWidget* parent, const char* name=0, Qt::WFlags f=0);
~Graph3D() override;
enum PlotType { Scatter = 0, Trajectory = 1, Bars = 2, Ribbon = 3 };
enum PointStyle {
None = 0,
Dots = 1,
VerticalBars = 2,
HairCross = 3,
Cones = 4
};
enum PlotType{Scatter = 0, Trajectory = 1, Bars = 2, Ribbon = 3};
enum PointStyle{None = 0, Dots = 1, VerticalBars = 2, HairCross = 3, Cones = 4};
public slots:
void copy(Graph3D* g);
......@@ -124,9 +118,9 @@ public slots:
//@{
bool eventFilter(QObject *object, QEvent *e) override;
void resizeEvent(QResizeEvent *) override;
void scaleFonts(double factor);
void setIgnoreFonts(bool ok) { ignoreFonts = ok; };
//@}
void scaleFonts(double factor);
void setIgnoreFonts(bool ok){ignoreFonts = ok;};
//@}
//! \name Axes
//@{
......@@ -247,8 +241,7 @@ public slots:
void print() override;
void copyImage();
void exportImage(const QString &fileName, int quality = 100,
bool transparent = false);
void exportImage(const QString& fileName, int quality = 100, bool transparent = false);
void exportPDF(const QString &fileName) override;
void exportVector(const QString& fileName);
void exportToFile(const QString& fileName);
......@@ -257,9 +250,9 @@ public slots:
const int fileVersion) override;
std::string saveToProject(ApplicationWindow *app) override;
void zoomChanged(double);
void rotationChanged(double, double, double);
void scaleChanged(double, double, double);
void zoomChanged(double);
void rotationChanged(double, double, double);
void scaleChanged(double, double, double);
void shiftChanged(double, double, double);
//! \name Colors
......@@ -413,9 +406,9 @@ public:
const QString& zFormula, SurfacePlot& pw);
Triple operator()(double u, double v) override;
unsigned int rows() { return d_rows; };
unsigned int columns() { return d_columns; };
void setMesh (unsigned int columns, unsigned int rows);
unsigned int rows(){return d_rows;};
unsigned int columns(){return d_columns;};
void setMesh (unsigned int columns, unsigned int rows);
bool uPeriodic(){return d_u_periodic;};
bool vPeriodic(){return d_v_periodic;};
......
......@@ -63,12 +63,11 @@ public:
private:
void draw(QPainter *p, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
const QRect &rect) const override;
void drawLines(QPainter *painter, const QRect &rect,
Qt::Orientation orientation, const QwtScaleMap &map,
const QwtValueList &values) const;
void drawLines(QPainter *painter, const QRect &rect, Qt::Orientation orientation, const QwtScaleMap &map,
const QwtValueList &values) const;
QPen d_maj_pen_y;
QPen d_min_pen_y;
QPen d_maj_pen_y;
QPen d_min_pen_y;
int mrkX, mrkY;//x=0 et y=0 line markers keys
};
......
......@@ -47,9 +47,9 @@ public:
protected slots:
void accept() override;
void update();
void adjustHeight(int width);
void adjustWidth(int height);
void update();
void adjustHeight(int width);
void adjustWidth(int height);
signals:
void setGeometry(int, int, int, int);
......
......@@ -93,8 +93,8 @@ public:
protected slots:
void closeEvent(QCloseEvent *) override;
//! Update which options are visible and enabled based on the output format.
void updateAdvancedOptions(const QString &filter);
//! Update which options are visible and enabled based on the output format.
void updateAdvancedOptions (const QString &filter);
};
#endif
......@@ -73,12 +73,10 @@ public:
//! Return bounding rectangle in plot coordinates.
QwtDoubleRect boundingRect() const override;
//! Set position (xValue() and yValue()), right and bottom values giving
// everything in plot coordinates.
void setBoundingRect(double left, double top, double right,
double bottom);
//! Set position (xValue() and yValue()), right and bottom values giving everything in plot coordinates.
void setBoundingRect(double left, double top, double right, double bottom);
double right(){return d_x_right;};
double right(){return d_x_right;};
double bottom(){return d_y_bottom;};
//! Return #d_size.
......@@ -110,9 +108,9 @@ private:
void draw(QPainter *p, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
const QRect &r) const override;
QPoint d_pos; //!< The position in paint coordinates.
QPixmap d_pic; //!< The pixmap to be drawn.
QSize d_size; //!< The size (in paint coordinates) to which #d_pic will be scaled in draw().
QPoint d_pos; //!< The position in paint coordinates.
QPixmap d_pic; //!< The pixmap to be drawn.
QSize d_size; //!< The size (in paint coordinates) to which #d_pic will be scaled in draw().
QString d_file_name; //!< The file from which the image was loaded.
double d_x_right; //!< The right side position in scale coordinates.
double d_y_bottom; //!< The bottom side position in scale coordinates.
......
......@@ -165,8 +165,8 @@ private:
void closeEvent(QCloseEvent *) override;
//! Initialise #d_advanced_options and everything it contains.
void initAdvancedOptions();
void setNewWindowsOnly(bool on);
void initAdvancedOptions();
void setNewWindowsOnly(bool on);
void addColumnSeparators();
void addColumnSeparatorsforLoadAscii();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment