Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-02-02 13:52:55 +08:00
Code Issues Projects Releases Wiki Activity

fix: CSV files use commas as decimal separators.

Browse Source
This commit is contained in:
dreamsource-tai 2024-07-26 15:08:24 +08:00
parent a4db63b4e4
commit a137c03ff0
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libsigrok4DSL/output/csv.c
View File

@ -26,6 +26,7 @@
#include "../config.h" /* Needed for PACKAGE_STRING and others. */ #include "../config.h" /* Needed for PACKAGE_STRING and others. */
#include "../log.h" #include "../log.h"
#include <stdio.h> #include <stdio.h>
#include <float.h>
#undef LOG_PREFIX #undef LOG_PREFIX
#define LOG_PREFIX "csv: " #define LOG_PREFIX "csv: "
@ -227,6 +228,21 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
double tmpv; double tmpv;
struct sr_channel *ch; struct sr_channel *ch;
int bDotLetter = 0;
char tmp_buffer[50];
char *pFlagCheck = tmp_buffer;
sprintf(tmp_buffer, "%0.15g", DBL_MAX);
while (*pFlagCheck)
{
if (*pFlagCheck == '.'){
bDotLetter = 1;
break;
}
pFlagCheck++;
}
*out = NULL; *out = NULL;
if (!o || !o->sdi) if (!o || !o->sdi)
return SR_ERR_ARG; return SR_ERR_ARG;
@ -266,7 +282,24 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
} }
tmpv = (double)(ctx->index-1) / (double)ctx->samplerate; tmpv = (double)(ctx->index-1) / (double)ctx->samplerate;
if (bDotLetter){
g_string_append_printf(*out, "%0.15g", tmpv); g_string_append_printf(*out, "%0.15g", tmpv);
}
else{
sprintf(tmp_buffer, "%0.15g", tmpv);
pFlagCheck = tmp_buffer;
while (*pFlagCheck){
if (*pFlagCheck == ','){
*pFlagCheck = '.';
break;
}
pFlagCheck++;
}
g_string_append_printf(*out, tmp_buffer);
}
for (j = 0; j < ctx->num_enabled_channels; j++) { for (j = 0; j < ctx->num_enabled_channels; j++) {
idx = j; idx = j;