Skip to content

Commit 94131e7

Browse files
committed
SiglentBINImportFilter: rename Math<N> to F<N>
1 parent 2733371 commit 94131e7

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

scopeprotocols/SiglentBINImportFilter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ void SiglentBINImportFilter::OnFileNameChanged()
201201
{
202202
if(wh.math_en[i] == 1)
203203
{
204-
string name = string("Math") + to_string(i+1);
204+
string name = string("F") + to_string(i+1);
205205
AddStream(Unit(Unit::UNIT_VOLTS), name, Stream::STREAM_TYPE_ANALOG);
206206
auto wfm = new UniformAnalogWaveform;
207207
wfm->m_timescale = wh.math_s_interval[i] * FS_PER_SECOND;

scopeprotocols/SiglentBINImportFilter.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,18 @@ class SiglentBINImportFilter : public ImportFilter
8181
char reserved13[6];
8282
int32_t num_hori_div; //Number of horizontal divisions
8383
int32_t ch_codes_per_div[4];//C1-C4 codes per division
84-
int32_t math_en[4]; //Math1-Math4 channel enable
85-
struct { //Math1-Math4 vertical gain
84+
int32_t math_en[4]; //F1-F4 channel enable
85+
struct { //F1-F4 vertical gain
8686
double value;
8787
char reserved[32];
8888
} math_v_gain[4];
89-
struct { //Math1-Math4 vertical offset
89+
struct { //F1-F2 vertical offset
9090
double value;
9191
char reserved[32];
9292
} math_v_offset[4];
93-
uint32_t math_wave_length[4];//Math1-Math4 number of samples
94-
double math_s_interval[4]; //Math1-Math4 sampling interval
95-
int32_t math_codes_per_div; //Math1-Math4 codes per division
93+
uint32_t math_wave_length[4];//F1-F4 number of samples
94+
double math_s_interval[4]; //F1-F4 sampling interval
95+
int32_t math_codes_per_div; //F1-F4 codes per division
9696
};
9797
#pragma pack(pop)
9898

0 commit comments

Comments
 (0)