[FIX] fixed the tic button toggling

saif-el · Feb 10, 2021 · 8fa5dcd · 8fa5dcd
1 parent 5408a7c
commit 8fa5dcd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/gui/mzroll/eicwidget.cpp b/src/gui/mzroll/eicwidget.cpp
@@ -1774,6 +1774,11 @@ void EicWidget::print(QPaintDevice* printer) {
 	render(&painter);
 }
 
+void EicWidget::showTicLine(bool f) {
+	_showTicLine = f;
+    optionTicChecked(f);
+}
+
 void EicWidget::contextMenuEvent(QContextMenuEvent * event)
 {
 	event->ignore();
@@ -1843,9 +1848,11 @@ void EicWidget::contextMenuEvent(QContextMenuEvent * event)
 	QAction* o3 = options.addAction("Show TIC");
 	o3->setCheckable(true);
 	o3->setChecked(_showTicLine);
+
 	connect(o3, SIGNAL(toggled(bool)), SLOT(showTicLine(bool)));
 	connect(o3, SIGNAL(toggled(bool)), SLOT(replot()));
 
+
 	//TODO: Sahil, added this action while merging eicwidget
     QAction* o31 = options.addAction("Show BIC");
     o31->setCheckable(true);

diff --git a/src/gui/mzroll/eicwidget.h b/src/gui/mzroll/eicwidget.h
@@ -97,9 +97,7 @@ public Q_SLOTS:
 	void showPeaks(bool f) {
 		_showPeaks = f;
 	}
-	void showTicLine(bool f) {
-		_showTicLine = f;
-	}
+	void showTicLine(bool f);
     void showBicLine(bool f) { //TODO: Sahil Added while mergin eicWidget
 		_showBicLine=f;
 	}
@@ -192,7 +190,8 @@ public Q_SLOTS:
 	void peakMarkedEicWidget();
     void groupSet(shared_ptr<PeakGroup>);
     void compoundSet(Compound*);
-
+	void optionTicChecked(bool);
+
 private:
 	EICLogic* eicParameters;
 	float _focusLineRt;					// 0

diff --git a/src/gui/mzroll/mainwindow.cpp b/src/gui/mzroll/mainwindow.cpp
@@ -4207,15 +4207,13 @@ QWidget* MainWindowWidgetAction::createWidget(QWidget *parent) {
 
 		QToolButton *btnShowTic = new QToolButton(parent);
 		btnShowTic->setCheckable(true);
-		btnShowTic->setChecked(false);
+		btnShowTic->setChecked(false); 
 		btnShowTic->setIcon(QIcon(rsrcPath + "/tic.png"));
 		btnShowTic->setToolTip(tr("Show TICs"));
-		connect(btnShowTic, SIGNAL(toggled(bool)), mw->getEicWidget(),
-				SLOT(showTicLine(bool)));
-		connect(btnShowTic, SIGNAL(toggled(bool)), mw->getEicWidget(), SLOT(replot()));
-
+        connect(btnShowTic, &QToolButton::toggled, mw->getEicWidget(), &EicWidget::showTicLine);
+        connect(btnShowTic, SIGNAL(toggled(bool)), mw->getEicWidget(), SLOT(replot()));
+        connect(mw->getEicWidget(), &EicWidget::optionTicChecked, btnShowTic, &QToolButton::setChecked);
 		return btnShowTic;
-
 	}
 	else if (btnName == "btnShowBarplot") {