Skip to content

Commit

Permalink
allow successive slicing of 2D data set with different settings
Browse files Browse the repository at this point in the history
  • Loading branch information
dehoni committed Oct 28, 2023
1 parent 62b3355 commit 0a51118
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/sas/qtgui/Perspectives/Inversion/InversionWidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ def enableButtons(self):
and not self.isCalculating and self.batchResultsWindow is not None)
self.sliceButton.setVisible(not isinstance(self.logic.data, Data2D))
self.sliceButton.setEnabled(not self.isSlicing and isinstance(self.logic.data, Data2D))
#self.sliceButton.setVisible(self.logic.data_is_loaded and self.is2D)
self.sliceButton.setVisible(self.logic.data_is_loaded and self.is2D)
self.removeButton.setEnabled(self.logic.data_is_loaded and not self.isCalculating)
self.explorerButton.setEnabled(self.logic.data_is_loaded and not self.isCalculating)
self.stopButton.setVisible(self.isCalculating)
Expand Down Expand Up @@ -1340,10 +1340,10 @@ def slice(self):
itemList.append(item)
self.parent.communicate.updateModelFromPerspectiveSignal.emit(item)

self.logic.data = GuiUtils.dataFromItem(item)
#self.logic.data = GuiUtils.dataFromItem(item)

self.isBatch = True
self.sendToInversion( itemList, self.isBatch)

self.sendToInversion( itemList)
#self.calculateAllButton.setVisible(True)
self.plot2D.update()
self.sliceList.resizeColumnsToContents()
Expand All @@ -1355,7 +1355,7 @@ def slice(self):
self.enableButtons()
#self.showResultsButton.setVisible(True)

def sendToInversion(self, items, isBatch):
def sendToInversion(self, items):
"""
Send `items` to the Inversion perspective, in either single fit or batch mode
"""
Expand All @@ -1369,7 +1369,7 @@ def sendToInversion(self, items, isBatch):
_ = msgbox.exec_()
return
# icky way to go up the tree
self.parent._current_perspective.setData(data_item=items, is_batch=isBatch)
self.parent._current_perspective.setData(data_item=items, is_batch=True)



Expand Down

0 comments on commit 0a51118

Please sign in to comment.