NiBAx update of visualization components #235
Conversation
There was a problem hiding this comment.
@gurayerus Thanks for this PR. I propose to split it into multiple PRs. Specifically, the relocation of dataio and each individual plugin should be in a separate PR.
Some additional comments:
- changes in
.gitignoreshould be in a separate PR - please use
git mvto move files (e.g. the dictionaries) to avoid them appearing as new - avoid desabling plugins, instead implement
dataioincoreand make changes in existing plugins, then add your plugins through a new PR
.gitignore
Outdated
| **/__pycache__/ No newline at end of file | ||
| .* | ||
| __pycache__ | ||
| !.gitignore |
There was a problem hiding this comment.
This should be a separate PR.
| #def GetData(self,roi,hue): | ||
| #"""Returns a subset of data needed for plot. | ||
| #Takes as parameters the roi and hue for the plot. | ||
| #Since the plot always uses 'Age' for X axis, this is always returned.""" | ||
| #if not isinstance(roi, list): | ||
| #roi = [roi] |
There was a problem hiding this comment.
No need to comment out; either remove or keep
| #d = self.data[roi + ["Age",hue]] | ||
| #return d | ||
|
|
There was a problem hiding this comment.
No need to comment out; either remove or keep
| @@ -32,7 +32,7 @@ def __init__(self, parent=None, width=5, height=4, dpi=100): | |||
|
|
|||
| self.setLayout(QtWidgets.QVBoxLayout()) | |||
|
|
|||
| self.layout().addWidget(self.toolbar) | |||
| #self.layout().addWidget(self.toolbar) | |||
There was a problem hiding this comment.
No need to comment out; either remove or keep
| self.ui.tabWidget.insertTab(value.getTabPosition(),value,key) | ||
| break | ||
|
|
||
| self.ui.tabWidget.setCurrentIndex(0) # always display first tab | ||
|
|
||
| if dataFile is not None: | ||
| # if datafile provided on cmd line, load it | ||
| self.Plugins['Load and Save Data'].ReadData(dataFile) | ||
| #self.Plugins['Table View'].ReadData(dataFile) |
| ## Include Mac menu bar | ||
| #self.ui.menuFile.setMenuRole(QAction.NoRole) | ||
| #self.ui.actionOpen.setMenuRole(QAction.NoRole) | ||
| #self.ui.actionSave.setMenuRole(QAction.NoRole) |
There was a problem hiding this comment.
This is necessary for proper functioning on macOS. This should not be commented out.
| #def _createMenuBar(self): | ||
| #menuBar = self.menuBar() | ||
| ## Creating menus using a QMenu object | ||
| #fileMenu = QMenu("&File", self) | ||
| #menuBar.addMenu(fileMenu) | ||
| ## Creating menus using a title | ||
| #editMenu = menuBar.addMenu("&Edit") | ||
| #helpMenu = menuBar.addMenu("&Help") |
There was a problem hiding this comment.
No need to comment out; either remove or keep
Changes required for moving dataio to core
Only in NiBAx/NiBAx/core: dataio.py ## This file is just moved
Only in NiBAx/NiBAx/core: MUSE_DerivedROIs_Mappings.csv ## For now I moved MUSE dict files to core from loadsave
Only in NiBAx/NiBAx/core: MUSE_ROI_Dictionary.csv ## this is temporary and will change
Misc additions
Only in NiBAx/NiBAx/core/gui: CheckableQComboBox.py ## Required as a new visual element
Simple change to disable plugin for now
Only in NiBAxInit/NiBAx/plugins/agetrends: agetrends.yapsy-plugin
Only in NiBAx/NiBAx/plugins/agetrends: agetrends.yapsy-plugin.disabled
Simple change to disable plugin for now
Only in NiBAxInit/NiBAx/plugins/loadsave: loadsave.yapsy-plugin
Only in NiBAx/NiBAx/plugins/loadsave: loadsave.yapsy-plugin.disabled
Additional plugins (independent components)
Only in NiBAx/NiBAx/plugins: distview
Only in NiBAx/NiBAx/plugins: plotview
Only in NiBAx/NiBAx/plugins: tableview
Changes in scripts
Single line change
Files NiBAx/NiBAx/core/plotcanvas.py and NiBAxInit/NiBAx/core/plotcanvas.py differ
Single line change
Files NiBAx/NiBAx/NiBAxCmdApp.py and NiBAxInit/NiBAx/NiBAxCmdApp.py differ
Simple graphic changes (add menu)
Files NiBAx/NiBAx/mainwindow.ui and NiBAxInit/NiBAx/mainwindow.ui differ
Additional functions to differentiate initial data
and data after filtering
This part will require more changes to handle multiple
datasets in a simple way
Files NiBAx/NiBAx/core/model/datamodel.py and NiBAxInit/NiBAx/core/model/datamodel.py differ
File read moved here from loadsave plugin previously
Files NiBAx/NiBAx/mainwindow.py and NiBAxInit/NiBAx/mainwindow.py differ