GLScope: individual settings for channels 1 and 2. Fine and Coarse sl…

…iders for Y offsets. Interim state #1: channel 1 working

include/gui/glscope.h

@@ -56,8 +56,8 @@ class SDRANGEL_API GLScope: public QGLWidget {
 	~GLScope();
 
 	void setDSPEngine(DSPEngine* dspEngine);
-	void setAmp(Real amp);
-	void setAmpOfs(Real ampOfs);
+	void setAmp1(Real amp);
+	void setAmp1Ofs(Real ampOfs);
 	void setTimeBase(int timeBase);
 	void setTimeOfsProMill(int timeOfsProMill);
 	void setMode(Mode mode);
@@ -117,6 +117,8 @@ class SDRANGEL_API GLScope: public QGLWidget {
 	ScopeVis::TriggerChannel m_triggerChannel;
 	Real m_triggerLevel;
 	Real m_triggerPre;
+	Real m_triggerLevelDis1;
+	Real m_triggerLevelDis2;
 	int m_nbPow;
 	Real m_prevArg;
 

include/gui/glscopegui.h

@@ -44,8 +44,9 @@ class SDRANGEL_API GLScopeGUI : public QWidget {
 	qint32 m_displays;
 	qint32 m_timeBase;
 	qint32 m_timeOffset;
-	qint32 m_amplification;
-	qint32 m_ampOffset;
+	qint32 m_amplification1;
+	qint32 m_amp1OffsetCoarse;
+	qint32 m_amp1OffsetFine;
 	int m_displayGridIntensity;
 	int m_displayTraceIntensity;
 	qint32 m_triggerChannel;
@@ -64,15 +65,16 @@ class SDRANGEL_API GLScopeGUI : public QWidget {
 	void setTimeScaleDisplay();
 	void setTraceLenDisplay();
 	void setTimeOfsDisplay();
-	void setAmpScaleDisplay();
-	void setAmpOfsDisplay();
+	void setAmp1ScaleDisplay();
+	void setAmp1OfsDisplay();
 	void setTrigLevelDisplay();
 	void setTrigPreDisplay();
 	void setTrigDelayDisplay();
 
 private slots:
-	void on_amp_valueChanged(int value);
-	void on_ampOfs_valueChanged(int value);
+	void on_amp1_valueChanged(int value);
+	void on_amp1OfsCoarse_valueChanged(int value);
+	void on_amp1OfsFine_valueChanged(int value);
 	void on_scope_traceSizeChanged(int value);
 	void on_scope_sampleRateChanged(int value);
 	void on_time_valueChanged(int value);