diff --git a/main.py b/main.py index 567ea70..86fbb6d 100644 --- a/main.py +++ b/main.py @@ -431,7 +431,7 @@ class BeamlineEditor(QtWidgets.QMainWindow, Ui_BeamlineGUI): self.lines[tar] = copy.deepcopy(self.flattenSingleLine(node_id, case_num=case_num)) # generate the proto list self.PL.generateLayout(self.lines) - self.plrecs = [self.PL.info[ele] for ele in self.PL.order if len(self.PL.info[ele]['Prefix']) > 5] + self.plrecs = [self.PL.info[ele] for ele in self.PL.order]# if len(self.PL.info[ele]['Prefix']) > 5] populate_table(self.UIProtoList, self.plrecs) self.tabWidget.setCurrentIndex(1) @@ -455,7 +455,8 @@ class BeamlineEditor(QtWidgets.QMainWindow, Ui_BeamlineGUI): def unwrap(self, name, node_id,line,case_num) -> bool : if self.verbose: - print('Unwrapping Line: %s' % name) # this is a container -> checked in flattenSingleLine + print('Unwrapping Line: %s' % name, node_id) + # this is a container -> checked in flattenSingleLine tree=self.editor.flatten(node_id,case_num) # get the tree secondBranch = False # default go along primary branch for ele in tree.path: diff --git a/protoliste.py b/protoliste.py index a232df7..21d9721 100644 --- a/protoliste.py +++ b/protoliste.py @@ -256,7 +256,6 @@ class ProtoListe(ApplicationTemplate): def writeMarker(self,ele): - if not ele.Name in self.info.keys() and len(ele.Name) > 4: name = ele.Prefix + '-' + ele.Name domain = self.getDomain(name)