Commit 7d5e2ade authored by Langella Olivier's avatar Langella Olivier
Browse files

bunch of warnings fixed

parent 479c0d99
......@@ -17,12 +17,12 @@
DetectionZivyWidget::DetectionZivyWidget(TreatmentBoxXicDetect *treatmentBox,
QWidget *parent)
: MasschroQWidget(parent),
_p_treatmentBox(treatmentBox),
_smoothing_filter_half_window(1),
_minmax_filter_half_window(3),
_maxmin_filter_half_window(2),
_threshold_on_max(2000),
_threshold_on_min(1000)
_threshold_on_min(1000),
_p_treatmentBox(treatmentBox)
{
// initialize detection
initializeDetectionMethod();
......
......@@ -82,10 +82,4 @@ class DetectionZivyWidget : public MasschroQWidget
TreatmentBoxXicDetect *_p_treatmentBox;
void initializeDetectionMethod();
const int getSmoothingHalfWindow() const;
const int getMinMaxHalfWindow() const;
const int getMaxMinHalfWindow() const;
const double getThresholdOnMax() const;
const double getThresholdOnMin() const;
};
......@@ -11,9 +11,7 @@
FilterSpikeWidget::FilterSpikeWidget(TreatmentBoxXicFilter *treatmentBox,
QWidget *parent)
: MasschroQWidget(parent),
_p_treatmentBox(treatmentBox),
_half_window(5)
: MasschroQWidget(parent), _p_treatmentBox(treatmentBox), _half_window(5)
{
// initialize filter
_filter_spike = std::make_shared<pappso::FilterMorphoAntiSpike>(_half_window);
......@@ -81,7 +79,7 @@ FilterSpikeWidget::setHalfWindow(int i)
this->filterXic();
}
const int
int
FilterSpikeWidget::getHalfWindow() const
{
return _half_window;
......
......@@ -72,5 +72,5 @@ class FilterSpikeWidget : public MasschroQWidget
QDialogButtonBox *_button_box;
QGroupBox *_half_window_group;
const int getHalfWindow() const;
int getHalfWindow() const;
};
......@@ -66,9 +66,9 @@ class XicSelectionWidget : public MasschroQWidget
pappso::XicExtractMethod getXicExtractMethod() const;
const mcq_double getMzToExtract() const;
mcq_double getMzToExtract() const;
const mcq_double getRtToExtract() const;
mcq_double getRtToExtract() const;
void writeElement(MasschroqDomDocument *domDocument) const;
......
......@@ -15,7 +15,12 @@ McqThread::McqThread(QObject *parent, const unsigned int maxProgress)
McqThread::~McqThread()
{
}
void
McqThread::canceled()
{
qDebug() << "Stop Thread";
_abort = true;
}
void
McqThread::setMaxProgress(const unsigned int value)
{
......@@ -24,7 +29,7 @@ McqThread::setMaxProgress(const unsigned int value)
_progressMutex.unlock();
}
const unsigned int
unsigned int
McqThread::getProgressValue()
{
_progressMutex.lock();
......@@ -49,7 +54,7 @@ McqThread::setProgressValue(const unsigned int val)
_progressMutex.unlock();
}
const unsigned int
unsigned int
McqThread::getMaxProgress()
{
_progressMutex.lock();
......@@ -58,7 +63,7 @@ McqThread::getMaxProgress()
return ret;
}
const bool
bool
McqThread::getAbord()
{
_progressMutex.lock();
......@@ -67,7 +72,7 @@ McqThread::getAbord()
return abort;
}
const bool
bool
McqThread::getRestart()
{
_progressMutex.lock();
......
......@@ -39,27 +39,22 @@ class McqThread : public QThread
McqThread(QObject *parent = 0, const unsigned int maxProgress = 0);
~McqThread();
const unsigned int getProgressValue();
unsigned int getProgressValue();
void setMaxProgress(const unsigned int value);
const unsigned int getMaxProgress();
unsigned int getMaxProgress();
public slots:
void
canceled()
{
qDebug() << "Stop Thread";
_abort = true;
}
void canceled();
protected:
virtual void run() = 0;
void setProgressValue(const unsigned int val);
void incrementProgressValue();
const bool getAbord();
const bool getRestart();
bool getAbord();
bool getRestart();
bool _abort;
bool _restart;
......
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