diff --git a/README.md b/README.md index d2ab54d..4e3ed7e 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,14 @@ - Expected data column format: `[time, signal voltage in, piezo crystal voltage out]` +### Building + +1. `pip3 install -r requirements.txt` + +2. `build.cmd -compileUI -build` + +3. Find build output in `/dist/` + ### Usage 1. Import data (CSV format preferred, delimiter customization coming later, maybe even [LabView binary](https://pypi.org/project/npTDMS/)) @@ -15,5 +23,3 @@ 3. Set peak isolation parameters + guesses for ringdown function coefficients 4. Admire glorious tau distributions for each comb tooth - - diff --git a/archive/README.md b/archive/README.md new file mode 100644 index 0000000..1e416b9 --- /dev/null +++ b/archive/README.md @@ -0,0 +1 @@ +# Old stuff - includes former (obscenely redundant) project structure \ No newline at end of file diff --git a/assets/favicon.png b/assets/favicon.png new file mode 100644 index 0000000..9c70359 Binary files /dev/null and b/assets/favicon.png differ diff --git a/build.cmd b/build.cmd index 24cd15f..b9ede4c 100644 --- a/build.cmd +++ b/build.cmd @@ -1,13 +1,15 @@ -echo WARNING: THIS WILL OVERWRITE app.py WITH A CONVERTED VERSION OF THE .UI FILE. +@echo off -set /p INPUT=Continue? [y/n] +set compileUI=0 +set build=0 -If %INPUT%=="y" goto yes -If %INPUT%=="n" goto no +FOR %%A IN (%*) DO ( + IF "%%A"=="-compileUI" set compileUI=1 + IF "%%A"=="-build" set build=1 +) -:yes -pyuic5.exe -x .\app.ui -o app.py -exit +if %compileUI%==1 pyuic5.exe -x .\ui\mainwin.ui -o mainwin.py -:no -exit +if %build%==1 pyinstaller --onefile --windowed --icon=favicon.ico app.py + +exit \ No newline at end of file diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000..26af535 Binary files /dev/null and b/favicon.ico differ