SiglentBINImportFilter: fix math waveform sample size

hansemro · hansemro · commit 4b27c3956812 · 2023-08-10T22:43:57.000-07:00
diff --git a/scopeprotocols/SiglentBINImportFilter.cpp b/scopeprotocols/SiglentBINImportFilter.cpp
@@ -218,7 +218,7 @@ void SiglentBINImportFilter::OnFileNameChanged()
 
 			if(data_width == 2)
 			{
-				for(size_t j = 0; j < wh.wave_length; j++)
+				for(size_t j = 0; j < wh.math_wave_length[i]; j++)
 				{
 					const uint16_t* sample = reinterpret_cast<const uint16_t*>(f.c_str() + fpos);
 					float value = ((static_cast<int32_t>(*sample) - center_code)) * v_gain - wh.math_v_offset[i].value;
@@ -228,7 +228,7 @@ void SiglentBINImportFilter::OnFileNameChanged()
 			}
 			else
 			{
-				for(size_t j = 0; j < wh.wave_length; j++)
+				for(size_t j = 0; j < wh.math_wave_length[i]; j++)
 				{
 					const uint8_t* sample = reinterpret_cast<const uint8_t*>(f.c_str() + fpos);
 					float value = (static_cast<int32_t>(*sample) - center_code) * v_gain - wh.math_v_offset[i].value;

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ void SiglentBINImportFilter::OnFileNameChanged()`
`218`	`218`
`219`	`219`	`if(data_width == 2)`
`220`	`220`	`{`
`221`		`- for(size_t j = 0; j < wh.wave_length; j++)`
	`221`	`+ for(size_t j = 0; j < wh.math_wave_length[i]; j++)`
`222`	`222`	`{`
`223`	`223`	`const uint16_t* sample = reinterpret_cast<const uint16_t*>(f.c_str() + fpos);`
`224`	`224`	`float value = ((static_cast<int32_t>(sample) - center_code)) v_gain - wh.math_v_offset[i].value;`
`@@ -228,7 +228,7 @@ void SiglentBINImportFilter::OnFileNameChanged()`
`228`	`228`	`}`
`229`	`229`	`else`
`230`	`230`	`{`
`231`		`- for(size_t j = 0; j < wh.wave_length; j++)`
	`231`	`+ for(size_t j = 0; j < wh.math_wave_length[i]; j++)`
`232`	`232`	`{`
`233`	`233`	`const uint8_t* sample = reinterpret_cast<const uint8_t*>(f.c_str() + fpos);`
`234`	`234`	`float value = (static_cast<int32_t>(sample) - center_code) v_gain - wh.math_v_offset[i].value;`