diff --git a/Desktop_Interface/isobuffer.cpp b/Desktop_Interface/isobuffer.cpp
index 992554d1..c48b7e0e 100644
--- a/Desktop_Interface/isobuffer.cpp
+++ b/Desktop_Interface/isobuffer.cpp
@@ -61,7 +61,8 @@ void isoBuffer::insertIntoBuffer(short item)
short isoBuffer::bufferAt(uint32_t idx) const
{
if (idx > m_insertedCount)
- qFatal("isoBuffer::bufferAt: invalid query");
+ qFatal("isoBuffer::bufferAt: invalid query, idx = %lu, m_insertedCount = %lu", idx, m_insertedCount);
+
return m_buffer[(m_back-1) + m_bufferLen - idx];
}
diff --git a/Desktop_Interface/ui_files_desktop/mainwindow.ui b/Desktop_Interface/ui_files_desktop/mainwindow.ui
index 100a58ce..14491afa 100644
--- a/Desktop_Interface/ui_files_desktop/mainwindow.ui
+++ b/Desktop_Interface/ui_files_desktop/mainwindow.ui
@@ -9,8 +9,8 @@
0
0
- 1440
- 900
+ 1493
+ 1346
@@ -193,32 +193,93 @@
-
-
-
- Paused
-
-
-
- -
-
-
- AC Coupled
-
-
-
- -
-
-
- Filter
-
-
-
- -
-
-
- Double Sample Rate
-
-
+
+
-
+
+
-
+
+
+ Paused
+
+
+
+ -
+
+
+ AC Coupled
+
+
+
+ -
+
+
+ Filter
+
+
+
+ -
+
+
+ Double Sample Rate
+
+
+
+
+
+ -
+
+
-
+
+
+ Offset
+
+
+
+ -
+
+
+ V
+
+
+ 2
+
+
+ -20.000000000000000
+
+
+ 20.000000000000000
+
+
+
+ -
+
+
+ Attenuation
+
+
+
+ -
+
+
-
+
+ 1x
+
+
+ -
+
+ 5x
+
+
+ -
+
+ 10x
+
+
+
+
+
+
+
-
@@ -308,49 +369,6 @@
- acCoupledLabel_CH1
- filterLabel_CH1
- pausedLabeL_CH1
- doubleSampleLabel
-
-
- -
-
-
- true
-
-
- Cursor
-
-
- false
-
-
- false
-
-
-
-
-
-
- Horizontal
-
-
-
- -
-
-
- Vertical
-
-
-
- -
-
-
- CURSOR ENABLER
-
-
-
-
@@ -376,32 +394,90 @@
-
-
-
- Paused
-
-
-
- -
-
-
- AC Coupled
-
-
-
- -
-
-
- Filter
-
-
-
- -
-
-
- X-Y Display
-
-
+
+
-
+
+
-
+
+
+ Paused
+
+
+
+ -
+
+
+ AC Coupled
+
+
+
+ -
+
+
+ Filter
+
+
+
+ -
+
+
+ X-Y Display
+
+
+
+
+
+ -
+
+
-
+
+
+ Offset
+
+
+
+ -
+
+
+ V
+
+
+ -20.000000000000000
+
+
+ 20.000000000000000
+
+
+
+ -
+
+
+ Attenuation
+
+
+
+ -
+
+
-
+
+ 1x
+
+
+ -
+
+ 5x
+
+
+ -
+
+ 10x
+
+
+
+
+
+
+
-
@@ -493,6 +569,53 @@
+
+
+
+
+ -
+
+
-
+
+
-
+
+
+ true
+
+
+ Cursor
+
+
+ false
+
+
+ false
+
+
+
-
+
+
+ Horizontal
+
+
+
+ -
+
+
+ Vertical
+
+
+
+ -
+
+
+ CURSOR ENABLER
+
+
+
+
+
+
-
@@ -509,41 +632,67 @@
-
-
+
-
-
- CH1 (Rising)
-
+
+
-
+
+
+ Source
+
+
+
+ -
+
+
-
+
+ CH1 (Rising)
+
+
+ -
+
+ CH1 (Falling)
+
+
+ -
+
+ CH2 (Rising)
+
+
+ -
+
+ CH2 (Falling)
+
+
+
+
+
-
-
- CH1 (Falling)
-
+
+
-
+
+
+ Level
+
+
+
+ -
+
+
+ -20.000000000000000
+
+
+ 20.000000000000000
+
+
+ 0.100000000000000
+
+
+
+
- -
-
- CH2 (Rising)
-
-
- -
-
- CH2 (Falling)
-
-
-
-
- -
-
-
- -20.000000000000000
-
-
- 20.000000000000000
-
-
- 0.100000000000000
-
-
+
-
@@ -559,19 +708,6 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
@@ -586,6 +722,19 @@
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
-
@@ -600,187 +749,193 @@
false
-
-
-
-
+
+
-
+
-
-
- V
-
+
+
+ Paused
+
+
-
-
- I
-
+
+
+ Mode
+
+
-
-
- R
-
+
+
-
+
+ V
+
+
+ -
+
+ I
+
+
+ -
+
+ R
+
+
+ -
+
+ C
+
+
+
-
-
- C
-
-
-
-
- -
-
-
- 0
-
-
- 0
-
-
-
-
+
- Max
+ Series Resistance
- -
-
-
-
- 0
- 24
-
+
-
+
+
+ Ω
-
- QFrame::NoFrame
+
+ 0
-
- 4
+
+ 1000000.000000000000000
- -
-
+
-
+
- Min
+ Source
- -
-
-
-
- 0
- 24
-
-
-
- QFrame::NoFrame
-
-
- 4
-
-
-
- -
-
-
- Mean
-
-
-
- -
-
-
-
- 0
- 24
-
-
-
- QFrame::NoFrame
-
-
- 4
-
-
-
- -
-
-
- RMS
-
-
-
- -
-
-
-
- 0
- 24
-
-
-
- QFrame::NoFrame
-
-
- 4
-
+
-
+
+
-
+
+ Signal Gen CH2
+
+
+ -
+
+ Power Supply
+
+
- -
-
-
- Paused
-
-
-
- -
-
-
- Series Resistance
-
-
-
- -
-
-
- Mode
-
-
-
- -
-
-
- Ω
-
-
- 0
-
-
- 1000000.000000000000000
-
-
-
- -
-
+
-
+
-
-
- Signal Gen CH2
-
+
+
-
+
+
+ Max
+
+
+
+ -
+
+
+ Min
+
+
+
+ -
+
+
+ Mean
+
+
+
+ -
+
+
+ RMS
+
+
+
+
-
-
- Power Supply
-
+
+
-
+
+
+
+ 0
+ 24
+
+
+
+ QFrame::NoFrame
+
+
+ 4
+
+
+
+ -
+
+
+
+ 0
+ 24
+
+
+
+ QFrame::NoFrame
+
+
+ 4
+
+
+
+ -
+
+
+
+ 0
+ 24
+
+
+
+ QFrame::NoFrame
+
+
+ 4
+
+
+
+ -
+
+
+
+ 0
+ 24
+
+
+
+ QFrame::NoFrame
+
+
+ 4
+
+
+
+
-
-
- -
-
-
- Source
-
-
+
@@ -1018,9 +1173,6 @@
- -
-
-
-
@@ -1186,7 +1338,7 @@
false
- Logic Analyzer CH2
+ Logic Analyzer CH&2
true
@@ -1333,7 +1485,7 @@
0
0
- 1440
+ 1493
36
@@ -2374,12 +2526,12 @@
- Pinout
+ &Pinout
- Documentation
+ &Documentation
@@ -3449,54 +3601,6 @@
-
- controller_iso
- multimeterMax(double)
- multimeterMaxDisplay
- display(double)
-
-
- 1251
- 892
-
-
- 1179
- 427
-
-
-
-
- controller_iso
- multimeterMin(double)
- multimeterMinDisplay
- display(double)
-
-
- 1251
- 892
-
-
- 1179
- 451
-
-
-
-
- controller_iso
- multimeterMean(double)
- multimeterMeanDisplay
- display(double)
-
-
- 1251
- 892
-
-
- 1179
- 475
-
-
-
multimeterResistanceSelect
valueChanged(double)
@@ -3513,54 +3617,6 @@
-
- controller_iso
- sendMultimeterLabel1(QString)
- multimeterMaxLabel
- setText(QString)
-
-
- 1251
- 892
-
-
- 1124
- 427
-
-
-
-
- controller_iso
- sendMultimeterLabel2(QString)
- multimeterMinLabel
- setText(QString)
-
-
- 1251
- 892
-
-
- 1124
- 451
-
-
-
-
- controller_iso
- sendMultimeterLabel3(QString)
- multimeterMeanLabel
- setText(QString)
-
-
- 1251
- 892
-
-
- 1124
- 475
-
-
-
serialDecodingCheck_CH1
toggled(bool)
@@ -4153,38 +4209,6 @@
-
- controller_iso
- multimeterRMS(double)
- multimeterRmsDisplay
- display(double)
-
-
- 1189
- 877
-
-
- 1179
- 499
-
-
-
-
- controller_iso
- sendMultimeterLabel4(QString)
- multimeterRmsLabel
- setText(QString)
-
-
- 1117
- 882
-
-
- 1124
- 499
-
-
-
multimeterRComboBox
currentIndexChanged(int)
@@ -4217,6 +4241,134 @@
+
+ controller_iso
+ multimeterRMS(double)
+ multimeterRmsDisplay
+ display(double)
+
+
+ 1189
+ 877
+
+
+ 1179
+ 499
+
+
+
+
+ controller_iso
+ sendMultimeterLabel1(QString)
+ multimeterMaxLabel
+ setText(QString)
+
+
+ 1251
+ 892
+
+
+ 1124
+ 427
+
+
+
+
+ controller_iso
+ sendMultimeterLabel3(QString)
+ multimeterMeanLabel
+ setText(QString)
+
+
+ 1251
+ 892
+
+
+ 1124
+ 475
+
+
+
+
+ controller_iso
+ multimeterMax(double)
+ multimeterMaxDisplay
+ display(double)
+
+
+ 1251
+ 892
+
+
+ 1179
+ 427
+
+
+
+
+ controller_iso
+ multimeterMean(double)
+ multimeterMeanDisplay
+ display(double)
+
+
+ 1251
+ 892
+
+
+ 1179
+ 475
+
+
+
+
+ controller_iso
+ sendMultimeterLabel2(QString)
+ multimeterMinLabel
+ setText(QString)
+
+
+ 1251
+ 892
+
+
+ 1124
+ 451
+
+
+
+
+ controller_iso
+ sendMultimeterLabel4(QString)
+ multimeterRmsLabel
+ setText(QString)
+
+
+ 1117
+ 882
+
+
+ 1124
+ 499
+
+
+
+
+ controller_iso
+ multimeterMin(double)
+ multimeterMinDisplay
+ display(double)
+
+
+ 1251
+ 892
+
+
+ 1179
+ 451
+
+
+
timeBaseNeedsChanging(bool)