keep previous fits

Author: stfbnc

constants.h

@@ -12,7 +12,7 @@
 #define REV_SEG_FAILURE -96
 #define FILE_FAILURE -95
 //app version
-const QString VERSION = "1.2";
+const QString VERSION = "1.3";
 //dcca fluctuation vector
 const std::string defaultDCCA = "abs";
 const std::string corrDCCA = "sign";
@@ -43,6 +43,7 @@ const QString strRHODCCA = "rhoDCCA";
 const QString dataFilter = "*.txt *.dat *.csv";
 //plots colours
 const QVector<QColor> colours = {Qt::red, Qt::blue, Qt::green, Qt::black, Qt::magenta, Qt::cyan};
+const QVector<Qt::PenStyle> lineStyles = {Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine};
 //font dimensions
 const int fontBig = 14;
 const int fontSmall = 12;

plot_window.cpp

@@ -199,11 +199,11 @@ void PlotWindow::onRefitClick()
     refitWin->setWindowModality(Qt::ApplicationModal);
     refitWin->show();
     disableButtons();
-    connect(refitWin, SIGNAL(inputsInserted(int, int)), this, SLOT(newFitPlot(int, int)));
+    connect(refitWin, SIGNAL(inputsInserted(int, int, int, int)), this, SLOT(newFitPlot(int, int, int, int)));
     connect(refitWin, SIGNAL(destroyed()), this, SLOT(enableButtons()));
 }
 
-void PlotWindow::newFitPlot(int start, int end)
+void PlotWindow::newFitPlot(int start, int end, int keep, int clear)
 {
     if(end < start){
         int tmp = end;
@@ -212,8 +212,13 @@ void PlotWindow::newFitPlot(int start, int end)
     }
     double HIntercept = 0.0, H = 0.0;
     refitData(start, end, &H, &HIntercept);
-    for(int i = 1; i < plt->graphCount(); i++)
-        plt->removeGraph(i);
+    if(clear == 1){
+        for(int i = 1; i < plt->graphCount(); i++)
+            plt->removeGraph(i);
+    }
+    if(keep == 0 && plt->graphCount() != 1){
+        plt->removeGraph(plt->graphCount()-1);
+    }
     int len = end - start + 1;
     QVector<double> n(len), Hfit(len);
     for(int i = 0; i < len; i++){
@@ -224,6 +229,7 @@ void PlotWindow::newFitPlot(int start, int end)
     plt->graph(plt->graphCount()-1)->setData(n, Hfit);
     QPen pen;
     pen.setWidth(2);
+    pen.setStyle(lineStyles[(plt->graphCount()-1)%lineStyles.size()]);
     plt->graph(plt->graphCount()-1)->setPen(pen);
     plt->graph(plt->graphCount()-1)->setName("H = "+QString::number(H));
     plt->graph(plt->graphCount()-1)->rescaleAxes(true);

plot_window.h

@@ -34,7 +34,7 @@ private slots:
     void onReplotClick();
     void onSavePlotClick();
     virtual void onSaveTxtClick();
-    void newFitPlot(int start, int end);
+    void newFitPlot(int start, int end, int keep, int clear);
     void enableButtons();
 private:
 	void addButtons();

refit_window.cpp

@@ -25,14 +25,25 @@ RefitWindow::RefitWindow(QWidget *parent) : QWidget(parent)
     maxWin->setGeometry(2*padX+5*xWidth, padY, xWidth, yHeight);
     maxWinTxt = new QLineEdit(this);
     maxWinTxt->setGeometry(4*padX+5*xWidth, padY, xWidth, yHeight);
+    //checkboxes
+    keepFits = new QCheckBox(this);
+    keepFits->setGeometry(padX, padY*2+yHeight, xWidth, yHeight*2/3);
+    connect(keepFits, SIGNAL(clicked()), this, SLOT(onKeepFitsClick()));
+    keepTxt = new QLabel("Keep previous fit", this);
+    keepTxt->setGeometry(padX+xWidth, padY*2+yHeight, xWidth*4, yHeight*2/3);
+    clearFits = new QCheckBox(this);
+    clearFits->setGeometry(padX, padY*3+yHeight*5/3, xWidth, yHeight*2/3);
+    connect(clearFits, SIGNAL(clicked()), this, SLOT(onClearFitsClick()));
+    clearTxt = new QLabel("Clear previous fits", this);
+    clearTxt->setGeometry(padX+xWidth, padY*3+yHeight*5/3, xWidth*4, yHeight*2/3);
 }
 
 RefitWindow::~RefitWindow(){}
 
 void RefitWindow::setDimensions()
 {
     xDim = 240;
-    yDim = 80;
+    yDim = 120;
     xWidth = 30;
     yHeight = 30;
     padX = 10;
@@ -46,7 +57,10 @@ void RefitWindow::onOKClick()
     QRegExp rgx("^[0-9]+$");
     if((!win1.isEmpty() && win1.contains(rgx)) &&
        (!win2.isEmpty() && win2.contains(rgx))){
-        emit inputsInserted(win1.toInt(), win2.toInt());
+        int k, c;
+        keepFits->isChecked() ? k = 1 : k = 0;
+        clearFits->isChecked() ? c = 1 : c = 0;
+        emit inputsInserted(win1.toInt(), win2.toInt(), k, c);
         close();
     }else{
         QMessageBox messageBox;
@@ -55,3 +69,13 @@ void RefitWindow::onOKClick()
         messageBox.setFixedSize(ERROR_BOX_SIZE, ERROR_BOX_SIZE);
     }
 }
+
+void RefitWindow::onKeepFitsClick()
+{
+    clearFits->setChecked(false);
+}
+
+void RefitWindow::onClearFitsClick()
+{
+    keepFits->setChecked(false);
+}

refit_window.h

@@ -11,9 +11,11 @@ Q_OBJECT
     explicit RefitWindow(QWidget *parent=nullptr);
     ~RefitWindow();
 signals:
-    void inputsInserted(int mw, int Mw);
+    void inputsInserted(int mw, int Mw, int keep, int clear);
 private slots:
     void onOKClick();
+    void onKeepFitsClick();
+    void onClearFitsClick();
 private:
     void setDimensions();
 
@@ -23,6 +25,10 @@ private slots:
     QLabel *maxWin;
     QLineEdit *minWinTxt;
     QLineEdit *maxWinTxt;
+    QLabel *keepTxt;
+    QCheckBox *keepFits;
+    QLabel *clearTxt;
+    QCheckBox *clearFits;
 
     int xDim;
     int yDim;