Skip to content

Commit

Permalink
Merge pull request #29 from luzpaz/typos
Browse files Browse the repository at this point in the history
Fix misc. typos and whitespace
  • Loading branch information
ChrisVeigl authored Jul 14, 2023
2 parents f134083 + b65e51d commit 4b32e32
Show file tree
Hide file tree
Showing 35 changed files with 92 additions and 92 deletions.
4 changes: 2 additions & 2 deletions bin/CONFIGURATIONS/EMG/emg_recognition.con
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ smalladapt=0
adaptinterval=200
barsize=30
fontsize=10
wndcaption=Right Treshold
wndcaption=Right Threshold
linkport 0-9,0
linkport 0-12,1
linkport 0-7,1
Expand Down Expand Up @@ -314,7 +314,7 @@ smalladapt=0
adaptinterval=200
barsize=30
fontsize=10
wndcaption=Left Treshold
wndcaption=Left Threshold
linkport 0-11,0
linkport 0-10,1
end object
Expand Down
4 changes: 2 additions & 2 deletions bin/CONFIGURATIONS/EMG/emg_recognition2.con
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ smalladapt=0
adaptinterval=200
barsize=30
fontsize=10
wndcaption=Right Treshold
wndcaption=Right Threshold
linkport 0-9,0
linkport 0-12,1
linkport 0-7,1
Expand Down Expand Up @@ -315,7 +315,7 @@ smalladapt=0
adaptinterval=200
barsize=30
fontsize=10
wndcaption=Left Treshold
wndcaption=Left Threshold
linkport 0-11,0
linkport 0-10,1
end object
Expand Down
2 changes: 1 addition & 1 deletion bin/CONFIGURATIONS/OtherDemos/skintest.con
Original file line number Diff line number Diff line change
Expand Up @@ -296,5 +296,5 @@ ypos=204
inputports=0
outputports=0
tag=INFO
text= --------- Design Documentation --------/#/#This Design shows functions and possible use of a skinned dialog window./#/#The outputs of four mouse-over (radio) - styled buttons and the output of a slider/#are displayed in the oscilloscope window./#/#The slider and the RIGHT-Button are controlled from within the design./#The current value of the slider affects the signal generator that controls the RIGHT-button./#/#If you disconnect the respective inputs of the skindialog-element,/#the slider and the RIGHT-Button could be controlled manually./#/#Please refer to the Help-Pages for a more detailed explaination of the skindialog-element.
text= --------- Design Documentation --------/#/#This Design shows functions and possible use of a skinned dialog window./#/#The outputs of four mouse-over (radio) - styled buttons and the output of a slider/#are displayed in the oscilloscope window./#/#The slider and the RIGHT-Button are controlled from within the design./#The current value of the slider affects the signal generator that controls the RIGHT-button./#/#If you disconnect the respective inputs of the skindialog-element,/#the slider and the RIGHT-Button could be controlled manually./#/#Please refer to the Help-Pages for a more detailed explanation of the skindialog-element.
end object
2 changes: 1 addition & 1 deletion bin/CONFIGURATIONS/OtherDemos/statistics_test.con
Original file line number Diff line number Diff line change
Expand Up @@ -258,5 +258,5 @@ ypos=47
inputports=0
outputports=0
tag=INFO
text=--------- Design Documentation --------/#/#/# This design shows a way to print long-term statistics with the oscilloscope./#/# Use the "Fly through" button on the right bottom of the status bar/# to calculate the selected area of the archve file as quick as possible./#/# Note: The averager-modules before the inputs of the oscilloscope are necessary/# to lower the bandwith of the connected signals.
text=--------- Design Documentation --------/#/#/# This design shows a way to print long-term statistics with the oscilloscope./#/# Use the "Fly through" button on the right bottom of the status bar/# to calculate the selected area of the archve file as quick as possible./#/# Note: The averager-modules before the inputs of the oscilloscope are necessary/# to lower the bandwidth of the connected signals.
end object
2 changes: 1 addition & 1 deletion bin/ReadMe_BrainBay.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ BIG CREDITS go to:


Find further documentation on the Project hompage http://brainbay.lo-res.org
and in the user and devloper manuals (.pdf)
and in the user and developer manuals (.pdf)



2 changes: 1 addition & 1 deletion bin/ReadMe_Matlab.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Input buffers:
3. The entire buffer of all the variables (A-J) is passed to Matlab.
4. The input buffer is initially set to all zeroes.
5. The first sample is copied to the first element.
6. Sucessive samples are copied to the 2nd, 3rd ... element etc.
6. Successive samples are copied to the 2nd, 3rd ... element etc.
7. Once the buffer is full, the buffer is shifted down and each new sample is copied to the top (ie. last element) of the buffer.

Additional variables:
Expand Down
2 changes: 1 addition & 1 deletion bin/ReadMe_PortTalk.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ install the driver and then start it.
Allowio - Grants programs access to IO Ports.
_____________________________________________

Usage : AllowIO <executable.exe> <Hex Addresse(s)> <Switches>
Usage : AllowIO <executable.exe> <Hex Address(es)> <Switches>

eg. Using allowio to grant access to IO ports 0x42, 0x43 and 0x61

Expand Down
4 changes: 2 additions & 2 deletions src/SDL_sound.h
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ typedef struct

/**
* \struct Sound_DecoderInfo
* \brief Information about available soudn decoders.
* \brief Information about available sound decoders.
*
* Each decoder sets up one of these structs, which can be retrieved via
* the Sound_AvailableDecoders() function. EVERY FIELD IN THIS IS READ-ONLY.
Expand Down Expand Up @@ -424,7 +424,7 @@ SNDDECLSPEC void SDLCALL Sound_ClearError(void);
* via Sound_FreeSample().
*
* You do not have to keep a reference to (rw) around. If this function
* suceeds, it stores (rw) internally (and disposes of it during the call
* succeeds, it stores (rw) internally (and disposes of it during the call
* to Sound_FreeSample()). If this function fails, it will dispose of the
* SDL_RWops for you.
*
Expand Down
2 changes: 1 addition & 1 deletion src/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Author: Chris Veigl, contact: [email protected]
Co-Authors:
Jeremy Wilkerson (Modules: AND, OR, NOT, WAV, CORELLATION, EVALUATOR)
Jeremy Wilkerson (Modules: AND, OR, NOT, WAV, CORRELATION, EVALUATOR)
Lester John (Module MATLAB-transfer)
Credits: Jim Peters (digital filter works), Jeff Molofee (OpenGL-tutorial), John Roark (SkinDialog)
Expand Down
6 changes: 3 additions & 3 deletions src/brainBay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Author: Chris Veigl, contact: [email protected]
Co-Authors:
Jeremy Wilkerson (Modules: AND, OR, NOT, WAV, CORELLATION, EVALUATOR)
Jeremy Wilkerson (Modules: AND, OR, NOT, WAV, CORRELATION, EVALUATOR)
Lester John (Module MATLAB-transfer)
Stephan Gerhard (QDS parser)
Raymond Nguyen (Vector ports)
Expand Down Expand Up @@ -227,7 +227,7 @@ LRESULT CALLBACK MainWndHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
case WM_COMMAND:
wmId = LOWORD(wParam);
wmEvent = HIWORD(wParam);
// Menüauswahlen analysieren:
// Men�auswahlen analysieren:
switch( wmId )
{

Expand Down Expand Up @@ -288,7 +288,7 @@ LRESULT CALLBACK MainWndHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
else
{
char * d_name,new_name[80];
write_logfile("configruation saved.");
write_logfile("configuration saved.");

d_name=configfilename;
while (strstr(d_name,"\\")) d_name=strstr(d_name,"\\")+1;
Expand Down
2 changes: 1 addition & 1 deletion src/brainBay.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Author: Chris Veigl, contact: [email protected]
Co-Authors:
Jeremy Wilkerson (Modules: AND, OR, NOT, WAV, CORELLATION, EVALUATOR)
Jeremy Wilkerson (Modules: AND, OR, NOT, WAV, CORRELATION, EVALUATOR)
Lester John (Module MATLAB-transfer)
Stephan Gerhard (QDS parser)
Franz Stobl ( NIA support )
Expand Down
18 changes: 9 additions & 9 deletions src/brainbay.rc
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ BEGIN
MENUITEM "OpenBCI (8 Channel EEG)", IDM_INSERT_EEG_OPENBCI8
MENUITEM "OpenBCI (16 Channel EEG)", IDM_INSERT_EEG_OPENBCI16
MENUITEM "OpenBCI Ganglion", IDM_INSERTGANGLION
MENUITEM "OpenEEG / Olimex SMT EEG (2-6 Channnels, ModularEEG P2 Packetformat)", IDM_INSERT_EEG_P2
MENUITEM "OpenEEG / Olimex SMT EEG (2-6 Channels, ModularEEG P2 Packetformat)", IDM_INSERT_EEG_P2
MENUITEM "OpenEEG (2-6 Channels, P3 Packetformat)", IDM_INSERT_EEG_P3
MENUITEM "OPI TrueSense Exploration Kit", IDM_INSERT_EEG_OPI_EXPLORATION
MENUITEM "Pendant EEG (2 Channels)", IDM_INSERT_EEG_PENDANT
Expand Down Expand Up @@ -231,7 +231,7 @@ BEGIN
CONTROL "Ch4",IDC_CH4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,104,29,10,WS_EX_RIGHT
CONTROL "Ch5",IDC_CH5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,104,29,10,WS_EX_RIGHT
CONTROL "Ch6",IDC_CH6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,214,104,29,10,WS_EX_RIGHT
LTEXT "Archive offest:",IDC_STATIC,66,229,46,8
LTEXT "Archive offset:",IDC_STATIC,66,229,46,8
EDITTEXT IDC_OFFSET,115,227,25,12,ES_AUTOHSCROLL
LTEXT "seconds",IDC_STATIC,143,229,28,8
PUSHBUTTON "apply offset",IDC_APPLYOFFSET,179,227,62,12,BS_FLAT
Expand Down Expand Up @@ -386,7 +386,7 @@ BEGIN
SCROLLBAR IDC_VALUEBAR,70,72,179,13
LTEXT "max",IDC_MAXLABEL,209,89,29,8,NOT WS_GROUP,WS_EX_RIGHT
COMBOBOX IDC_PARAMETERCOMBO,70,34,180,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
LTEXT "Paramter:",IDC_STATIC,31,36,31,8,NOT WS_GROUP
LTEXT "Parameter:",IDC_STATIC,31,36,31,8,NOT WS_GROUP
COMBOBOX IDC_REMOTECOMBO,201,53,48,82,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
LTEXT "Remote-Control by",IDC_STATIC,137,55,61,8,NOT WS_GROUP
PUSHBUTTON "get minimum",IDC_SETMIN,68,102,54,14,BS_FLAT
Expand Down Expand Up @@ -1284,7 +1284,7 @@ BEGIN
GROUPBOX "Archive File",IDC_STATIC,6,140,276,107
LTEXT "Position",IDC_STATIC,30,213,26,8
PUSHBUTTON "End Recording",IDC_CLOSE_REC,182,175,62,14,BS_FLAT
LTEXT "Archive offest:",IDC_STATIC,66,229,46,8
LTEXT "Archive offset:",IDC_STATIC,66,229,46,8
EDITTEXT IDC_OFFSET,115,227,25,12,ES_AUTOHSCROLL
LTEXT "seconds",IDC_STATIC,143,229,28,8
PUSHBUTTON "apply offset",IDC_APPLYOFFSET,179,227,62,12,BS_FLAT
Expand Down Expand Up @@ -1324,7 +1324,7 @@ BEGIN
PUSHBUTTON "End Recording",IDC_CLOSE_REC,182,119,62,14,BS_FLAT
CONTROL "Ch1",IDC_CH1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,135,64,29,10,WS_EX_RIGHT
CONTROL "Ch2",IDC_CH2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,64,29,10,WS_EX_RIGHT
LTEXT "Archive offest:",-1,66,173,46,8
LTEXT "Archive offset:",-1,66,173,46,8
EDITTEXT IDC_OFFSET,115,171,25,12,ES_AUTOHSCROLL
LTEXT "seconds",-1,143,173,28,8
PUSHBUTTON "apply offset",IDC_APPLYOFFSET,179,171,62,12,BS_FLAT
Expand Down Expand Up @@ -1352,7 +1352,7 @@ BEGIN
GROUPBOX "Archive File",IDC_STATIC,6,95,276,107
LTEXT "Position",IDC_STATIC,30,168,26,8
PUSHBUTTON "End Recording",IDC_CLOSE_REC,182,130,62,14,BS_FLAT
LTEXT "Archive offest:",IDC_STATIC,66,185,46,8
LTEXT "Archive offset:",IDC_STATIC,66,185,46,8
EDITTEXT IDC_OFFSET,115,182,25,12,ES_AUTOHSCROLL
LTEXT "seconds",IDC_STATIC,143,184,28,8
PUSHBUTTON "apply offset",IDC_APPLYOFFSET,179,182,62,12,BS_FLAT
Expand Down Expand Up @@ -1386,7 +1386,7 @@ BEGIN
GROUPBOX "Archive File",IDC_STATIC,6,111,276,107
LTEXT "Position",IDC_STATIC,30,184,26,8
PUSHBUTTON "End Recording",IDC_CLOSE_REC,182,146,62,14,BS_FLAT
LTEXT "Archive offest:",IDC_STATIC,66,200,46,8
LTEXT "Archive offset:",IDC_STATIC,66,200,46,8
EDITTEXT IDC_OFFSET,115,198,25,12,ES_AUTOHSCROLL
LTEXT "seconds",IDC_STATIC,143,200,28,8
PUSHBUTTON "apply offset",IDC_APPLYOFFSET,179,198,62,12,BS_FLAT
Expand Down Expand Up @@ -2143,7 +2143,7 @@ BEGIN
EDITTEXT IDC_THRESHOLD_TIME,227,23,19,12,ES_AUTOHSCROLL
LTEXT "frame",IDC_STATIC,250,25,26,8
CONTROL "show live-camera window",IDC_SHOWLIVE,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,180,60,97,10
LTEXT "miliseconds",IDC_STATIC,255,123,38,8
LTEXT "milliseconds",IDC_STATIC,255,123,38,8
END

IDD_DEBOUNCEBOX DIALOGEX 0, 0, 191, 57
Expand Down Expand Up @@ -2232,7 +2232,7 @@ EXSTYLE WS_EX_TOOLWINDOW | WS_EX_STATICEDGE
CAPTION "Counter / Display"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
CONTROL "Count FALSE -> TRUE Transistions",IDC_COUNTFT,"Button",BS_AUTORADIOBUTTON,54,38,128,10
CONTROL "Count FALSE -> TRUE Transitions",IDC_COUNTFT,"Button",BS_AUTORADIOBUTTON,54,38,128,10
CONTROL "Count TRUE -> FALSE Transitions",IDC_COUNTTF,"Button",BS_AUTORADIOBUTTON,54,52,125,10
CONTROL "Display Value (no counting)",IDC_COUNTIV,"Button",BS_AUTORADIOBUTTON,54,24,102,10
CONTROL "Show Counter/Display Window",IDC_SHOWCOUNTER,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,32,133,112,10
Expand Down
6 changes: 3 additions & 3 deletions src/draw.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/* -----------------------------------------------------------------------------
BrainBay - OpenSource Biofeedback Software
MODULE: DRAW.CPP: this Module provides global accessible Drawing - Functions.
init_draw: Creates Pens and Brushes, and a font for GDI-use
draw_objects: draws the current objects and object-links to the Main-Window
LoadBMP: load a bitmap from a file to a openGL-surface, using SDL-functions
LoadGLTextures: Converts a bitmap to a texture for GL-use
Size_GL: updates the OGL-viewport wehn a resize has ocurred
Size_GL: updates the OGL-viewport when a resize has occurred
->OGL-drawing is currently used for the FFT-Specra-Displays and the Animation Window
Expand All @@ -20,7 +20,7 @@
as published by the Free Software Foundation; See the
GNU General Public License for more details.
--------------------------------------------------------------------------------------*/

#include "brainBay.h"
Expand Down
4 changes: 2 additions & 2 deletions src/exprtk.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10998,7 +10998,7 @@ namespace exprtk
{
public:

// Function of N paramters.
// Function of N parameters.
typedef expression_node<T>* expression_ptr;
typedef std::pair<expression_ptr,bool> branch_t;
typedef IFunction ifunction;
Expand Down Expand Up @@ -20121,7 +20121,7 @@ namespace exprtk
if (index < error_list_.size())
return error_list_[index];
else
throw std::invalid_argument("parser::get_error() - Invalid error index specificed");
throw std::invalid_argument("parser::get_error() - Invalid error index specified");
}

inline std::string error() const
Expand Down
6 changes: 3 additions & 3 deletions src/files.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1239,11 +1239,11 @@ void edfchannels_to_physical(CHANNELStruct * fromchn,char * to,int channels)
szdata[80]=0; strcat(to,szdata); }
actchn=fromchn;
for (t=0;t<channels ;t++,actchn++) // samples per data record
{ sprintf(szdata,"%d",PACKETSPERSECOND);
{ sprintf(szdata,"%d",PACKETSPERSECOND);
for (i=strlen(szdata);i<8;i++) szdata[i]=' ';
szdata[8]=0; strcat(to,szdata); }
for (t=0;t<channels;t++) // reseverd
{ strcpy(szdata," ");
for (t=0;t<channels;t++) // reserved
{ strcpy(szdata," ");
for (i=strlen(szdata);i<32;i++) szdata[i]=' ';
szdata[32]=0; strcat(to,szdata); }

Expand Down
2 changes: 1 addition & 1 deletion src/matheval.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ extern "C" {

/*
* Calculate length of textual representation of evaluator. This
* procedure is inteded to be used along with evaluator_write()
* procedure is intended to be used along with evaluator_write()
* procedure that follows.
*/
extern int evaluator_calculate_length(void *evaluator);
Expand Down
2 changes: 1 addition & 1 deletion src/midi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
init_midi: inits Instrument/Controller Names, opens all available midi-out- Ports
midi_Instrument: Selects the midi-instrument for a given channel
midi_ControlChange: sends a control-change - message on a given channel
midi_NoteOn: plays a tone with given hieght, volume on a given channel
midi_NoteOn: plays a tone with given height, volume on a given channel
midi_NoteOff: mutes a tone
Expand Down
2 changes: 1 addition & 1 deletion src/ob_avi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ void AVIOBJ::GrabAVIFrame(int frame,HDC nhdc) // Grabs A Frame From The
void AVIOBJ::CloseAVI(void) // Properly Closes The Avi File
{

DeleteObject(hBitmap); // Delete The Device Dependant Bitmap Object
DeleteObject(hBitmap); // Delete The Device Dependent Bitmap Object
if (hdd) DrawDibClose(hdd); // Closes The DrawDib Device Context
if (pgf)
{
Expand Down
4 changes: 2 additions & 2 deletions src/ob_avi.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
input port. Sound of the AVI-File is not processed.
Inspired by Jeff Molofee's Lesson 35: Playing AVI-Files with OpenGl
http://nehe.gamedev.net
http://nehe.gamedev.net
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -51,7 +51,7 @@ class AVIOBJ : public BASE_CL
GLUquadricObj *quadratic; // Storage For Our Quadratic Objects

HDRAWDIB hdd; // Handle For Our Dib
HBITMAP hBitmap; // Handle To A Device Dependant Bitmap
HBITMAP hBitmap; // Handle To A Device Dependent Bitmap
HDC hdc; // Creates A Compatible Device Context
unsigned char* data; // Pointer To Our Resized Image

Expand Down
4 changes: 2 additions & 2 deletions src/ob_biosemi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
MODULE: OB_BIOSEMI.CPP: contains the interface to
BIOSEMI Active Two devices (Mk1 and Mk2)
Author: Denny Yi-Jhong Han (the codes are extensively referenced and copied from
Lab Straming Layer (LSL) projects, https://github.com/sccn/labstreaminglayer
Lab Streaming Layer (LSL) projects, https://github.com/sccn/labstreaminglayer
credits also goes to them!)

This program is free software; you can redistribute it and/or
Expand Down Expand Up @@ -58,7 +58,7 @@ int last_idx_;
const int send_interval_ms = 13;
//const int send_interval_ms = 100;

// the age of each chunk received (in seconds) is anywhere between 0 and send_interval_ms miliseconds old, and is on average half of the maximum
// the age of each chunk received (in seconds) is anywhere between 0 and send_interval_ms milliseconds old, and is on average half of the maximum
const double buffer_lag = (send_interval_ms / 2000.0);

// allocate temp data & resamplers...
Expand Down
10 changes: 5 additions & 5 deletions src/ob_cam.cpp
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/* -----------------------------------------------------------------------------

BrainBay - OpenSource Biofeedback Software, contact: [email protected]

MODULE: OB_CAM.CPP: contains functions for Webcam functions
Author: Chris Veigl

The Camera-Object can connect to an installed webcam an display the live-
video in a window. A Face-Detection is performed and the Position of the Nose and
the Chin are presented at the objects-output ports.
video in a window. A Face-Detection is performed and the Position of the Nose
and the Chin are presented at the objects-output ports.

This Module uses the Intel OpenCV Library for Computer Vision, and source
code from the sample-projects describingf the use of the HaarClassifier-Cascade
and the Lukas Kanade Optical Flow Algorithm.
see details about Intels OpenCV: http://opencv.org/


-----------------------------------------------------------------------------*/
// #define DEBUG_OUTPUT

Expand Down Expand Up @@ -112,7 +112,7 @@ int initstatus = STATUS_IDLE;

#if _MSC_VER < 1900

////////////// C - global variables for facetracking, used from tread //////////////
////////////// C - global variables for facetracking, used from thread ////////////

#define LK_NUM_POINTS 2
const char* cascade_name = "ComputerVision\\haarcascade_frontalface_alt.xml";
Expand Down
Loading

0 comments on commit 4b32e32

Please sign in to comment.