Skip to content

Enhancements to Visualizer #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evanheller wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Enhancements to Visualizer #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6752211
Adding STORMfinder-like interactive parameter editing/fitting to Visu…
evanheller Jun 14, 2018
67f7cf6
Handle check for daopath environment variable correctly. Reset image …
evanheller Jun 15, 2018
b11ef24
Update to input checking to avoid crash.
evanheller Jun 15, 2018
3939546
Added threads for DAX analysis. Minor changes naming of files.
evanheller Jun 19, 2018
84a3d48
Updating of batch processing functionality.
evanheller Jun 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions storm_analysis/sa_utilities/batch_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def batchAnalysis(analysis_exe, input_directory, output_directory, multi_xml, ma
minimum_length = 100

# FIXME: Should also handle .tif movies?
dax_files = glob.glob(input_directory + "*.dax")
dax_files = glob.glob(input_directory + "/*.dax")

# Figure out which movies to analyze.
cmd_lines = []
Expand All @@ -26,7 +26,7 @@ def batchAnalysis(analysis_exe, input_directory, output_directory, multi_xml, ma

print("Analyzing:", movie_file)
basename = os.path.basename(movie_file)
mlistname = output_directory + "/" + basename[:-4] + "_mlist.bin"
mlistname = output_directory + "/" + basename[:-4] + ".h5"
cmd_lines.append(['python', analysis_exe,
"--movie", movie_file,
"--bin", mlistname,
Expand Down
10 changes: 5 additions & 5 deletions storm_analysis/visualizer/qtRangeSlider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class QRangeSlider(QtWidgets.QWidget):
"""
Range Slider super class.
"""

doubleClick = QtCore.pyqtSignal()
rangeChanged = QtCore.pyqtSignal(float, float)

Expand Down Expand Up @@ -87,7 +87,7 @@ def keyPressEvent(self, event):
self.emitRange()
self.updateDisplayValues()
self.update()

def mouseDoubleClickEvent(self, event):
#self.emit(QtCore.SIGNAL("doubleClick()"))
self.doubleClick.emit()
Expand Down Expand Up @@ -133,7 +133,7 @@ def mousePressEvent(self, event):
self.start_display_min = self.display_min
self.start_display_max = self.display_max
self.start_pos = pos

def mouseReleaseEvent(self, event):
if not (self.moving == "none"):
self.emitRange()
Expand Down Expand Up @@ -181,7 +181,7 @@ class QHRangeSlider(QRangeSlider):
"""
Horizontal Range Slider.
"""

def __init__(self, slider_range = None, values = None, parent = None):
QRangeSlider.__init__(self, slider_range, values, parent)
if (not parent):
Expand Down Expand Up @@ -265,7 +265,7 @@ def rangeSliderSize(self):
if (__name__ == "__main__"):

import sys

class Parameters:
def __init__(self):
self.x_pixels = 200
Expand Down
Loading