Added a Data Channel Table to Tiled Browser #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…r class in it. All the code containing the plot window has been commented out.
…or PyMca_Icons.py
… icon on it eventually.
…The key value pair for the former was the TiledDataSource.SOURCE_TYPE and TiledDataSource.TiledDataSource. The later was TiledDataSource.SOURCE_TYPE and QTiledWidget.TiledBrowser
… the specific path to the directory.
…a in the QDispatcher.
…s clicked the Tiled Browser will be opened in the tab.
…py seems necessary if we want a Tiled Tab which holds the Tiled Browser. There may be a module we can reference in Tiled repo in TiledFile.py or maybe instead of TiledFiled.py.
…inherits the ScanWindow class.
…leared if a different scan is selected.
…thods to add, replace, and remove scans. The methods need to be completed.
PyMca5/PyMcaGui/pymca/McaWindow.py
Outdated
Comment on lines
50
to
51
| from PyMca5.PyMcaGui.pymca import ScanWindow | ||
| from PyMca5.PyMcaGui.pymca import McaCalibrationControlGUI |
There was a problem hiding this comment.
In the spirit of minimizing changes to the upstream source code.
Suggested change
| from PyMca5.PyMcaGui.pymca import ScanWindow | |
| from PyMca5.PyMcaGui.pymca import McaCalibrationControlGUI | |
| from PyMca5.PyMcaGui.pymca import McaCalibrationControlGUI | |
| from PyMca5.PyMcaGui.pymca.ScanWindow import ScanWindow |
PyMca5/PyMcaGui/pymca/McaWindow.py
Outdated
| @@ -74,15 +74,16 @@ | |||
| # _logger.setLevel(logging.DEBUG | |||
|
|
|||
|
|
|||
| class McaWindow(ScanWindow): | |||
| def __init__(self, parent=None, name="Mca Window", specfit=None, backend=None, | |||
| class McaWindow(ScanWindow.ScanWindow): | |||
There was a problem hiding this comment.
In coordination with the change above to the import statement...
Suggested change
| class McaWindow(ScanWindow.ScanWindow): | |
| class McaWindow(ScanWindow): |
Comment on lines
11
to
12
| sigTiledDataChannelTableSignal = qt.pyqtSignal(object) | ||
| def __init__(self, parent=None): |
There was a problem hiding this comment.
[Formatting for clarity]
Suggested change
| sigTiledDataChannelTableSignal = qt.pyqtSignal(object) | |
| def __init__(self, parent=None): | |
| sigTiledDataChannelTableSignal = qt.pyqtSignal(object) | |
| def __init__(self, parent=None): |
Comment on lines
55
to
56
| for i in range(n): | ||
| self._addLine(i, channelList[i]) |
There was a problem hiding this comment.
Pythonic loop permits a more descriptive name for the list item.
Suggested change
| for i in range(n): | |
| self._addLine(i, channelList[i]) | |
| for (i, channelLabel) in enumerate(channelList): | |
| self._addLine(i, channelLabel) |
| item.setFlags(qt.Qt.ItemIsEnabled) | ||
|
|
||
| # Checkboxes | ||
| for j in range(1, 4): |
There was a problem hiding this comment.
Rather than hard-code the number of columns here, perhaps this value can be extracted from a table property; something like this?
Suggested change
| for j in range(1, 4): | |
| for j in range(1, self.columnCount()): |
| # 'x' column | ||
| if col == 1: | ||
| if ddict["state"]: | ||
| if row not in self.xSelection: |
There was a problem hiding this comment.
We should think about replacing this list-based logic with set-based logic. That can wait until a future discussion though.
Comment on lines
+132
to
+137
| if i in self.xSelection: | ||
| if not widget.isChecked(): | ||
| widget.setChecked(True) | ||
| else: | ||
| if widget.isChecked(): | ||
| widget.setChecked(False) |
There was a problem hiding this comment.
Possible simplification... see whether you find this more or less clear.
Suggested change
| if i in self.xSelection: | |
| if not widget.isChecked(): | |
| widget.setChecked(True) | |
| else: | |
| if widget.isChecked(): | |
| widget.setChecked(False) | |
| widget.setChecked( | |
| i in self.xSelection | |
| and not widget.isChecked() | |
| ) |
PyMca5/PyMcaCore/TiledDataSource.py
Outdated
Comment on lines
24
to
29
| def __init__(self, nameInput): | ||
| self.nameList = nameInput | ||
| self.source_type = SOURCE_TYPE | ||
| self.__sourceNameList = self.__sourceNameList | ||
| self._sourceObjectList = [] | ||
| self.refresh() |
There was a problem hiding this comment.
I think I see a few problems here:
- Need to verify that
nameInputis alist. - self.__sourceNameList is self-defined (cyclic assignment)
- self.NameList should be defined
Here is a suggestion, based on NexusDataSource.
Suggested change
| def __init__(self, nameInput): | |
| self.nameList = nameInput | |
| self.source_type = SOURCE_TYPE | |
| self.__sourceNameList = self.__sourceNameList | |
| self._sourceObjectList = [] | |
| self.refresh() | |
| def __init__(self, nameInput): | |
| if isinstance(nameInput, list): | |
| nameList = nameInput | |
| else: | |
| nameList = [nameInput] | |
| self.sourceName = [] | |
| self.source_type = SOURCE_TYPE | |
| self.__sourceNameList = self. self.sourceName | |
| self._sourceObjectList = [] | |
| self.refresh() |
PyMca5/PyMcaCore/TiledDataSource.py
Outdated
| sourcename=sys.argv[1] | ||
| key =sys.argv[2] | ||
| except Exception: | ||
| print("Usage: NexusDataSource <file> <key>") |
There was a problem hiding this comment.
Suggested change
| print("Usage: NexusDataSource <file> <key>") | |
| print("Usage: TiledDataSource <url> <resource-path>") |
PyMca5/PyMcaCore/TiledDataSource.py
Outdated
Comment on lines
34
to
95
| def getSourceInfo(self): | ||
| """ | ||
| Returns a dictionary with the key "KeyList" (list of all available keys | ||
| in this source). Each element in "KeyList" has the form 'n1.n2' where | ||
| n1 is the source number and n2 entry number in file both starting at 1. | ||
| """ | ||
| return self.__getSourceInfo() | ||
|
|
||
| def __getSourceInfo(self): | ||
| SourceInfo={} | ||
| SourceInfo["SourceType"]=SOURCE_TYPE | ||
| SourceInfo["KeyList"]=[] | ||
| i = 0 | ||
| for sourceObject in self._sourceObjectList: | ||
| i+=1 | ||
| nEntries = len(sourceObject["/"].keys()) | ||
| for n in range(nEntries): | ||
| SourceInfo["KeyList"].append("%d.%d" % (i,n+1)) | ||
| SourceInfo["Size"]=len(SourceInfo["KeyList"]) | ||
| return SourceInfo | ||
|
|
||
| def getKeyInfo(self, key): | ||
| if key in self.getSourceInfo()['KeyList']: | ||
| return self.__getKeyInfo(key) | ||
| else: | ||
| #should we raise a KeyError? | ||
| _logger.debug("Error key not in list ") | ||
| return {} | ||
|
|
||
| def __getKeyInfo(self,key): | ||
| try: | ||
| index, entry = key.split(".") | ||
| index = int(index)-1 | ||
| entry = int(entry)-1 | ||
| except Exception: | ||
| #should we rise an error? | ||
| _logger.debug("Error trying to interpret key = %s", key) | ||
| return {} | ||
|
|
||
| sourceObject = self._sourceObjectList[index] | ||
| info = {} | ||
| info["SourceType"] = SOURCE_TYPE | ||
| #doubts about if refer to the list or to the individual file | ||
| info["SourceName"] = self.sourceName[index] | ||
| info["Key"] = key | ||
| #specific info of interest | ||
| info['FileName'] = sourceObject.name | ||
| return info | ||
|
|
||
| def getDataObject(self): | ||
| pass | ||
|
|
||
| def isUpdated(self, sourceName, key): | ||
| #sourceName is redundant? | ||
| index, entry = key.split(".") | ||
| index = int(index)-1 | ||
| lastmodified = os.path.getmtime(self.__sourceNameList[index]) | ||
| if lastmodified != self.__lastKeyInfo[key]: | ||
| self.__lastKeyInfo[key] = lastmodified | ||
| return True | ||
| else: | ||
| return False |
There was a problem hiding this comment.
I realize that this is coming from mostly from the NexusDataSource example. It looks like this will need to get modified with the results coming out of the QTiledWidget if I'm following it correctly.
…er. Still need to connect them to functions.
… text entered after a scan has been selected.
…ledDataSource needs to be completed to plot scans.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Data Channels can now be selected in Tiled Browser. Added methods to connect "ADD", "REPLACE", and "REMOVE" buttons.