Work in progress.

global.h

@@ -35,7 +35,7 @@
 
 
 #define PROGRAM_NAME          "DSRemote"
-#define PROGRAM_VERSION       "0.33_1612281954"
+#define PROGRAM_VERSION       "0.33_1612291056"
 
 #define MAX_PATHLEN            4096
 

interface.cpp

@@ -1869,7 +1869,8 @@ void UI_Mainwindow::show_howto_operate()
     "Decrease vertical scale: +\n"
     "Press '1' to select or deselect channel 1\n"
     "Press '2' to select or deselect channel 2, etc.\n"
-    "Press 'c' to center the horizontal position (set timebase offset to zero).\n"
+    "Press 'c' to center the horizontal position.\n"
+    "Press 't' to center the trigger position.\n"
     "Press 'f' to toggle FFT.\n"
     );
 

mainwindow.h

@@ -226,7 +226,8 @@ private:
           *select_chan3_act,
           *select_chan4_act,
           *toggle_fft_act,
-          *center_trigger_act;
+          *center_trigger_act,
+          *center_position_act;
 
   struct tmcdev *device;
 

mainwindow_constr.cpp

@@ -435,8 +435,13 @@ UI_Mainwindow::UI_Mainwindow()
   connect(shift_page_left_act, SIGNAL(triggered()), this, SLOT(shift_page_left()));
   addAction(shift_page_left_act);
 
+  center_position_act = new QAction(this);
+  center_position_act->setShortcut(QKeySequence("c"));
+  connect(center_position_act, SIGNAL(triggered()), this, SLOT(center_trigger()));
+  addAction(center_position_act);
+
   center_trigger_act = new QAction(this);
-  center_trigger_act->setShortcut(QKeySequence("c"));
+  center_trigger_act->setShortcut(QKeySequence("t"));
   connect(center_trigger_act, SIGNAL(triggered()), this, SLOT(center_trigger()));
   addAction(center_trigger_act);
 

notes.txt

@@ -81,7 +81,8 @@ Increase vertical scale: -
 Decrease vertical scale: +
 Press '1' to select or deselect channel 1.
 Press '2' to select or deselect channel 2, etc.
-Press 'c' to center the horizontal position (set timebase offset to zero).
+Press 'c' to center the horizontal position.
+Press 't' to center the trigger position
 Press 'f' to toggle FFT.
 
 

wave_dialog.cpp

@@ -67,11 +67,6 @@ UI_wave_window::UI_wave_window(struct device_settings *p_devparms, short *wbuf[M
 
   devparms->viewer_center_position = 0;
 
-  devparms->math_decode_uart_tx_nval = 0;
-  devparms->math_decode_uart_rx_nval = 0;
-  devparms->math_decode_spi_mosi_nval = 0;
-  devparms->math_decode_spi_miso_nval = 0;
-
   devparms->wave_mem_view_enabled = 1;
 
   if(devparms->math_decode_display)
@@ -109,8 +104,13 @@ UI_wave_window::UI_wave_window(struct device_settings *p_devparms, short *wbuf[M
   connect(shift_page_left_act, SIGNAL(triggered()), this, SLOT(shift_page_left()));
   addAction(shift_page_left_act);
 
+  center_position_act = new QAction(this);
+  center_position_act->setShortcut(QKeySequence("c"));
+  connect(center_position_act, SIGNAL(triggered()), this, SLOT(center_position()));
+  addAction(center_position_act);
+
   center_trigger_act = new QAction(this);
-  center_trigger_act->setShortcut(QKeySequence("c"));
+  center_trigger_act->setShortcut(QKeySequence("t"));
   connect(center_trigger_act, SIGNAL(triggered()), this, SLOT(center_trigger()));
   addAction(center_trigger_act);
 
@@ -247,7 +247,7 @@ void UI_wave_window::shift_page_right()
 }
 
 
-void UI_wave_window::center_trigger()
+void UI_wave_window::center_position()
 {
   devparms->viewer_center_position = 0;
 
@@ -257,6 +257,30 @@ void UI_wave_window::center_trigger()
 }
 
 
+void UI_wave_window::center_trigger()
+{
+  devparms->viewer_center_position = -devparms->timebaseoffset;
+
+  if(devparms->viewer_center_position <= ((((double)devparms->acquirememdepth / devparms->samplerate) -
+                                  (devparms->timebasescale * devparms->hordivisions)) / -2))
+  {
+    devparms->viewer_center_position = (((double)devparms->acquirememdepth / devparms->samplerate) -
+                                (devparms->timebasescale * devparms->hordivisions)) / -2;
+  }
+
+  if(devparms->viewer_center_position >= ((((double)devparms->acquirememdepth / devparms->samplerate) -
+                                  (devparms->timebasescale * devparms->hordivisions)) / 2))
+  {
+    devparms->viewer_center_position = (((double)devparms->acquirememdepth / devparms->samplerate) -
+                                (devparms->timebasescale * devparms->hordivisions)) / 2;
+  }
+
+  set_wavslider();
+
+  wavcurve->update();
+}
+
+
 void UI_wave_window::zoom_in()
 {
   devparms->timebasescale = round_down_step125(devparms->timebasescale, NULL);

wave_dialog.h

@@ -78,6 +78,7 @@ QAction *former_page_act,
         *next_page_act,
         *zoom_in_act,
         *zoom_out_act,
+        *center_position_act,
         *center_trigger_act;
 
 private slots:
@@ -90,6 +91,7 @@ void shift_page_right();
 void next_page();
 void zoom_in();
 void zoom_out();
+void center_position();
 void center_trigger();
 
 };