Enhancements

src/logicanalyzer/logic_analyzer.h

@@ -206,6 +206,7 @@ private Q_SLOTS:
 	int m_oscChannelSelected;
 	QVector<GenericLogicPlotCurve *> m_oscPlotCurves;
 	QWidget *m_oscDecoderMenu;
+	QMetaObject::Connection m_oscChannelSelectedConnection;
 
 
 };

src/logicanalyzer/logicanalyzer_api.h

@@ -32,9 +32,9 @@ class LogicAnalyzer_API : public ApiObject
 	Q_OBJECT
 
 	/* sweep settings */
+	Q_PROPERTY(bool streamOneShot READ getStreamOrOneShot WRITE setStreamOrOneShot)
 	Q_PROPERTY(double sampleRate READ getSampleRate WRITE setSampleRate)
 	Q_PROPERTY(int bufferSize READ getBufferSize WRITE setBufferSize)
-	Q_PROPERTY(bool streamOneShot READ getStreamOrOneShot WRITE setStreamOrOneShot)
 	Q_PROPERTY(int delay READ getDelay WRITE setDelay)
 
 	/* channel settings */

src/logicanalyzer/logicdatacurve.cpp

@@ -38,7 +38,7 @@ static const QColor LowColor(0xC0, 0x00, 0x00);
 static const QColor SamplingPointColor(0x77, 0x77, 0x77);
 
 LogicDataCurve::LogicDataCurve(uint16_t *data, uint8_t bit, adiscope::logic::LogicTool *logic) :
-    GenericLogicPlotCurve(QString("Dio " + QString::number(bit)), QString("Dio " + QString::number(bit))),
+    GenericLogicPlotCurve(QString(QString::number(bit)), QString(QString::number(bit))),
     m_logic(logic),
     m_startSample(0),
     m_endSample(0),
@@ -170,7 +170,9 @@ void LogicDataCurve::drawLines(QPainter *painter, const QwtScaleMap &xMap,
 	displayedData += QPointF(fromSampleToTime(m_endSample - 1), (!edges.back().second) * heightInPoints + m_pixelOffset);
     }
 
-    displayedData += QPointF(plot()->axisInterval(QwtAxis::xBottom).maxValue(), displayedData.back().y());
+    if (edges.back().first + 1 == m_endSample - 1) {
+	    displayedData += QPointF(plot()->axisInterval(QwtAxis::xBottom).maxValue(), displayedData.back().y());
+    }
 
     painter->save();
     painter->setPen(QColor(74, 100, 255)); //4a64ff
@@ -230,26 +232,14 @@ void LogicDataCurve::getSubsampledEdges(std::vector<std::pair<uint64_t, bool>> &
     double dist = xMap.transform(fromSampleToTime(1)) - xMap.transform(fromSampleToTime(0));
 
     QwtInterval interval = plot()->axisInterval(QwtAxis::xBottom);
-//    qDebug() << "from plot, left: " << interval.minValue() << " right: " << interval.maxValue();
     uint64_t firstEdge = edgeAtX(fromTimeToSample(interval.minValue()), m_edges);
     uint64_t lastEdge = edgeAtX(fromTimeToSample(interval.maxValue()), m_edges);
 
-//    qDebug() << "First edge is: " << firstEdge;
-//    qDebug() << "Last edge is: " << lastEdge;
-
-//    qDebug() << "first edge: " << firstEdge;
-//    qDebug() << "last edge: " << lastEdge;
-
-    if (m_edges.size() == 0) {
-//	    qDebug() << "first edge: " << firstEdge << " last edge: " << lastEdge;
-    }
-
     if (firstEdge > 0) {
         firstEdge--;
     }
 
     if (lastEdge < m_edges.size() - 1) {
-//	    qDebug() << "lastEdge: " << lastEdge << " < " << "m_edges.size() - 1: " << m_edges.size() - 1;
         lastEdge++;
     }
 
@@ -304,12 +294,10 @@ void LogicDataCurve::getSubsampledEdges(std::vector<std::pair<uint64_t, bool>> &
             // between the blocks and we want to make sure we display the correct logic level
             if (std::abs(a1 - a2) > pointsPerPixel) {
                 edges.emplace_back(m_edges[std::distance(m_edges.begin(), previous)]);
-//                qDebug() << "gap emplace!!!!!!!";
             } else {
                 const int64_t currentSample = (*next).first;
                 if ((*next).second == lastTransition) {
                     edges.emplace_back((lastSample + currentSample) / 2, !lastTransition);
-//                    qDebug() << "HACK!!!!!!";
                 }
             }
 

src/oscilloscope.cpp

@@ -1285,7 +1285,7 @@ void Oscilloscope::setFilteringEnabled(bool set)
 	setSampleRate(active_sample_rate);
 }
 
-void Oscilloscope::enableMixedSignalView()
+void Oscilloscope::enableMixedSignalView(ChannelWidget *cw)
 {
 	const bool iioStarted = isIioManagerStarted();
 	if (iioStarted) {
@@ -1299,6 +1299,13 @@ void Oscilloscope::enableMixedSignalView()
 
 	ui->logicSettingsLayout->addWidget(m_mixedSignalViewMenu[0]);
 
+	QTabWidget *tb = qobject_cast<QTabWidget *>(m_mixedSignalViewMenu[0]);
+	showLogicAnalyzerTriggerConnection = connect(&trigger_settings, &TriggerSettings::showLogicAnalyzerTriggerSettings,
+						     this, [=](){
+		cw->menuButton()->setChecked(true);
+		tb->setCurrentIndex(tb->indexOf(m_mixedSignalViewMenu[1]));
+	});
+
 	mixed_sink = mixed_signal_sink::make(m_logicAnalyzer, &this->plot, active_sample_count);
 
 	mixed_source = gr::m2k::mixed_signal_source::make_from(m_m2k_context, active_sample_count);
@@ -1339,6 +1346,8 @@ void Oscilloscope::disableMixedSignalView()
 
 	m_mixedSignalViewEnabled = false;
 
+	disconnect(showLogicAnalyzerTriggerConnection);
+
 	// disable mixed signal from logic
 	ui->logicSettingsLayout->removeWidget(m_mixedSignalViewMenu[0]);
 	m_logicAnalyzer->disableMixedSignalView();
@@ -2076,6 +2085,22 @@ void Oscilloscope::create_add_channel_panel()
 
 	tabWidget->addTab(logic, tr("Logic"));
 
+	connect(ui->mixedSignalBtn, &QPushButton::clicked, [=](){
+		if (!m_mixedSignalViewEnabled) {
+			ui->btnAddMath->click();
+			tabWidget->setCurrentIndex(tabWidget->indexOf(logic));
+		} else {
+			for (int i = 0; i < ui->channelsList->count(); ++i) {
+				ChannelWidget *cw = qobject_cast<ChannelWidget *>(
+							ui->channelsList->itemAt(i)->widget());
+				if (cw && cw->fullName() == "Logic Analyzer") {
+					cw->deleteButton()->click();
+					break;
+				}
+			}
+		}
+	});
+
 	connect(btnOpenFile, &QPushButton::clicked, this, &Oscilloscope::import);
 
 	connect(tabWidget, &QTabWidget::currentChanged, [=](int index) {
@@ -2105,6 +2130,7 @@ void Oscilloscope::create_add_channel_panel()
 		if (tabWidget->currentIndex() == 2) {
 
 			qDebug() << "Enable mixed signal view!";
+			ui->mixedSignalBtn->setText("Disable Mixed\nSignal View");
 
 			ChannelWidget *logicAnalyzerChannelWidget = new ChannelWidget(-1, true, false,
 										      QColor(Qt::yellow), this);
@@ -2144,13 +2170,14 @@ void Oscilloscope::create_add_channel_panel()
 				logicAnalyzerChannelWidget->deleteLater();
 
 				tabWidget->setTabEnabled(logicTab, true);
+				ui->mixedSignalBtn->setText("Enable Mixed\nSignal View");
 
 				disableMixedSignalView();
 			});
 
 			logicAnalyzerChannelWidget->menuButton()->setChecked(true);
 
-			enableMixedSignalView();
+			enableMixedSignalView(logicAnalyzerChannelWidget);
 
 			return;
 		}

src/oscilloscope.hpp

@@ -243,7 +243,7 @@ namespace adiscope {
 		void toolDetached(bool);
 		void setFilteringEnabled(bool set);
 
-		void enableMixedSignalView();
+		void enableMixedSignalView(ChannelWidget *cw);
 		void disableMixedSignalView();
 		void setDigitalPlotCurvesParams();
 
@@ -490,6 +490,7 @@ namespace adiscope {
 
 		gr::m2k::mixed_signal_source::sptr mixed_source;
 		mixed_signal_sink::sptr mixed_sink;
+		QMetaObject::Connection showLogicAnalyzerTriggerConnection;
 	};
 }
 #endif /* M2K_OSCILLOSCOPE_H */

src/oscilloscope_plot.cpp

@@ -83,7 +83,8 @@ CapturePlot::CapturePlot(QWidget *parent,
 	d_startedGrouping(false),
 	d_bottomHandlesArea(nullptr),
 	d_xAxisInterval{0.0, 0.0},
-	d_currentHandleInitPx(1)
+	d_currentHandleInitPx(1),
+	d_maxBufferError(nullptr)
 {
 	setMinimumHeight(250);
 	setMinimumWidth(500);
@@ -160,6 +161,11 @@ CapturePlot::CapturePlot(QWidget *parent,
 		"color: #ffffff;"
 		"}");
 
+	d_maxBufferError = new QLabel(this);
+	d_maxBufferError->setStyleSheet("QLabel {"
+		"color: #ff0000;"
+		"}");
+
 	// Top area layout
 	QHBoxLayout *topWidgetLayout = new QHBoxLayout(d_topWidget);
 	topWidgetLayout->setContentsMargins(d_leftHandlesArea->minimumWidth(),
@@ -171,7 +177,9 @@ CapturePlot::CapturePlot(QWidget *parent,
 		Qt::AlignBottom);
 	topWidgetLayout->insertWidget(1, d_sampleRateLabel, 0, Qt::AlignLeft |
 		Qt::AlignBottom);
-	topWidgetLayout->insertWidget(2, d_triggerStateLabel, 0, Qt::AlignRight |
+	topWidgetLayout->insertWidget(2, d_maxBufferError, 0, Qt::AlignRight |
+		Qt::AlignBottom);
+	topWidgetLayout->insertWidget(3, d_triggerStateLabel, 0, Qt::AlignRight |
 		Qt::AlignBottom);
 
 	QSpacerItem *spacerItem = new QSpacerItem(0, 0, QSizePolicy::Expanding,
@@ -1501,7 +1509,6 @@ void CapturePlot::addToGroup(int currentGroup, int toAdd)
 
 void CapturePlot::onDigitalChannelAdded(int chnIdx)
 {
-	qDebug() << "Digital Channel Added!";
 	setLeftVertAxesCount(d_ydata.size() + d_ref_ydata.size() + chnIdx + 1);
 	setAxisScale( QwtAxisId(QwtPlot::yLeft, d_ydata.size() + d_ref_ydata.size() + chnIdx), -5, 5);
 	replot();
@@ -2374,6 +2381,11 @@ void CapturePlot::setTriggerState(int triggerState)
 	d_triggerStateLabel->show();
 }
 
+void CapturePlot::setMaxBufferSizeErrorLabel(bool reached)
+{
+	d_maxBufferError->setText(reached ? "Maximum buffer size reached" : "");
+}
+
 void CapturePlot::setCursorReadoutsTransparency(int value)
 {
 	d_cursorReadouts->setTransparency(value);
@@ -2387,8 +2399,8 @@ void CapturePlot::moveCursorReadouts(CustomPlotPositionButton::ReadoutsPosition
 void CapturePlot::updateBufferSizeSampleRateLabel(int nsamples, double sr)
 {
 	QString txtSampleRate = d_cursorMetricFormatter.format(sr, "sps", 0);
-	QString txtSamplingPeriod = d_cursorTimeFormatter.format(1 / sr, "", 0);
-	QString text = QString("%1 Samples at ").arg(nsamples) + txtSampleRate;
+	QString txtSamples = d_cursorMetricFormatter.format(nsamples, "", 0);
+	QString text = QString("%1 Samples at ").arg(txtSamples) + txtSampleRate;
 	d_sampleRateLabel->setText(text);
 }
 

src/oscilloscope_plot.hpp

@@ -168,6 +168,7 @@ namespace adiscope {
 		void setBufferSizeLabelValue(int numSamples);
 		void setSampleRatelabelValue(double sampleRate);
 		void setTriggerState(int triggerState);
+		void setMaxBufferSizeErrorLabel(bool reached);
 		void setCursorReadoutsTransparency(int value);
 		void moveCursorReadouts(CustomPlotPositionButton::ReadoutsPosition position);
 		void setHorizCursorsLocked(bool value);
@@ -249,6 +250,7 @@ namespace adiscope {
 		QLabel *d_timeBaseLabel;
 		QLabel *d_sampleRateLabel;
 		QLabel *d_triggerStateLabel;
+		QLabel *d_maxBufferError;
 
 		int d_bufferSizeLabelVal;
 		double d_sampleRateLabelVal;

src/patterngenerator/pattern_generator.cpp

@@ -751,10 +751,17 @@ void PatternGenerator::generateBuffer()
 	m_sampleRate = sr;
 
 	const uint64_t bufferSize = computeBufferSize(sr);
+	m_plot.setMaxBufferSizeErrorLabel(bufferSize == MAX_BUFFER_SIZE);
 
 	qDebug() << "Buffer size is: " << bufferSize;
 	m_bufferSize = bufferSize;
 
+	m_plot.setSampleRatelabelValue(m_sampleRate);
+	m_plot.setBufferSizeLabelValue(m_bufferSize);
+	m_plot.setTimeBaseLabelValue(static_cast<double>(m_bufferSize) /
+				     static_cast<double>(m_sampleRate) /
+				     m_plot.xAxisNumDiv());
+
 	if (m_buffer) {
 		delete[] m_buffer;
 	}

src/plot_line_handle.cpp

@@ -662,14 +662,14 @@ void FreePlotLineHandleV::paintEvent(QPaintEvent *)
 				setToolTip("");
 			}
 
-			const double textHeight = QFontMetrics(QFont(fontFamily, fontSize)).height();
-
-			QPointF textPos(0.0, m_height / 2.0 + textHeight / 4.0);
+			const QSizeF size = QFontMetricsF(QFont(fontFamily, fontSize)).size(Qt::TextSingleLine, m_name);
+			QRectF textRect(QPointF(0.0, 0.0), size);
+			textRect.moveCenter(QPointF(m_image.width() / 2.0, m_height / 2.0));
 
 			p.save();
 			p.setPen(QPen(QBrush(Qt::white), 20));
 			p.setFont(QFont(fontFamily, fontSize));
-			p.drawText(textPos, m_name);
+			p.drawText(textRect, m_name);
 			p.restore();
 		} else {
 			p.drawPixmap(imageTopLeft, m_image);

src/scopyExceptionHandler.h

@@ -6,25 +6,33 @@
 #include <config.h>
 #include <libm2k/m2kexceptions.hpp>
 #include <scopyApplication.hpp>
+#include <QThread>
 
 using namespace adiscope;
 
 #define HANDLE_EXCEPTION(e) \
-	if(GetScopyApplicationInstance()->getDebugMode()) { \
+if (GetScopyApplicationInstance()->getDebugMode()) { \
+	auto me = dynamic_cast<libm2k::m2k_exception *>(&e); \
+	auto handleLambda = [me, e](){ \
 		QMessageBox msg; \
 		QString str; \
-		auto me = dynamic_cast<libm2k::m2k_exception*>(&e);\
-		if(me) { \
+		if (me) { \
 			str = QString("Exception %1\ne.type() - %2\ne.what()  - %3\ne.iioCode() - %4\nthrown from %5:%6\ncaught in %7:%8\nScopy git tag %9\n") \
 			.arg("m2k_exception").arg(me->type()).arg(me->what()).arg(me->iioCode()).arg(QString::fromStdString(me->file())).arg(QString::number(me->line())).arg(__FILE__).arg(__LINE__).arg(SCOPY_VERSION_GIT); \
 		} else { \
 			str = QString("Exception  %1\ncaught in %2:%3\nScopy git tag %4\n").arg(e.what()).arg(__FILE__).arg(__LINE__).arg(SCOPY_VERSION_GIT); \
 		} \
-		if(WriteScopyMinidump()) { \
+		if (WriteScopyMinidump()) { \
 			str = str + "Created minidump."; \
-		}\
-		msg.setText(str);\
-		msg.exec();\
+		} \
+		msg.setText(str); \
+		msg.exec(); \
+	}; \
+	if (GetScopyApplicationInstance()->thread() != QThread::currentThread()) { \
+		QMetaObject::invokeMethod(GetScopyApplicationInstance(), handleLambda, Qt::BlockingQueuedConnection); \
+	} else { \
+		handleLambda(); \
 	} \
+} \
 
 #endif // SCOPYEXCEPTIONHANDLER_H

src/trigger_settings.cpp

@@ -74,7 +74,8 @@ TriggerSettings::TriggerSettings(M2kAnalogIn* libm2k_adc,
 	trigger_raw_delay(0),
 	daisyChainCompensation(0),
 	m_trigger_in(false),
-	m_has_external_trigger_out(false)
+	m_has_external_trigger_out(false),
+	digital_trigger_was_on(false)
 {
 	initInstrumentStrings();
 	ui->setupUi(this);
@@ -169,6 +170,10 @@ TriggerSettings::TriggerSettings(M2kAnalogIn* libm2k_adc,
 	wheelEventGuard->installEventRecursively(this);
 
 	ui->mixedSignalLbl->setVisible(false);
+	ui->btnLogicAnalyzerTriggers->setVisible(false);
+
+	connect(ui->btnLogicAnalyzerTriggers, &QPushButton::clicked,
+		this, &TriggerSettings::showLogicAnalyzerTriggerSettings);
 }
 
 TriggerSettings::~TriggerSettings()
@@ -253,13 +258,24 @@ void TriggerSettings::enableMixedSignalView()
 	ui->extern_en->setDisabled(true);
 	ui->extern_to_en->setDisabled(true);
 	ui->mixedSignalLbl->setVisible(true);
+	ui->btnLogicAnalyzerTriggers->setVisible(true);
+	ui->btnLogicAnalyzerTriggers->setEnabled(true);
+	digital_trigger_was_on = ui->digital_controls->isEnabled();
+	if (digital_trigger_was_on) {
+		ui->digital_controls->setDisabled(true);
+	}
 }
 
 void TriggerSettings::disableMixedSignalView()
 {
 	ui->extern_en->setEnabled(true);
 	ui->extern_to_en->setEnabled(true);
 	ui->mixedSignalLbl->setVisible(false);
+	ui->btnLogicAnalyzerTriggers->setVisible(false);
+	ui->btnLogicAnalyzerTriggers->setDisabled(true);
+	if (digital_trigger_was_on) {
+		ui->digital_controls->setEnabled(true);
+	}
 }
 
 void TriggerSettings::setDcLevelCoupled(double value)

src/trigger_settings.hpp

@@ -84,6 +84,7 @@ namespace adiscope {
 		void levelChanged(double);
 		void analogTriggerEnabled(bool);
 		void triggerModeChanged(int);
+		void showLogicAnalyzerTriggerSettings();
 
 	public Q_SLOTS:
 		void setTriggerDelay(long long);
@@ -145,6 +146,8 @@ namespace adiscope {
 		libm2k::M2kHardwareTrigger* m_trigger;
 		bool m_trigger_in;
 
+		bool digital_trigger_was_on;
+
 		std::vector<std::pair<QString, libm2k::M2K_TRIGGER_OUT_SELECT>> externalTriggerOutMapping;
 
 		QList<trigg_channel_config> trigg_configs;