Activate extended vertical range for DS/MSO4000 series.

global.h

@@ -35,7 +35,7 @@
 
 
 #define PROGRAM_NAME          "DSRemote"
-#define PROGRAM_VERSION       "0.35_1710192207"
+#define PROGRAM_VERSION       "0.35_1710200913"
 
 #define MAX_PATHLEN            4096
 

mainwindow.cpp

@@ -923,6 +923,8 @@ void UI_Mainwindow::get_device_model(const char *str)
     devparms.bandwidth = 100;
 
     devparms.modelserie = 4;
+
+    if(devparms.use_extra_vertdivisions)  devparms.vertdivisions = 10;
   }
 
   if(!strcmp(str, "DS4014"))
@@ -932,6 +934,8 @@ void UI_Mainwindow::get_device_model(const char *str)
     devparms.bandwidth = 100;
 
     devparms.modelserie = 4;
+
+    if(devparms.use_extra_vertdivisions)  devparms.vertdivisions = 10;
   }
 
   if(!strcmp(str, "DS4022"))
@@ -941,6 +945,8 @@ void UI_Mainwindow::get_device_model(const char *str)
     devparms.bandwidth = 200;
 
     devparms.modelserie = 4;
+
+    if(devparms.use_extra_vertdivisions)  devparms.vertdivisions = 10;
   }
 
   if(!strcmp(str, "DS4024"))
@@ -950,6 +956,8 @@ void UI_Mainwindow::get_device_model(const char *str)
     devparms.bandwidth = 200;
 
     devparms.modelserie = 4;
+
+    if(devparms.use_extra_vertdivisions)  devparms.vertdivisions = 10;
   }
 
   if(!strcmp(str, "DS4032"))
@@ -959,6 +967,8 @@ void UI_Mainwindow::get_device_model(const char *str)
     devparms.bandwidth = 350;
 
     devparms.modelserie = 4;
+
+    if(devparms.use_extra_vertdivisions)  devparms.vertdivisions = 10;
   }
 
   if(!strcmp(str, "DS4034"))
@@ -968,6 +978,8 @@ void UI_Mainwindow::get_device_model(const char *str)
     devparms.bandwidth = 350;
 
     devparms.modelserie = 4;
+
+    if(devparms.use_extra_vertdivisions)  devparms.vertdivisions = 10;
   }
 
   if(!strcmp(str, "DS4052"))
@@ -977,6 +989,8 @@ void UI_Mainwindow::get_device_model(const char *str)
     devparms.bandwidth = 500;
 
     devparms.modelserie = 4;
+
+    if(devparms.use_extra_vertdivisions)  devparms.vertdivisions = 10;
   }
 
   if(!strcmp(str, "DS4054"))
@@ -986,8 +1000,10 @@ void UI_Mainwindow::get_device_model(const char *str)
     devparms.bandwidth = 500;
 
     devparms.modelserie = 4;
+
+    if(devparms.use_extra_vertdivisions)  devparms.vertdivisions = 10;
   }
-  
+
   if(!strcmp(str, "MSO4012"))
   {
     devparms.channel_cnt = 2;
@@ -995,8 +1011,10 @@ void UI_Mainwindow::get_device_model(const char *str)
     devparms.bandwidth = 100;
 
     devparms.modelserie = 4;
+
+    if(devparms.use_extra_vertdivisions)  devparms.vertdivisions = 10;
   }
-  
+
   if(!strcmp(str, "MSO4024"))
   {
     devparms.channel_cnt = 4;
@@ -1004,6 +1022,8 @@ void UI_Mainwindow::get_device_model(const char *str)
     devparms.bandwidth = 200;
 
     devparms.modelserie = 4;
+
+    if(devparms.use_extra_vertdivisions)  devparms.vertdivisions = 10;
   }
 
   if(!strcmp(str, "DS2072A"))

settings_dialog.cpp

@@ -395,7 +395,7 @@ void UI_settings_window::extendvertdivCheckboxChanged(int state)
 
   settings.setValue("gui/use_extra_vertdivisions", mainwindow->devparms.use_extra_vertdivisions);
 
-  if(mainwindow->devparms.modelserie == 1)
+  if((mainwindow->devparms.modelserie == 1) || (mainwindow->devparms.modelserie == 4))
   {
     if(mainwindow->devparms.use_extra_vertdivisions == 1)
     {