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

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

parent 483c041a
......@@ -43,10 +43,10 @@ public:
QwtDoubleRect boundingRect() const override;
BarStyle orientation() { return bar_style; };
BarStyle orientation(){return bar_style;};
void setGap(int gap);
int gap() const {return bar_gap;};
void setGap (int gap);
int gap() const {return bar_gap;};
void setOffset(int offset);
int offset() const {return bar_offset;};
......@@ -59,7 +59,7 @@ private:
const QwtScaleMap &yMap, int from, int to) const override;
int bar_gap, bar_offset;
BarStyle bar_style;
BarStyle bar_style;
};
#endif
......@@ -42,8 +42,8 @@ public:
QwtDoubleRect boundingRect() const override;
void setBinning(bool autoBin, double size, double begin, double end);
bool autoBinning() { return d_autoBin; };
double begin(){return d_begin;};
bool autoBinning(){return d_autoBin;};
double begin(){return d_begin;};
double end(){return d_end;};
double binSize(){return d_bin_size;};
......@@ -60,13 +60,12 @@ public:
private:
void draw(QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
int from, int to) const override;
// Implement overloaded virtual method to just pass up to the base class to
// avoid
// an Intel compiler warning
// Implement overloaded virtual method to just pass up to the base class to avoid
// an Intel compiler warning
void draw(QPainter *p, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
const QRect &rect) const override {
DataCurve::draw(p, xMap, yMap, rect);
}
DataCurve::draw(p,xMap,yMap,rect);
}
void loadDataFromMatrix();
Matrix *d_matrix;
......
......@@ -55,20 +55,14 @@ class RangeSelectorTool : public QwtPlotPicker, public PlotToolInterface
public:
RangeSelectorTool(Graph *graph, const QObject *status_target=NULL, const char *status_slot="");
~RangeSelectorTool() override;
double minXValue() const {
return QMIN(d_active_marker.xValue(),
d_inactive_marker.xValue());
}
double maxXValue() const {
return QMAX(d_active_marker.xValue(),
d_inactive_marker.xValue());
}
int dataSize() const { return qAbs(d_active_point - d_inactive_point); }
double minXValue() const { return QMIN(d_active_marker.xValue(), d_inactive_marker.xValue()); }
double maxXValue() const { return QMAX(d_active_marker.xValue(), d_inactive_marker.xValue()); }
int dataSize() const { return qAbs(d_active_point - d_inactive_point); }
bool eventFilter(QObject *obj, QEvent *event) override;
bool keyEventFilter(QKeyEvent *ke);
QwtPlotCurve *selectedCurve() const { return d_selected_curve; }
//! Caller is responsible for replot.
QwtPlotCurve *selectedCurve() const { return d_selected_curve; }
//! Caller is responsible for replot.
void setSelectedCurve(QwtPlotCurve *curve);
void copySelection();
......@@ -78,27 +72,26 @@ class RangeSelectorTool : public QwtPlotPicker, public PlotToolInterface
int rtti() const override {
return PlotToolInterface::Rtti_RangeSelector;
};
bool isVisible() { return d_visible; };
bool isVisible(){return d_visible;};
public slots:
virtual void pointSelected(const QPoint &point);
public slots:
virtual void pointSelected(const QPoint &point);
void setCurveRange();
void setEnabled(bool on = true) override;
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 the selected curve and/or range have changed.
void changed();
protected:
void append(const QPoint &point) override { pointSelected(point); }
void emitStatusText();
void switchActiveMarker();
//! Caller is responsible for replot.
void emitStatusText();
void switchActiveMarker();
//! Caller is responsible for replot.
void setActivePoint(int index);
private:
QwtPlotMarker d_active_marker, d_inactive_marker;
......
......@@ -59,10 +59,10 @@ public:
double transformValue(double value) const;
QwtText label(double value) const override;
int labelNumericPrecision() { return d_prec; };
void setNumericPrecision(int prec) { d_prec = prec; };
int labelNumericPrecision(){return d_prec;};
void setNumericPrecision(int prec){d_prec = prec;};
int majorTicksStyle()const{return d_majTicks;};
int majorTicksStyle()const{return d_majTicks;};
void setMajorTicksStyle(TicksStyle type){d_majTicks = type;};
int minorTicksStyle()const{return d_minTicks;};
......@@ -97,7 +97,7 @@ protected:
void drawLabel(QPainter *painter, double value) const override;
void drawTick(QPainter *p, double value, int len) const override;
void drawBackbone(QPainter *painter) const override;
void drawBreak(QPainter *) const;
void drawBreak(QPainter *) const;
private:
//! Pointer to the parent plot
......
......@@ -100,9 +100,9 @@ signals:
private:
bool eventFilter(QObject *, QEvent *) override;
void mouseDblClicked(const QwtScaleWidget *, const QPoint &);
void mouseClicked(const QwtScaleWidget *scale, const QPoint &pos);
void mouseRightClicked(const QwtScaleWidget *scale, const QPoint &pos);
void mouseDblClicked(const QwtScaleWidget *, const QPoint &);
void mouseClicked(const QwtScaleWidget *scale, const QPoint &pos) ;
void mouseRightClicked(const QwtScaleWidget *scale, const QPoint &pos);
bool d_title_selected;
bool d_labels_selected;
......
......@@ -52,19 +52,18 @@ class ScreenPickerTool : public QwtPlotPicker, public PlotToolInterface
ScreenPickerTool(Graph *graph, const QObject *status_target=NULL, const char *status_slot="");
~ScreenPickerTool() override;
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&);
protected:
bool eventFilter(QObject *obj, QEvent *event) override;
void append(const QPoint &point) override;
QwtText trackerText(const QPoint &) const override;
QwtText trackerText(const QwtDoublePoint &) const override;
QwtPlotMarker d_selection_marker;
QwtPlotMarker d_selection_marker;
};
/**Plot tool for drawing arbitrary points.
......@@ -78,9 +77,9 @@ class DrawPointTool : public ScreenPickerTool
protected:
bool eventFilter(QObject *obj, QEvent *event) override;
void appendPoint(const QwtDoublePoint &point);
DataCurve *d_curve;
Table *d_table;
void appendPoint(const QwtDoublePoint &point);
DataCurve *d_curve;
Table *d_table;
ApplicationWindow *d_app;
};
......
......@@ -101,12 +101,12 @@ class SelectionMoveResizer : public QWidget
explicit SelectionMoveResizer(QWidget *target);
//! Clean up after myself.
~SelectionMoveResizer() override;
/**\brief React on geometry changes of parent and targets.
*/
/**\brief React on geometry changes of parent and targets.
*/
bool eventFilter(QObject *o, QEvent *e) override;
//! Returns true if w is one of targets, false else.
bool contains(QWidget *w) const { return d_widgets.contains(w); };
//! Returns true if m is one of targets, false else.
//! Returns true if w is one of targets, false else.
bool contains(QWidget *w) const { return d_widgets.contains(w); };
//! Returns true if m is one of targets, false else.
bool contains(LegendWidget *m) const { return d_legend_markers.contains(m); };
//! Returns true if m is one of targets, false else.
bool contains(ArrowMarker *m) const { return d_line_markers.contains(m); };
......@@ -148,38 +148,33 @@ class SelectionMoveResizer : public QWidget
*/
void paintEvent(QPaintEvent *e) override;
/**\brief Mouse button presses start move/resize operations.
*
* Clicks outside of #d_bounding_rect or with anything else than
*the left button
* are propagated to the parent as usual.
*/
*
* Clicks outside of #d_bounding_rect or with anything else than the left button
* are propagated to the parent as usual.
*/
void mousePressEvent(QMouseEvent *e) override;
/**\brief Mouse movements need to be monitored for updating the
*frame during operation.
*
* When no operation is in progress, the mouse cursor is updated
*based on its position
* before the event is passed on to the parent.
*/
/**\brief Mouse movements need to be monitored for updating the frame during operation.
*
* When no operation is in progress, the mouse cursor is updated based on its position
* before the event is passed on to the parent.
*/
void mouseMoveEvent(QMouseEvent *e) override;
/**\brief Mouse releases end the current operation and apply it
*to the targets.
*
* When there is no operation in progress, the event is passed
*on to the parent.
*/
/**\brief Mouse releases end the current operation and apply it to the targets.
*
* When there is no operation in progress, the event is passed on to the parent.
*/
void mouseReleaseEvent(QMouseEvent *e) override;
/**\brief Allow keyboard-based moving of the selection.
*
* Unused keys are passed on to the parent.
*/
*
* Unused keys are passed on to the parent.
*/
void keyPressEvent(QKeyEvent *e) override;
//! Ignore double-clicks so that they can be used by my parent.
void mouseDoubleClickEvent(QMouseEvent *e) override;
private:
//! Size of resize handle in pixels.
static const int handler_size = 10;
private:
//! Size of resize handle in pixels.
static const int handler_size = 10;
//! Return one of the rectangles to be filled for starting resize operations.
static const QRect handlerRect(QRect rect, Operation op);
//! Apply operation specified by #d_op and #d_op_dp to in.
......
......@@ -49,8 +49,8 @@ class SigmoidalFit : public Fit
void guessInitialValues() override;
void setLogistic(bool on = true);
private:
void init();
private:
void init();
void calculateFitCurveData(double *X, double *Y) override;
bool d_logistic;
......
......@@ -49,8 +49,8 @@ public:
public slots:
void accept() override;
void setFunction(Graph3D *);
void setParametricSurface(Graph3D *);
void setFunction(Graph3D *);
void setParametricSurface(Graph3D *);
private slots:
void clearList();
......
......@@ -134,18 +134,18 @@ public slots:
bool isEmptyColumn(int col);
void print() override;
void print(const QString &fileName);
void print(const QString& fileName);
void exportPDF(const QString &fileName) override;
//! \name Event Handlers
//@{
//@{
bool eventFilter(QObject *object, QEvent *e) override;
void customEvent(QEvent *e) override;
//@}v
//! \name Column Operations
//@{
void removeCol();
//! \name Column Operations
//@{
void removeCol();
void removeCol(const QStringList& list);
void insertCol();
void insertCols(int start, int count);
......@@ -318,7 +318,7 @@ public slots:
std::string saveToProject(ApplicationWindow *app) override;
std::string saveTableMetadata();
void restore(QString &spec);
void restore(QString& spec);
//! This changes the general background color (color of the table widget, not the cells)
void setBackgroundColor(const QColor& col);
......@@ -341,11 +341,10 @@ public slots:
const int fileVersion) override;
void restore(const QStringList &lst) override;
//! This slot notifies the main application that the table has been
// modified. Triggers the update of 2D plots.
void notifyChanges();
//! This slot notifies the main application that the table has been modified. Triggers the update of 2D plots.
void notifyChanges();
//! Notifies the main application that the width of a table column has been modified by the user.
//! Notifies the main application that the width of a table column has been modified by the user.
void colWidthModified(int, int, int);
//! is this table editable
......
......@@ -57,8 +57,8 @@ private slots:
void setPlotDesignation(int i);
void accept() override;
void apply();
void updateDisplay(int item);
void enablePrecision(int f);
void updateDisplay(int item);
void enablePrecision(int f);
void setNumericFormat(int type, int prec, bool allRightColumns);
void setDayFormat(const QString& format, bool allRightColumns);
void setMonthFormat(const QString& format, bool allRightColumns);
......
......@@ -90,8 +90,8 @@ private slots:
//! Accept changes and close dialog
void accept() override;
//! Apply changes
void apply();
void setDefaultValues();
void apply();
void setDefaultValues();
void updateTransparency(int alpha);
......
......@@ -50,8 +50,8 @@ public slots:
private:
void closeEvent(QCloseEvent *e) override;
QString d_initial_text;
QWidget *d_target;
QString d_initial_text;
QWidget *d_target;
};
#endif
......@@ -48,6 +48,6 @@ signals:
private:
bool eventFilter(QObject *, QEvent *) override;
QwtTextLabel *title;
bool d_selected;
QwtTextLabel *title;
bool d_selected;
};
......@@ -58,13 +58,12 @@ class TranslateCurveTool : public QObject, public PlotToolInterface
int rtti() const override {
return PlotToolInterface::Rtti_TranslateCurveTool;
};
signals:
/**\brief 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:
/**\brief 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&);
public slots:
//! Select curve to translate, using the specified point as base point.
void selectCurvePoint(QwtPlotCurve *curve, int point_index);
......
......@@ -44,22 +44,21 @@ public:
const QString& endCol1, const QString& endCol2, int startRow, int endRow);
~VectorCurve() override;
enum Position { Tail, Middle, Head };
enum Position{Tail, Middle, Head};
void copy(const VectorCurve *vc);
void copy(const VectorCurve *vc);
QwtDoubleRect boundingRect() const override;
using DataCurve::draw; // Unhide base class method (avoids Intel
// compiler warning)
using DataCurve::draw; // Unhide base class method (avoids Intel compiler warning)
void draw(QPainter *painter, const QwtScaleMap &xMap,
const QwtScaleMap &yMap, int from, int to) const override;
void drawVector(QPainter *painter, const QwtScaleMap &xMap,
const QwtScaleMap &yMap, int from, int to) const;
const QwtScaleMap &yMap, int from, int to) const;
void drawArrowHead(QPainter *p, int xs, int ys, int xe, int ye) const;
double theta(int x0, int y0, int x1, int y1) const;
void drawArrowHead(QPainter *p, int xs, int ys, int xe, int ye) const;
double theta(int x0, int y0, int x1, int y1) const;
QString vectorEndXAColName(){return d_end_x_a;};
QString vectorEndYMColName(){return d_end_y_m;};
......
......@@ -65,11 +65,10 @@ protected:
private:
/// Private copy constructor - NO COPY ALLOWED
AbstractAlgorithmInputHistory(const AbstractAlgorithmInputHistory &) = delete;
AbstractAlgorithmInputHistory(const AbstractAlgorithmInputHistory&);
/// Private assignment operator - NO ASSIGNMENT ALLOWED
AbstractAlgorithmInputHistory &
operator=(const AbstractAlgorithmInputHistory &) = delete;
AbstractAlgorithmInputHistory& operator = (const AbstractAlgorithmInputHistory&);
/// Load any values that are available from persistent storage
void load();
......
......@@ -65,10 +65,9 @@ private:
{
}
/// Private copy constructor - NO COPY ALLOWED
AlgorithmDialogFactoryImpl(const AlgorithmDialogFactoryImpl &) = delete;
AlgorithmDialogFactoryImpl(const AlgorithmDialogFactoryImpl&);
/// Private assignment operator - NO ASSIGNMENT ALLOWED
AlgorithmDialogFactoryImpl &
operator=(const AlgorithmDialogFactoryImpl &) = delete;
AlgorithmDialogFactoryImpl& operator = (const AlgorithmDialogFactoryImpl&);
///Private Destructor
~AlgorithmDialogFactoryImpl() override {}
};
......@@ -144,10 +143,9 @@ private:
/// Private Constructor for singleton class
UserSubWindowFactoryImpl();
/// Private copy constructor - NO COPY ALLOWED
UserSubWindowFactoryImpl(const UserSubWindowFactoryImpl &) = delete;
UserSubWindowFactoryImpl(const UserSubWindowFactoryImpl&);
/// Private assignment operator - NO ASSIGNMENT ALLOWED
UserSubWindowFactoryImpl &
operator=(const UserSubWindowFactoryImpl &) = delete;
UserSubWindowFactoryImpl& operator = (const UserSubWindowFactoryImpl&);
///Private Destructor
~UserSubWindowFactoryImpl() override {}
/// Try to create a sub window from the list of aliases for an interface
......
......@@ -48,10 +48,10 @@ namespace MantidQt
IndirectSimulationTab(QWidget * parent = 0);
~IndirectSimulationTab() override;
virtual void
loadSettings(const QSettings &settings) = 0;
};
} // namespace CustomInterfaces
virtual void loadSettings(const QSettings& settings) = 0;
};
} // namespace CustomInterfaces
} // namespace Mantid
#endif
......@@ -52,8 +52,8 @@ namespace MantidQt
explicit BinDialog(QWidget *parent = 0);
~BinDialog() override;
void setIntegralMinMax(double, double, bool);
signals:
/// This signal is sent when changing the bin range selected.
signals:
/// This signal is sent when changing the bin range selected.
/// Parameters are: min, max, and a bool set to true to mean "everything"
void IntegralMinMax(double, double, bool);
......
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