diff --git a/README.md b/README.md index c92713c..8576632 100644 --- a/README.md +++ b/README.md @@ -11,3 +11,5 @@ http://localhost:3000 + +pyinstaller --noconfirm --noconsole -i "smi.ico" --windowed --clean hemocube.py diff --git a/scripts/merge_csv.py b/scripts/merge_csv.py index d0276b9..66db587 100644 --- a/scripts/merge_csv.py +++ b/scripts/merge_csv.py @@ -2,6 +2,7 @@ import glob import pandas as pd import openpyxl import os +from platform import system rootdir = os.getcwd() @@ -45,16 +46,19 @@ def consolidate(curdir): outfile = rootdir + "/" + os.path.split(curdir)[1] + "_Merged.xlsx" - df_csv_append.to_excel(outfile, index=False) + # df_csv_append.to_excel(outfile, sheet_name="merged_data", index=False) # df_csv_append.to_csv("D8 Merged.csv", index=False) + writer = pd.ExcelWriter(outfile, engine = 'xlsxwriter') + df_csv_append.to_excel(writer, sheet_name = 'x1') + df_csv_append.to_excel(writer, sheet_name = 'x2') + writer.close() if __name__ == "__main__": for file in os.listdir(rootdir): - d = os.path.join(rootdir, file) + curdir = os.path.join(rootdir, file) if os.path.isdir(d): - # print(d) # os.chdir(d) - consolidate(d) + consolidate(curdir) \ No newline at end of file diff --git a/src/components/AbsorbanceGraph.js b/src/components/AbsorbanceGraph.js index 78a97f0..c1402c0 100644 --- a/src/components/AbsorbanceGraph.js +++ b/src/components/AbsorbanceGraph.js @@ -73,7 +73,7 @@ class AbsorbanceGraph extends Component { }); x.domain(d3.extent(testData, function (d) { return d.wavelength; })); - y.domain([0, d3.max(testData, function (d) { return d.absorbance; })]); + y.domain([0, 2]); svg.append("path") .data([testData]) diff --git a/src/components/Devices.css b/src/components/Devices.css index 87839d7..a1bbf12 100644 --- a/src/components/Devices.css +++ b/src/components/Devices.css @@ -52,7 +52,7 @@ margin: 10px; } -.person-details { +.test-details { justify-content: center; align-items: center; /* display: flex; */ diff --git a/src/components/Devices.js b/src/components/Devices.js index 95d2c7e..5b48869 100644 --- a/src/components/Devices.js +++ b/src/components/Devices.js @@ -130,7 +130,7 @@ const Devices = () => { {!curTestData &&
| key | diff --git a/src/index.js b/src/index.js index 8aba1ee..9a3cd56 100644 --- a/src/index.js +++ b/src/index.js @@ -20,7 +20,7 @@ const router = createBrowserRouter([ element:
|---|