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.

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

mzmltableview and configviewer #57

Open
wants to merge 339 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
339 commits
Select commit Hold shift + click to select a range
a689f68
Docstring
tillenglert Jun 12, 2020
be8f6bf
Update Layout
SevvalliThavapalan Jun 13, 2020
fc732e1
weekly update
Philipp707 Jun 13, 2020
7f040b4
updated pictures
Philipp707 Jun 13, 2020
f12dc1a
Updated Page
Philipp707 Jun 13, 2020
a6d28d0
weekly update
Philipp707 Jun 13, 2020
7367930
pic update
Philipp707 Jun 13, 2020
e165209
update index
Philipp707 Jun 13, 2020
bd967f6
small update
Jun 13, 2020
5ff7ef9
bugfix for Label-Btn
Jun 13, 2020
0aa2380
update zu bugs
Philipp707 Jun 13, 2020
0d6331f
Update Window and Readme
SevvalliThavapalan Jun 14, 2020
174f7f0
Update Readme
SevvalliThavapalan Jun 14, 2020
c343818
Changed button names
SevvalliThavapalan Jun 16, 2020
2d52c92
little renaming and restructuring
Jun 17, 2020
0a76a81
Added type hinting, changed some docstring, classname
tillenglert Jun 17, 2020
2ab65c2
Bugfix Remove Button
tillenglert Jun 19, 2020
56c6c11
Removed debugging print of dataframe
tillenglert Jun 19, 2020
f0b5a66
Starting config XML Tree Viewer
tillenglert Jun 19, 2020
8f60a58
added timers + small bugfix
Jun 19, 2020
813d646
added a button
Jun 19, 2020
90a4f20
Update Readme
SevvalliThavapalan Jun 21, 2020
9cc9d05
Update Readme
SevvalliThavapalan Jun 21, 2020
71be80e
Readme
SevvalliThavapalan Jun 21, 2020
c4e410d
Readme
SevvalliThavapalan Jun 21, 2020
f818106
small fix
SevvalliThavapalan Jun 21, 2020
535856d
again small fix
SevvalliThavapalan Jun 21, 2020
903d540
implemented filter
wrthfl Jun 21, 2020
d8f04ca
Merge branch 'search_filter' into dev
wrthfl Jun 21, 2020
041afec
fixed .md files based on markdownlints warnings
wrthfl Jun 21, 2020
591fef9
updated week7
Philipp707 Jun 21, 2020
d0c185a
PDB debugging in docs
tillenglert Jun 21, 2020
68b2ed4
Merge branch 'docs'
tillenglert Jun 21, 2020
c15fdf4
Some additions
tillenglert Jun 21, 2020
e30db31
Added example file and some functionality
tillenglert Jun 21, 2020
e9cd257
week 7 done
tillenglert Jun 21, 2020
b4141a8
Merge remote-tracking branch 'origin/master'
tillenglert Jun 21, 2020
0db13b6
The xml is now displayed properly in the widget
tillenglert Jun 22, 2020
2daca48
Descriptions added
tillenglert Jun 22, 2020
2267ee6
little UI update
Jun 22, 2020
57c493a
Some QoL updates, added advanced button
tillenglert Jun 22, 2020
078b1c2
Merge remote-tracking branch 'origin/ConfigurationViewXML' into Confi…
tillenglert Jun 22, 2020
ed830a3
Added checkbox again
tillenglert Jun 22, 2020
efb026e
Some debugging on the advanced checkbox option
tillenglert Jun 22, 2020
9f14475
added menubar
Jun 22, 2020
d2bc8ac
some additions
tillenglert Jun 22, 2020
41f0457
reimplemented the load descriptions
tillenglert Jun 22, 2020
4b1fded
changed column behavior and window size
Jun 22, 2020
a6e05ef
Merge branch 'ConfigurationViewXML' of https://github.com/wrthfl/pyop…
Jun 22, 2020
a343220
Show advanced parameters checkbox is now working
tillenglert Jun 22, 2020
f245b65
Merge remote-tracking branch 'origin/ConfigurationViewXML' into Confi…
tillenglert Jun 22, 2020
1f98eab
removed debugging column advanced
tillenglert Jun 22, 2020
3e0f3ba
Added Docstring and Typehinting
tillenglert Jun 22, 2020
d5f5a12
Layout and small style fixes
SevvalliThavapalan Jun 23, 2020
096aebf
deleted advanced header
Jun 23, 2020
bcf3786
column update
Jun 23, 2020
aedca2f
update column behavior
Jun 23, 2020
fc46835
added check for valid dataframes
wrthfl Jun 24, 2020
0b4f1d4
Merge branch 'ConfigurationViewXML' into dev
wrthfl Jun 24, 2020
56724d7
Merge branch 'dev'
wrthfl Jun 24, 2020
4cf8e1f
Delete .DS_Store
tillenglert Jun 24, 2020
372523b
Delete .DS_Store
tillenglert Jun 24, 2020
b5a1b68
Delete .DS_Store
tillenglert Jun 24, 2020
d022310
Delete .DS_Store
tillenglert Jun 24, 2020
fa3b7ee
Delete .DS_Store
tillenglert Jun 24, 2020
aed0a1c
Update .gitignore
wrthfl Jun 24, 2020
da8ce22
Delete .DS_Store
tillenglert Jun 24, 2020
b99e580
moved example files to example directory
wrthfl Jun 24, 2020
af26ec9
removed example data
wrthfl Jun 24, 2020
e4a65ab
Merge branch 'dev'
wrthfl Jun 24, 2020
fa8d5ce
moved ini from apps to examples/data
wrthfl Jun 24, 2020
b127f00
Merge remote-tracking branch 'origin/master'
wrthfl Jun 24, 2020
0c2e018
Update Readme
SevvalliThavapalan Jun 25, 2020
25b4530
Update Readme
SevvalliThavapalan Jun 25, 2020
f9530f9
Implemented the communication from table to dataframe
tillenglert Jun 25, 2020
42a1bba
Merge branch 'Dataframe_Connection'
tillenglert Jun 25, 2020
3030313
added App
Jun 26, 2020
d33c790
Delete Final Box.py
Jun 26, 2020
a0d58ec
Create Final Box.py
Jun 26, 2020
9475583
Update Final Box
SevvalliThavapalan Jun 26, 2020
5801016
Readme week 8
SevvalliThavapalan Jun 27, 2020
080451d
Week 8 Progress for XMLViewer
tillenglert Jun 27, 2020
b1e4e56
Week 8 Progress for TableView
tillenglert Jun 27, 2020
7884b8d
Added Fasta Viewer
SevvalliThavapalan Jun 27, 2020
bf46faf
Merge remote-tracking branch 'origin/dev' into dev
wrthfl Jun 27, 2020
dd3416f
moved teamproject specific content from readme to docs
wrthfl Jun 27, 2020
5da351e
changes for pull request
wrthfl Jun 27, 2020
fe73f98
changes for pull request
wrthfl Jun 27, 2020
968cc85
Merge branch 'master' into pull-request
wrthfl Jun 27, 2020
cfd4597
Added files from other groups
SevvalliThavapalan Jun 28, 2020
0441bb2
Added Specviewer to Finalbox
SevvalliThavapalan Jun 28, 2020
1952b06
changes according to codefactor errors/warnings
wrthfl Jun 28, 2020
8f0906e
Merge remote-tracking branch 'origin/pull-request' into pull-request
wrthfl Jun 28, 2020
bee31dd
some fixes according to circle cis failed tests
wrthfl Jun 28, 2020
394cb43
changes according to circle cis failed test
wrthfl Jun 28, 2020
15244a3
small change to test circle cis test
wrthfl Jun 28, 2020
08738af
changes according to circle cis failed tests
wrthfl Jun 28, 2020
a6eb7bd
changes according to circle cis failed test
wrthfl Jun 28, 2020
228d5b6
changes according to circle cis failed tests
wrthfl Jun 28, 2020
461dcd4
changes according to circle cis failed tests
wrthfl Jun 28, 2020
0be6e54
Defused XML before parsing
tillenglert Jun 28, 2020
d86f706
Merge branch 'superbox' into dev
tillenglert Jun 30, 2020
ede38c4
Implemented recursive draw Tree function, editable, defusedxml
tillenglert Jun 30, 2020
7db2361
removed unnecessary imports
tillenglert Jun 30, 2020
006f4ae
Merge remote-tracking branch 'origin/dev' into dev
tillenglert Jun 30, 2020
18ce2d2
Clean up imports
tillenglert Jul 1, 2020
b995dc2
Added noqa for module import
tillenglert Jul 2, 2020
5987512
Implementation of: Editable fields, save
tillenglert Jul 2, 2020
d667c4a
implemented update-function for table filter
wrthfl Jul 4, 2020
263867d
implemented update-function for tablefilter
wrthfl Jul 4, 2020
6374663
Config View refactoring
tillenglert Jul 4, 2020
43b6493
Update GUI TableEditor
SevvalliThavapalan Jul 5, 2020
0b39b30
Removed debugging printouts in console
tillenglert Jul 5, 2020
8006021
Reduced minimum changed characters to 2 in filter table
tillenglert Jul 5, 2020
220ae6a
Implemented sorting of columns
tillenglert Jul 5, 2020
73a3496
Revert Timeit bug in fraction (TableView)
tillenglert Jul 6, 2020
232b3e2
Revert Timeit bug in fraction (TableView)
tillenglert Jul 6, 2020
31885e4
Merge remote-tracking branch 'origin/dev' into dev
tillenglert Jul 6, 2020
438283a
Ini default in config view
tillenglert Jul 6, 2020
edcb9eb
prepared the pr
wrthfl Jul 6, 2020
8de0bd6
Merge branch 'master' into pull-request
timosachsenberg Jul 6, 2020
fe9c9ec
added drag and drop
wrthfl Jul 6, 2020
2adfb07
removed pckq, circleci and vscode artifacts
wrthfl Jul 6, 2020
7c68948
Merge remote-tracking branch 'origin/pull-request' into pull-request
wrthfl Jul 6, 2020
06464c5
mzml removed
wrthfl Jul 6, 2020
4300c11
Update App
SevvalliThavapalan Jul 7, 2020
31a0236
Added last widget to the main app
SevvalliThavapalan Jul 8, 2020
a42075b
ConfigView: Added the Buttons to add Item to Itemlist
tillenglert Jul 8, 2020
bf2a8fe
Drag and Drop for ConfigView
tillenglert Jul 9, 2020
fc4c146
console debug lines
tillenglert Jul 9, 2020
a06bb99
Added Docstring for ConfigView
tillenglert Jul 9, 2020
1f29352
Removed unnecessary imports
tillenglert Jul 9, 2020
5963e46
file drop
wrthfl Jul 9, 2020
6dc721a
Merge remote-tracking branch 'origin/dev' into dev
wrthfl Jul 9, 2020
235b6f3
Added all files which are needed, except experimental design
SevvalliThavapalan Jul 12, 2020
d8f1098
added run option
Jul 12, 2020
e9b768d
added drag and drop functionality to tableeditor
wrthfl Jul 13, 2020
8ebc0de
Merge remote-tracking branch 'origin/dev' into dev
wrthfl Jul 13, 2020
7c9f55b
added file for example
wrthfl Jul 13, 2020
1ff5518
added tsv that were deleted by faulty gitignore config
wrthfl Jul 13, 2020
5c85004
Added the files for the ProteomicsLFQ workflow
tillenglert Jul 13, 2020
33826c2
Added Tooltips to all buttons in both widgets
tillenglert Jul 13, 2020
bbcdde1
ToolTips for checkbox and search field
tillenglert Jul 13, 2020
b501838
Merge remote-tracking branch 'origin/dev' into dev
wrthfl Jul 13, 2020
d79f5ec
Drag n Drop fix für ConfigView
tillenglert Jul 13, 2020
6e5a067
remove debuggig print
tillenglert Jul 16, 2020
b330851
Updated the run function to be easier to work with
tillenglert Jul 16, 2020
8a5a9d6
Docstrings
tillenglert Jul 16, 2020
d988deb
Changes in Import/Export functions to avoid parse error
tillenglert Jul 16, 2020
73b64b9
added ini to exaple processing
tillenglert Jul 16, 2020
c09affa
erased timeit
Jul 17, 2020
ac86622
Update ProteinQuantification.py
Jul 17, 2020
9f93b60
Protein Quantification inputfiles now dependent on Exp Design
tillenglert Jul 17, 2020
802b98f
Made all widgets accessible
tillenglert Jul 17, 2020
08904b9
Added mzTab view when finished processing
tillenglert Jul 17, 2020
68949a9
Update ProteinQuantification.py
Jul 17, 2020
8141d83
Implemented SpecViewerWidget
tillenglert Jul 17, 2020
701fb36
Moved initdefaultvalue into initvars
tillenglert Jul 18, 2020
f1c4c34
Load project
SevvalliThavapalan Jul 18, 2020
492d769
Load Project
SevvalliThavapalan Jul 18, 2020
a3615b6
Update Load projet
SevvalliThavapalan Jul 18, 2020
f05dd6a
mzML refactoring extract method from loadbtn
tillenglert Jul 18, 2020
37bbccd
Load project
SevvalliThavapalan Jul 18, 2020
5a12a88
small pathfix for saveFunction
Jul 18, 2020
22435f4
fixed some save problems
Jul 18, 2020
bc53aa2
Added the project directory to the specviewer
tillenglert Jul 18, 2020
2b7aa72
Generic runfunction done
tillenglert Jul 18, 2020
39aea6c
Update load .ini file
SevvalliThavapalan Jul 19, 2020
f0e6309
update saveProject
Jul 19, 2020
69e87dd
Refactorings loadproject, general
tillenglert Jul 19, 2020
1894965
fixed drag and drop eventhandling in TableEditor.py
wrthfl Jul 20, 2020
baa368c
Merge branch 'dev' into pull-request
wrthfl Jul 20, 2020
485f233
replaced local files with remote files to resolve pr merge conflicts
wrthfl Jul 20, 2020
eabdcf4
replaced local file with remote file from master
wrthfl Jul 20, 2020
54a0862
small beauty update
Jul 23, 2020
4b6695e
added dark theme and theme toggler
wrthfl Jul 24, 2020
20488e2
fixed themeloading
wrthfl Jul 24, 2020
4e3183a
Added the choose output popup window
tillenglert Jul 24, 2020
669a999
Added docstring and some stylefixes
SevvalliThavapalan Jul 24, 2020
7da8230
Stylefixes
SevvalliThavapalan Jul 24, 2020
4790511
Changed config in example data
tillenglert Jul 27, 2020
0bd97a8
updated gitignore in pr branch removed folder generated by run process
wrthfl Jul 27, 2020
4025b78
Merge branch 'dev' into pull-request
wrthfl Jul 28, 2020
3e0f4b3
added pycache folders to gitignore
wrthfl Jul 28, 2020
af3a893
added filedialog for output folder
wrthfl Jul 28, 2020
9190449
Merge remote-tracking branch 'origin/dev' into dev
wrthfl Jul 28, 2020
d22b246
remove data_Prot folder
wrthfl Jul 28, 2020
5fc7de3
Merge branch 'dev' into pull-request
wrthfl Jul 28, 2020
32393f1
fixes to output dir query
wrthfl Jul 28, 2020
cbb4115
more fixes to output dir query
wrthfl Jul 28, 2020
3884b1d
more changes
wrthfl Jul 28, 2020
2f84408
hopefully final change
wrthfl Jul 28, 2020
5088df7
added while loop to type check for spaces in filepath since proteomic…
wrthfl Jul 28, 2020
fbf108a
added some fluff like an error message
wrthfl Jul 28, 2020
0288998
Merge branch 'dev' into pull-request
wrthfl Jul 28, 2020
fe4deb3
removed big fasta file
wrthfl Jul 28, 2020
c326dbd
Started to write and design Welcome tab
SevvalliThavapalan Jul 29, 2020
7305b60
Update welcome tab
SevvalliThavapalan Jul 29, 2020
1613fbd
small stylefix
Jul 30, 2020
aed1ec5
small fix
Jul 30, 2020
16461be
update on load project
Jul 30, 2020
e52e458
Some stylechanges, update welcome tab + Icon
tillenglert Jul 30, 2020
b5457a1
Update Welcome tab
tillenglert Jul 31, 2020
4de6d09
did some editing and typesetting for the welcome page. replaced lineb…
wrthfl Jul 31, 2020
b09303d
changed layout
wrthfl Jul 31, 2020
3a65b17
removed linebreak after header
wrthfl Jul 31, 2020
349717c
bugfix loadbtn
tillenglert Jul 31, 2020
f131d7b
more changes to layout
wrthfl Jul 31, 2020
fe09ec3
Merge remote-tracking branch 'origin/dev' into dev
wrthfl Jul 31, 2020
85cab33
edited text
wrthfl Jul 31, 2020
7502451
Some stylefixes
SevvalliThavapalan Jul 31, 2020
525e0c4
Added text to the welcome tab
SevvalliThavapalan Jul 31, 2020
b91ac4c
Removed some unnecessary lines
SevvalliThavapalan Jul 31, 2020
94178a2
Welcome Tab update
tillenglert Jul 31, 2020
5c414f1
Icon larger
tillenglert Jul 31, 2020
904a041
implemented/fixed drag and drop for configview and experimental design
wrthfl Jul 31, 2020
0e0be30
Merge remote-tracking branch 'origin/dev' into dev
wrthfl Jul 31, 2020
09042e5
added drag and drop for fasta-viewer
wrthfl Jul 31, 2020
0ba5695
added checks for fasta drag and drop since loadFile in GUI_FastaViewe…
wrthfl Jul 31, 2020
21d5048
tweaked light theme a little
wrthfl Jul 31, 2020
11a661e
Merge branch 'dev' into pull-request
wrthfl Jul 31, 2020
6fb58dd
Disabled load button in fasta viewer
SevvalliThavapalan Jul 31, 2020
fc0b221
added urlhandler for different os
wrthfl Jul 31, 2020
2fef6cd
Merge remote-tracking branch 'origin/dev' into dev
wrthfl Jul 31, 2020
4fdd528
Merge branch 'dev' into pull-request
wrthfl Jul 31, 2020
a58892f
Bugfix in configview to change outputfiles
tillenglert Jul 31, 2020
2690a5b
added support for drag and drop with tsv/csv tables
wrthfl Jul 31, 2020
237f480
Merge remote-tracking branch 'origin/dev' into dev
wrthfl Jul 31, 2020
b60d236
switched out faulty mzmltableview file
wrthfl Jul 31, 2020
bf51506
Merge branch 'dev' into pull-request
wrthfl Jul 31, 2020
2d75f4a
Merge branch 'master' into pull-request
wrthfl Jul 31, 2020
cd6fc4d
some stupid changes that are bad and will soon be deleted
wrthfl Jul 31, 2020
3c1bf3f
fixed a conditional that would display warnings otherwise
wrthfl Jul 31, 2020
30c916b
Some Stylefixes
SevvalliThavapalan Aug 1, 2020
d0883ae
Merge remote-tracking branch 'origin/dev' into dev
wrthfl Aug 2, 2020
fc25f40
removed the menu and replaced it with a loadbutton
wrthfl Aug 2, 2020
81e7d51
Merge branch 'dev' into pull-request
wrthfl Aug 2, 2020
8f0b2ab
Some Stylefixes
SevvalliThavapalan Aug 2, 2020
83b5f59
added drag and drop functionality for specviewer.
wrthfl Aug 2, 2020
c13c854
Merge remote-tracking branch 'origin/dev' into dev
wrthfl Aug 2, 2020
568b948
refactoring for drag and drop error messages
wrthfl Aug 2, 2020
b0d21ee
removed the empty string default parameter in fillTable
wrthfl Aug 2, 2020
30e19a4
Merge branch 'dev' into pull-request
wrthfl Aug 2, 2020
61c0b7d
changed shortcut
wrthfl Aug 2, 2020
798d36e
added docs folder to gitignore
wrthfl Aug 2, 2020
889873f
removed docs
wrthfl Aug 2, 2020
94b8100
refactoring
wrthfl Aug 2, 2020
851f7bc
Merge branch 'dev' into pull-request
wrthfl Aug 2, 2020
27d88fe
changed docstring
wrthfl Aug 2, 2020
46731f2
Merge branch 'master' into pull-request
wrthfl Aug 13, 2020
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
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.idea
.pyc
.DS_Store
*.idea
*.pyc
*.DS_Store
*.tmp
**/__pycache__/
45 changes: 24 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
pyOpenMS Extra
=============

pyOpenMS are the Python bindings to the OpenMS open-source C++ library for
LC-MS data management and analyses. The Python bindings cover a large part of
the OpenMS API to enable rapid algorithm development and workflow development.
pyOpenMS supports the Proteomics Standard Initiative (PSI) formats for MS data.

These utils contain documentation, installation instructions and example code
that show the different functions of pyOpenMS.

Installation
=============

Installation is best done through [PyPI](https://pypi.python.org/pypi/pyopenms)
(the Python package index) where binary packages are provided for the release
versions of OpenMS, covering Linux/Mac/Windows.

Documentation
=============
The pyOpenMS documentation is also contained in this repository, see [docs/README.md](docs/README.md)
# pyOpenMS Extra

=============

pyOpenMS are the Python bindings to the OpenMS open-source C++ library for
LC-MS data management and analyses. The Python bindings cover a large part of
the OpenMS API to enable rapid algorithm development and workflow development.
pyOpenMS supports the Proteomics Standard Initiative (PSI) formats for MS data.

These utils contain documentation, installation instructions and example code
that show the different functions of pyOpenMS.

## Installation

=============

Installation is best done through [PyPI](https://pypi.python.org/pypi/pyopenms)
(the Python package index) where binary packages are provided for the release
versions of OpenMS, covering Linux/Mac/Windows.

## Documentation

=============
The pyOpenMS documentation is also contained in this repository, see [documentation/README.md](docs/README.md)
3 changes: 2 additions & 1 deletion src/apps/FLASHDeconvViewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
QDialogButtonBox,
)
from matplotlib import cm
from pyqtgraph import PlotWidget
from pyqtgraph import PlotWidget # noqa: E402


sys.path.insert(0, "../view/")
from SpecViewer import ScanBrowserWidget, App
Expand Down
2 changes: 1 addition & 1 deletion src/apps/IDViewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
)

sys.path.insert(0, "../view")
from ControllerWidget import ControllerWidget
from ControllerWidget import ControllerWidget # noqa: E402

# structure for annotation (here for reference)
PeakAnnoStruct = namedtuple(
Expand Down
Binary file added src/apps/Icons/IconOpenMS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/apps/Icons/load_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/apps/Icons/open.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/apps/Icons/run.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/apps/Icons/run_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/apps/Icons/save.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/apps/Icons/save_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading