sherwinp/qubit-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add sample material column and rewrite inosticID column

Browse Source
This commit is contained in:
Sherwin Price
2023-11-21 07:43:48 -05:00
parent 3d2f3fdf2f
commit 5fa13e267f
5 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@@ -1,4 +1,3 @@
<<<<<<< HEAD
Qubit Tool Qubit Tool
Read Qubit CSV dump. Read Qubit CSV dump.
@@ -6,12 +5,3 @@ Read Qubit CSV dump.
Search dump for matching data and include in output. Search dump for matching data and include in output.
Format Output and add to Excel Document Output Tab. Format Output and add to Excel Document Output Tab.
=======
Qubit Tool
Read Qubit CSV dump.
Search dump for matching data and include in output.
Format Output and add to Excel Document Output Tab.
>>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a

5
pyproject.toml
View File

@@ -1,8 +1,3 @@
<<<<<<< HEAD
[build-system] [build-system]
requires = ["setuptools"] requires = ["setuptools"]
=======
[build-system]
requires = ["setuptools"]
>>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
build-backend = "setuptools.build_meta" build-backend = "setuptools.build_meta"

3
qubittool/rowmodel.py
View File

@@ -4,10 +4,7 @@ class RowModel:
self.coordinate = coordinate self.coordinate = coordinate
self.accessionid = accessionid self.accessionid = accessionid
self.customerid = None self.customerid = None
<<<<<<< HEAD
self.materialid = None self.materialid = None
=======
>>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
self.plasmavolml = float(0.0) self.plasmavolml = float(0.0)
self.qubitrunid = None self.qubitrunid = None
self.qubitassay = None self.qubitassay = None

4
qubittool/tool.py
View File

@@ -91,12 +91,8 @@ def write_run_doc(dm:dict, path:str):
for r in dm: for r in dm:
model:RowModel = dm[r] model:RowModel = dm[r]
ix=ix+1 ix=ix+1
<<<<<<< HEAD
fmtId = formatInosticsId( model.get_Id(), model.get_materialid() ) fmtId = formatInosticsId( model.get_Id(), model.get_materialid() )
ws.append([ix, "", fmtId, model.get_customerid(), model.get_plasmavolml(), model.get_qubitrunid(), ws.append([ix, "", fmtId, model.get_customerid(), model.get_plasmavolml(), model.get_qubitrunid(),
=======
ws.append([ix, "", model.get_Id(), model.get_customerid(), model.get_plasmavolml(), model.get_qubitrunid(),
>>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
model.get_sampleconc(), convert_to_GE(model.get_sampleconc())]) model.get_sampleconc(), convert_to_GE(model.get_sampleconc())])
grayFill = PatternFill(start_color='D0CECE', end_color='D0CECE', grayFill = PatternFill(start_color='D0CECE', end_color='D0CECE',

17
setup.cfg
View File

@@ -1,4 +1,3 @@
<<<<<<< HEAD
[metadata] [metadata]
name = qubittool name = qubittool
version = 0.1.0 version = 0.1.0
@@ -13,20 +12,4 @@ install_requires =
pandas pandas
[options.package_data] [options.package_data]
=======
[metadata]
name = qubittool
version = 0.1.0
[options]
packages = find:
zip_safe = True
include_package_data = True
install_requires =
PySimpleGUI >= 4.60
openpyxl >= 3.1
pandas
[options.package_data]
>>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
* = README.md * = README.md