Skip to content

Commit

Permalink
fix viewer errors
Browse files Browse the repository at this point in the history
  • Loading branch information
azazellochg committed May 17, 2020
1 parent 5f1e2e7 commit ebd0769
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
24 changes: 12 additions & 12 deletions relion/viewers/viewer_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ def _getZoom(self):
zoom = 100
return zoom

def _showImagesInClasses(self):
def _showImagesInClasses(self, param=None):
""" Read Relion _data.star images file and
generate a new metadata with the Xmipp classification standard:
a 'classes' block and a 'class00000?_images' block per class.
Expand All @@ -297,7 +297,7 @@ def _showImagesInClasses(self):

return views

def _showClassesOnly(self):
def _showClassesOnly(self, param=None):
views = []
viewParams = {showj.MODE: showj.MODE_GALLERY,
showj.RENDER: 'rlnReferenceImage',
Expand All @@ -317,7 +317,7 @@ def _showClassesOnly(self):
# showImagesAngularAssignment
# =============================================================================
@protected_show
def _showImagesAngularAssignment(self):
def _showImagesAngularAssignment(self, param=None):
views = []

for it in self._iterations:
Expand All @@ -332,7 +332,7 @@ def _showImagesAngularAssignment(self):
return views

@protected_show
def _showOptimiserFile(self):
def _showOptimiserFile(self, param=None):
views = []

for it in self._iterations:
Expand All @@ -348,7 +348,7 @@ def _showOptimiserFile(self):
# =============================================================================
# showLLRelion
# =============================================================================
def _showLL(self):
def _showLL(self, param=None):
views = []
for it in self._iterations:
fn = self.protocol._getIterData(it)
Expand All @@ -359,7 +359,7 @@ def _showLL(self):
# =============================================================================
# ShowPMax
# =============================================================================
def _showPMax(self):
def _showPMax(self, param=None):
labels = ['rlnIterationNumber', 'rlnAveragePmax',
'rlnLogLikelihood']
tablePMax = Table(columns=labels)
Expand Down Expand Up @@ -389,7 +389,7 @@ def _showPMax(self):
# =============================================================================
# Get classes info per iteration
# =============================================================================
def _plotClassDistribution(self):
def _plotClassDistribution(self, param=None):
labels = ["rlnClassDistribution", "rlnAccuracyRotations"]
if Plugin.IS_GT30():
labels.append("rlnAccuracyTranslationsAngst")
Expand Down Expand Up @@ -470,7 +470,7 @@ def map_index_to_rgb_color(ind):
# =============================================================================
# ShowChanges
# =============================================================================
def _showChanges(self):
def _showChanges(self, param=None):
labels = ['rlnIterationNumber'] + self.protocol.CHANGE_LABELS
tableChanges = Table(columns=labels)

Expand All @@ -497,7 +497,7 @@ def _showChanges(self):
# ShowVolumes
# =============================================================================
@protected_show
def _showVolumes(self):
def _showVolumes(self, param=None):
if self.displayVol == VOLUME_CHIMERA:
return self._showVolumesChimera()
elif self.displayVol == VOLUME_SLICES:
Expand Down Expand Up @@ -546,7 +546,7 @@ def _showVolumesChimera(self):
# showAngularDistribution
# =============================================================================
@protected_show
def _showAngularDistribution(self):
def _showAngularDistribution(self, param=None):
views = []

if self.displayAngDist == ANGDIST_CHIMERA:
Expand Down Expand Up @@ -635,7 +635,7 @@ def _createAngDist2D(self, it):
def _getFigure(self):
return None if self.figure == 0 else 'active'

def _showSSNR(self):
def _showSSNR(self, param=None):
prefixes = self._getPrefixes()
nrefs = len(self._refsList)
n = nrefs * len(prefixes)
Expand Down Expand Up @@ -678,7 +678,7 @@ def _plotSSNR(self, a, fn, table, label):
# =============================================================================
# plotFSC
# =============================================================================
def _showFSC(self):
def _showFSC(self, param=None):
print("Showing FSC for iterations: ", self._iterations)
threshold = self.resolutionThresholdFSC.get()

Expand Down
4 changes: 2 additions & 2 deletions relion/viewers/viewer_ctfrefine.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ def show(self, event=None):
self.plotter.getColorBar(sc2)
self.plotter.show()

def _displayBeamTilt(self):
def _displayBeamTilt(self, param=None):
phaseDifferenceFn = self.protocol.fileWithPhaseDifferenceName()
modelFitFn = self.protocol.fileWithModelFitterName()

Expand Down Expand Up @@ -267,7 +267,7 @@ def createScipionPartView(self, filename):
env=self._env,
viewParams=viewParams)

def _displayParticles(self):
def _displayParticles(self, param=None):
views = []
fn = self.protocol.outputParticles.getFileName()
v = self.createScipionPartView(fn)
Expand Down
8 changes: 4 additions & 4 deletions relion/viewers/viewer_postprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def _showVolumesChimera(self, volPath):
view = ChimeraClientView(volPath)
return [view]

def _showVolume(self):
def _showVolume(self, param=None):
volPath = self.protocol._getExtraPath('postprocess.mrc:mrc')

if self.displayVol == VOLUME_CHIMERA:
Expand All @@ -123,7 +123,7 @@ def _showVolume(self):
elif self.displayVol == VOLUME_SLICES:
return self._showVolumeShowj(volPath)

def _showMaskedVolume(self):
def _showMaskedVolume(self, param=None):
volPath = self.protocol._getExtraPath('postprocess_masked.mrc:mrc')

if self.displayMaskedVol == VOLUME_CHIMERA:
Expand All @@ -138,7 +138,7 @@ def _showMaskedVolume(self):
def _getFigure(self):
return None if self.figure == 0 else 'active'

def _showFSC(self):
def _showFSC(self, param=None):
threshold = self.resolutionThresholdFSC.get()

fscViewer = FscViewer(project=self.protocol.getProject(),
Expand Down Expand Up @@ -172,7 +172,7 @@ def _plotFSC(self, a, model_star, label, legend=None):
# =========================================================================
# plotGuinier
# =========================================================================
def _showGuinier(self):
def _showGuinier(self, param=None):
xplotter = RelionPlotter(windowTitle='Guinier Plot')
a = xplotter.createSubPlot("", 'Angstroms^-2', 'log(Amplitude)',
yformat=False)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
# For a discussion on single-sourcing the version across setup.py and the
# project code, see
# https://packaging.python.org/en/latest/single_source_version.html
version='3.0.0a2', # Required
version='3.0.0a4', # Required

# This is a one-line description or tagline of what your project does. This
# corresponds to the "Summary" metadata field:
Expand Down

0 comments on commit ebd0769

Please sign in to comment.