m2k: fix oscilloscope and sig gen x axis labels

Signed-off-by: Andrei Popa <andrei.popa@analog.com>

Author: andrei47w

plugins/m2k/src/old/oscilloscope.cpp

@@ -1816,10 +1816,14 @@ void Oscilloscope::enableLabels(bool enable)
 		if(!allDisabled) {
 			plot.setActiveVertAxis(current_channel);
 			plot.enableAxisLabels(enable);
+			plot.enableXaxisLabels();
+			plot.setAxisVisible(QwtAxis::XBottom, !enable);
 		}
 	}
 	if(!enable)
 		plot.enableAxisLabels(enable);
+
+	plot.bottomHandlesArea()->setVisible(enable);
 }
 
 void Oscilloscope::setTrigger_input(bool value) { trigger_input = value; }

plugins/m2k/src/old/patterngenerator/pattern_generator.cpp

@@ -141,7 +141,7 @@ PatternGenerator::PatternGenerator(libm2k::context::M2k *m2k, Filter *filt, Tool
 	m_plot.addZoomer(0);
 	m_plot.addMagnifier(0);
 	m_plot.getMagnifier()->setYAxisEn(false);
-	m_plot.getMagnifier()->setXAxis(true);
+	m_plot.getMagnifier()->setXAxisEn(true);
 	m_plot.setZoomerParams(true, 20);
 	m_plot.zoomBaseUpdate();
 	m_plot.getMagnifier()->setBaseRect(m_plot.getZoomer()->zoomBase());

plugins/m2k/src/old/signal_generator.cpp

@@ -515,19 +515,28 @@ SignalGenerator::SignalGenerator(libm2k::context::M2k *m2k, QString uri, Filter
 	m_plot->setOffsetHandleVisible(0, false);
 	m_plot->setOffsetHandleVisible(1, false);
 	m_plot->setAxisVisible(QwtAxis::YLeft, false);
+	m_plot->setAxisVisible(QwtAxis::XBottom, false);
 	m_plot->setActiveVertAxis(0);
 
+	m_plot->enableXaxisLabels();
 	m_plot->enableTimeTrigger(false);
 
+	QWidget *bottomAxis = new QWidget();
+	bottomAxis->setLayout(new QHBoxLayout());
+	bottomAxis->layout()->addItem(new QSpacerItem(50, 0));
+	bottomAxis->layout()->addWidget(m_plot->bottomHandlesArea());
+
 	// plot widget
 	QWidget *centralWidget = new QWidget();
 	QGridLayout *gridLayout = new QGridLayout();
+
 	gridLayout->setVerticalSpacing(0);
 	gridLayout->setHorizontalSpacing(0);
-	gridLayout->setContentsMargins(0, 0, 0, 5);
+	gridLayout->setContentsMargins(0, 0, 50, 5);
 
 	gridLayout->addWidget(m_plot->topArea(), 0, 0);
 	gridLayout->addWidget(m_plot->topHandlesArea(), 1, 0);
+	gridLayout->addWidget(bottomAxis, 3, 0);
 	gridLayout->addWidget(m_plot, 2, 0);
 
 	centralWidget->setLayout(gridLayout);