Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fix-types-remove-any
Browse files Browse the repository at this point in the history
  • Loading branch information
targos committed Oct 23, 2023
2 parents 4276d66 + 8cb92df commit 30f349b
Show file tree
Hide file tree
Showing 101 changed files with 3,037 additions and 1,435 deletions.
1,679 changes: 839 additions & 840 deletions package-lock.json

Large diffs are not rendered by default.

51 changes: 26 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"react-dom": ">=18.0.0"
},
"dependencies": {
"@blueprintjs/core": "^5.3.3",
"@blueprintjs/core": "^5.5.1",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@lukeed/uuid": "^2.0.1",
Expand All @@ -70,7 +70,7 @@
"file-saver": "^2.0.5",
"filelist-utils": "^1.10.2",
"formik": "^2.4.5",
"immer": "^10.0.2",
"immer": "^10.0.3",
"jszip": "^3.10.1",
"lodash": "^4.17.21",
"ml-airpls": "^1.0.2",
Expand All @@ -81,17 +81,17 @@
"ml-baseline-correction-regression": "^1.0.2",
"ml-conrec": "^5.0.2",
"ml-gsd": "^12.1.3",
"ml-matrix": "^6.10.5",
"ml-spectra-processing": "^12.5.1",
"ml-matrix": "^6.10.6",
"ml-spectra-processing": "^12.6.0",
"ml-stat": "^1.3.3",
"multiplet-analysis": "^2.1.2",
"nmr-correlation": "^2.3.3",
"nmr-load-save": "^0.21.0",
"nmr-processing": "^11.1.1",
"nmr-load-save": "^0.22.4",
"nmr-processing": "^11.4.1",
"nmredata": "^0.9.7",
"numeral": "^2.0.6",
"openchemlib": "^8.5.0",
"openchemlib-utils": "^5.3.0",
"openchemlib": "^8.7.1",
"openchemlib-utils": "^5.4.0",
"papaparse": "^5.4.1",
"re-resizable": "6.9.11",
"react-d3-utils": "^1.0.0",
Expand All @@ -110,41 +110,42 @@
"react-transition-group": "^4.4.5",
"react-use": "^17.4.0",
"smart-array-filter": "^4.0.2",
"yup": "^1.3.1"
"yup": "^1.3.2"
},
"devDependencies": {
"@babel/plugin-transform-modules-commonjs": "^7.23.0",
"@babel/preset-react": "^7.22.15",
"@babel/preset-typescript": "^7.23.0",
"@playwright/test": "^1.38.1",
"@babel/preset-typescript": "^7.23.2",
"@playwright/test": "^1.39.0",
"@simbathesailor/use-what-changed": "^2.0.0",
"@types/d3": "^7.4.1",
"@types/node": "^20.7.0",
"@types/papaparse": "^5.3.9",
"@types/react": "^18.2.23",
"@types/react-dom": "^18.2.8",
"@types/react-table": "^7.7.16",
"@types/d3": "^7.4.2",
"@types/lodash": "^4.14.200",
"@types/node": "^20.8.7",
"@types/papaparse": "^5.3.10",
"@types/react": "^18.2.29",
"@types/react-dom": "^18.2.14",
"@types/react-table": "^7.7.17",
"@vitejs/plugin-react-swc": "^3.4.0",
"@vitest/coverage-v8": "^0.34.5",
"@vitest/coverage-v8": "^0.34.6",
"cross-env": "^7.0.3",
"cspell": "^7.3.6",
"eslint": "^8.50.0",
"cspell": "^7.3.8",
"eslint": "^8.51.0",
"eslint-config-cheminfo-react": "^10.0.0",
"eslint-config-cheminfo-typescript": "^12.0.4",
"modern-normalize": "^2.0.0",
"postcss-styled-syntax": "^0.5.0",
"prettier": "^3.0.3",
"rc-menu": "^9.12.0",
"rc-menu": "^9.12.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.16.0",
"react-router-dom": "^6.17.0",
"rimraf": "^5.0.5",
"rollup-plugin-analyzer": "^4.0.0",
"serve": "^14.2.1",
"stylelint": "^15.10.3",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"typescript": "^5.2.2",
"vite": "^4.4.9",
"vitest": "^0.34.5"
"vite": "^4.5.0",
"vitest": "^0.34.6"
}
}
41 changes: 41 additions & 0 deletions public/data/brukerFolders/alphaIonone.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"data": {
"spectra": [
{
"sourceSelector": {
"files": [
"data/brukerFolders/alphaIonone.zip/alphaIonone/3/acqu2s",
"data/brukerFolders/alphaIonone.zip/alphaIonone/3/acqus",
"data/brukerFolders/alphaIonone.zip/alphaIonone/3/pdata/1/procs",
"data/brukerFolders/alphaIonone.zip/alphaIonone/3/pdata/1/proc2s",
"data/brukerFolders/alphaIonone.zip/alphaIonone/3/pdata/1/2rr",
"data/brukerFolders/alphaIonone.zip/alphaIonone/3/pdata/1/2ri",
"data/brukerFolders/alphaIonone.zip/alphaIonone/3/pdata/1/2ir",
"data/brukerFolders/alphaIonone.zip/alphaIonone/3/pdata/1/2ii"
]
},
"filters": [],
"display": {
"isPositiveVisible": true,
"isNegativeVisible": true,
"isVisible": true,
"dimension": 2
},
"zones": {
"values": [],
"options": {}
}
}
],
"molecules": [],
"source": {
"baseURL": "",
"entries": [
{
"relativePath": "data/brukerFolders/alphaIonone.zip"
}
]
}
},
"version": 4
}
Binary file added public/data/brukerFolders/alphaIonone.zip
Binary file not shown.
Binary file added public/data/oxfordInstruments/ethylCrotonate.zip
Binary file not shown.
174 changes: 174 additions & 0 deletions public/data/oxfordInstruments/oxfordCosy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
{
"data": {
"source": {
"baseURL": "",
"entries": [
{
"relativePath": "data/oxfordInstruments/ethylCrotonate.zip"
}
]
},
"spectra": [
{
"sourceSelector": {
"files": [
"data/oxfordInstruments/ethylCrotonate.zip/Ethyl Crotonate, 1H-1H COSY.jdx"
]
},
"filters": [
{
"name": "blpDimension1",
"label": "Backward-LP Dimension 1",
"value": {},
"flag": true,
"isDeleteAllow": true
},
{
"name": "apodizationDimension1",
"label": "Apodization on Dimension 1",
"value": {
"compose": {
"shapes": [
{
"shape": {
"kind": "sineBell",
"options": {
"offset": 0,
"exponent": 2
}
}
}
]
},
"apply": true
},
"flag": true,
"isDeleteAllow": true
},
{
"name": "fftDimension1",
"label": "FFT Dimension 1",
"value": {
"phaseCorrection": {
"mode": "mc"
},
"zeroFilling": {
"nbPoints": 2048
}
},
"flag": true,
"isDeleteAllow": true
},
{
"name": "flpDimension2",
"label": "Forward-LP Dimension 2",
"value": {},
"flag": true,
"isDeleteAllow": true
},
{
"name": "apodizationDimension2",
"label": "Apodization on Dimension 2",
"value": {
"compose": {
"shapes": [
{
"shape": {
"kind": "sineBell",
"options": {
"offset": 0,
"exponent": 2
}
}
}
]
},
"apply": true
},
"flag": true,
"isDeleteAllow": true
},
{
"name": "fftDimension2",
"label": "FFT Dimension 2",
"value": {
"phaseCorrection": {
"mode": "mc"
},
"zeroFilling": {
"nbPoints": 2048
}
},
"flag": true,
"isDeleteAllow": true
},
{
"name": "symmetrizeCosyLike",
"label": "symmetrize COSY-like",
"value": {},
"flag": true,
"isDeleteAllow": true
}
]
},
{
"sourceSelector": {
"files": [
"data/oxfordInstruments/ethylCrotonate.zip/Ethyl Crotonate, 1H FID.jdx"
]
},
"filters": [
{
"name": "backwardLinearPrediction",
"label": "Backward Linear Prediction Filter",
"value": {
"nbInputs": 16384
},
"flag": true,
"isDeleteAllow": true
},
{
"name": "apodization",
"label": "Apodization",
"value": {
"lineBroadening": 1,
"gaussBroadening": 0,
"lineBroadeningCenter": 0
},
"flag": true,
"isDeleteAllow": true
},
{
"name": "zeroFilling",
"label": "Zero Filling",
"value": {
"nbPoints": 32768
},
"flag": true,
"isDeleteAllow": true
},
{
"name": "fft",
"label": "FFT",
"value": {},
"flag": true,
"isDeleteAllow": true
},
{
"name": "phaseCorrection",
"label": "Phase correction",
"value": {
"ph0": -126,
"ph1": 0,
"absolute": false
},
"flag": true,
"isDeleteAllow": true
}
]
}
],
"molecules": []
},
"version": 5
}
Loading

0 comments on commit 30f349b

Please sign in to comment.