Skip to content

Commit

Permalink
added option for semicolon to filewriter element
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChrisVeigl
ChrisVeigl committed Aug 19, 2018
1 parent 9b4500d commit 5317898
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 10 deletions.
Binary file modified bin/brainBay.exe
View file
Binary file not shown.
15 changes: 7 additions & 8 deletions src/brainbay.rc
View file
Expand Up @@ -98,7 +98,7 @@ BEGIN
MENUITEM "Differentiate", IDM_INSERTDIFFERENTIATE
MENUITEM "ERP-Detector", IDM_INSERTERPDETECT
MENUITEM "Expression-Evaluator", IDM_INSERTEVAL
MENUITEM "Expression-Evaluator ExprTk", IDM_INSERTEVAL_EXPRTK
MENUITEM "Expression-Evaluator ExprTk", IDM_INSERTEVAL_EXPRTK
MENUITEM "FFT (Spectrum Analyser)", IDM_INSERTSPECTRUM
MENUITEM "Filter", IDM_INSERTFILTER
MENUITEM "Float-To-Vector", IDM_INSERTFLOATVECTOR
Expand Down Expand Up @@ -776,9 +776,9 @@ EXSTYLE WS_EX_TOOLWINDOW | WS_EX_STATICEDGE
CAPTION "Expression-Evaluator"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
PUSHBUTTON "Apply", IDC_EVALAPPLY, 125, 63, 81, 14, BS_FLAT
EDITTEXT IDC_EVALEXPRESSION, 58, 36, 259, 14, ES_AUTOHSCROLL
LTEXT "Expression :", IDC_STATIC, 10, 39, 39, 8
PUSHBUTTON "Apply",IDC_EVALAPPLY,125,63,81,14,BS_FLAT
EDITTEXT IDC_EVALEXPRESSION,58,36,259,14,ES_AUTOHSCROLL
LTEXT "Expression :",IDC_STATIC,10,39,39,8
END

IDD_EVALBOX_ML DIALOGEX 0, 0, 327, 289
Expand All @@ -792,7 +792,6 @@ BEGIN
LTEXT "Expression :",IDC_STATIC,7,7,39,8
END


IDD_AVIPROPBOX DIALOGEX 0, 0, 267, 82
STYLE DS_ABSALIGN | DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW | WS_EX_STATICEDGE
Expand Down Expand Up @@ -1599,7 +1598,6 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 320
TOPMARGIN, 7
BOTTOMMARGIN, 282
END

IDD_AVIPROPBOX, DIALOG
Expand Down Expand Up @@ -2117,15 +2115,16 @@ BEGIN
LTEXT "File Format:",IDC_STATIC,17,36,37,8
PUSHBUTTON "Generate Test-Arcv",IDC_GENTESTFILE,268,130,70,14,BS_FLAT | NOT WS_VISIBLE | WS_DISABLED
CONTROL "append to file end",IDC_APPEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,262,17,68,10
CONTROL "add date+time to filename",IDC_ADD_DATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,91,105,10
CONTROL "add date+time to filename",IDC_ADD_DATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,91,92,10
CONTROL "auto-create file every session start",IDC_AUTOCREATE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,91,122,10
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,117,10
EDITTEXT IDC_AVERAGING,170,111,30,12,ES_AUTOHSCROLL
LTEXT "Data reduction / averaging:",IDC_STATIC,85,113,85,8
LTEXT "samples",IDC_STATIC,204,113,37,8
EDITTEXT IDC_HEADERLINE,62,50,196,14,ES_AUTOHSCROLL
LTEXT "Header line:",IDC_STATIC,18,52,38,8
LTEXT "(leave empty if no header)",IDC_STATIC,262,53,81,8
CONTROL "use semicolon instead of comma",IDC_SEMICOLON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,233,91,108,10
END

IDD_DEVIATIONBOX DIALOGEX 0, 0, 259, 47
Expand Down
17 changes: 15 additions & 2 deletions src/ob_file_writer.cpp
View file
Expand Up @@ -58,6 +58,7 @@ void updateDialog(HWND hDlg, FILE_WRITEROBJ * st)
CheckDlgButton(hDlg,IDC_APPEND,st->append);
CheckDlgButton(hDlg,IDC_AUTOCREATE,st->autocreate);
CheckDlgButton(hDlg,IDC_ADD_DATE,st->add_date);
CheckDlgButton(hDlg,IDC_SEMICOLON,st->semicolon);
SetDlgItemInt(hDlg,IDC_AVERAGING,st->averaging,0);
SetDlgItemText(hDlg,IDC_FILENAME,st->filename);
SetDlgItemText(hDlg,IDC_HEADERLINE,st->headerline);
Expand Down Expand Up @@ -254,6 +255,9 @@ LRESULT CALLBACK FileWriterDlgHandler( HWND hDlg, UINT message, WPARAM wParam, L
case IDC_ADD_DATE:
st->add_date=IsDlgButtonChecked(hDlg,IDC_ADD_DATE);
break;
case IDC_SEMICOLON:
st->semicolon=IsDlgButtonChecked(hDlg,IDC_SEMICOLON);
break;
case IDC_AVERAGING:
st->averaging=GetDlgItemInt(hDlg,IDC_AVERAGING,NULL,0);
break;
Expand Down Expand Up @@ -322,6 +326,7 @@ FILE_WRITEROBJ::FILE_WRITEROBJ(int num) : BASE_CL()
append=FALSE;
autocreate=FALSE;
add_date=FALSE;
semicolon=FALSE;
averaging=1;
avg_count=0;
for (int i=0;i<MAX_PORTS;i++)
Expand Down Expand Up @@ -360,6 +365,7 @@ FILE_WRITEROBJ::FILE_WRITEROBJ(int num) : BASE_CL()
load_property("averaging",P_INT,&averaging);
load_property("autocreate",P_INT,&autocreate);
load_property("add_date",P_INT,&add_date);
load_property("semicolon",P_INT,&semicolon);
load_property("headerline",P_STRING,&headerline);

height=CON_START+inports*CON_HEIGHT+5;
Expand All @@ -376,6 +382,7 @@ FILE_WRITEROBJ::FILE_WRITEROBJ(int num) : BASE_CL()
save_property(hFile,"averaging",P_INT,&averaging);
save_property(hFile,"autocreate",P_INT,&autocreate);
save_property(hFile,"add_date",P_INT,&add_date);
save_property(hFile,"semicolon",P_INT,&semicolon);
save_property(hFile,"headerline",P_STRING,&headerline);
}

Expand Down Expand Up @@ -443,8 +450,14 @@ FILE_WRITEROBJ::FILE_WRITEROBJ(int num) : BASE_CL()
if (x<inports-2)
{
if ((format==0) || (format==2)) strcat(sztemp,"\t");
else if ((format==1) || (format==3)) strcat(sztemp,", ");
else if (format==4) strcat(sztemp,",");
else if ((format==1) || (format==3)) {
if (semicolon) strcat(sztemp,"; ");
else strcat(sztemp,", ");
}
else if (format==4) {
if (semicolon) strcat(sztemp,";");
else strcat(sztemp,",");
}
}
WriteFile(file,sztemp,strlen(sztemp),&dwWritten,NULL);
}
Expand Down
1 change: 1 addition & 0 deletions src/ob_file_writer.h
View file
Expand Up @@ -35,6 +35,7 @@ class FILE_WRITEROBJ : public BASE_CL
int append;
int autocreate;
int add_date;
int semicolon;
int averaging;
float averaging_buffers[MAX_PORTS];
int avg_count;
Expand Down
2 changes: 2 additions & 0 deletions src/resource.h
View file
Expand Up @@ -668,6 +668,8 @@
#define IDC_AUTOCREATE 1495
#define IDC_AUTOSTART 1496
#define IDC_DEVICETYPE 1496
#define IDC_ADD_DATE2 1496
#define IDC_SEMICOLON 1496
#define IDC_EMOTIV_ARCHIVE_NAME 1497
#define IDC_SBT2STATUS 1497
#define IDC_OPEN_EMOTIV_ARCHIVE 1498
Expand Down

0 comments on commit 5317898

Please sign in to comment.