Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new 7 instruments #617

Merged
merged 6 commits into from
Feb 1, 2018
Merged

Add new 7 instruments #617

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2baac0f
BC-271 BC-Instruments
Lunga001 Jan 30, 2018
dd2bf3e
Changelog
Lunga001 Jan 30, 2018
2a48ff2
Merge branch 'master' into BC-Instruments2
Lunga001 Jan 31, 2018
09f32b8
Changelog
Lunga001 Jan 31, 2018
93c05cb
Update CHANGES.rst
xispa Feb 1, 2018
35e7a75
Merge branch 'master' into BC-Instruments2
xispa Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Changelog

**Added**

- Added 7 new Instruments
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is not explanatory about the changes included in this Pull Request. Please, add a line for each instrument with the number of Pull Request, like:

- #617 Instrument import interface: Shimadzu GCMS-QP2010 SE
- #617 Instrument import interface: Shimadzu GCMS-TQ8030 GC/MS/MS
- #617 Instrument import interface: Shimadzu ICPE-9000 Multitype
...

This way is easy later to find out which instruments are supported and since when, just by doing a quick search for "Instrument import interface".

- #618 When previewing stickers the number of copies to print for each sticker can be modified.
- #618 The default number of sticker copies can be set and edited in the setup Sticker's tab.

Expand Down
20 changes: 19 additions & 1 deletion bika/lims/exportimport/instruments/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
import inspect

# from generic import xml
from agilent.masshunter import quantitative
from agilent.masshunter import quantitative, masshunter
from abbott.m2000rt import m2000rt
from foss.fiastar import fiastar
from foss.winescan import auto
from foss.winescan import ft120
from generic import two_dimension
from thermoscientific.gallery import Ts9861x
from thermoscientific.arena import xt20
from thermoscientific.multiskan import go
Expand All @@ -27,6 +28,9 @@
from rochecobas.taqman import model48
from rochecobas.taqman import model96
from sealanalytical.aq2 import aq2
from shimadzu.gcms import qp2010se, tq8030
from shimadzu.icpe import multitype
from shimadzu.nexera import LC2040C, LCMS8050
from horiba.jobinyvon import icp
from abaxis.vetscan import vs2
from scilvet.abc import plus
Expand All @@ -38,6 +42,7 @@

__all__ = ['abaxis.vetscan.vs2',
'abbott.m2000rt.m2000rt',
'agilent.masshunter.masshunter',
'agilent.masshunter.quantitative',
'alere.pima.beads',
'alere.pima.cd4',
Expand All @@ -47,6 +52,7 @@
'foss.fiastar.fiastar',
'foss.winescan.auto',
'foss.winescan.ft120',
'generic.two_dimension',
# 'generic.xml',
'horiba.jobinyvon.icp',
'rigaku.supermini.wxrf',
Expand All @@ -58,6 +64,11 @@
'lifetechnologies.qubit.qubit',
'sysmex.xs.i500',
'sysmex.xs.i1000',
'shimadzu.icpe.multitype',
'shimadzu.gcms.qp2010se',
'shimadzu.gcms.tq8030',
'shimadzu.nexera.LC2040C',
'shimadzu.nexera.LCMS8050',
'scilvet.abc.plus',
'sealanalytical.aq2.aq2',
'tescan.tima.tima',
Expand All @@ -72,6 +83,7 @@
PARSERS = [
['abaxis.vetscan.vs2', 'AbaxisVetScanCSVVS2Parser'],
['abbott.m2000rt.m2000rt', 'Abbottm2000rtTSVParser'],
['agilent.masshunter.masshunter', 'AgilentMasshunterParser'],
['agilent.masshunter.quantitative', 'MasshunterQuantCSVParser'],
['alere.pima.beads', 'AlerePimaSLKParser'],
['alere.pima.cd4', 'AlerePimacd4SLKParser'],
Expand All @@ -81,6 +93,7 @@
['foss.fiastar.fiastar', 'FOSSFIAStarCSVParser'],
['foss.winescan.auto', 'WinescanAutoCSVParser'],
['foss.winescan.ft120', 'WinescanFT120CSVParser'],
['generic.two_dimension', 'TwoDimensionCSVParser'],
# ['generic.xml', ''],
['horiba.jobinyvon.icp', 'HoribaJobinYvonCSVParser'],
['rigaku.supermini.wxrf', 'RigakuSuperminiWXRFCSVParser'],
Expand All @@ -92,6 +105,11 @@
['lifetechnologies.qubit.qubit', 'QuBitCSVParser'],
['sysmex.xs.i500', 'SysmexXS500iCSVParser'],
['sysmex.xs.i1000', 'SysmexXS500iCSVParser'],
['shimadzu.icpe.multitype', 'ICPEMultitypeCSVParser'],
['shimadzu.gcms.qp2010se', 'GCMSQP2010SECSVParser'],
['shimadzu.gcms.tq8030', 'GCMSTQ8030GCMSMSCSVParser'],
['shimadzu.nexera.LC2040C', 'TSVParser'],
['shimadzu.nexera.LCMS8050', 'TSVParser'],
['scilvet.abc.plus', 'AbaxisVetScanCSVVS2Parser'],
['sealanalytical.aq2.aq2', 'SealAnalyticsAQ2CSVParser'],
['tescan.tima.tima', 'TimaCSVParser'],
Expand Down
Loading