From afaf9c91b5266ea20ea9b37d335202dda922c458 Mon Sep 17 00:00:00 2001 From: rafalkowalewski1 Date: Wed, 25 Sep 2024 14:58:05 +0200 Subject: [PATCH 1/4] one click installer fix - update pyinstaller --- release/one_click_windows_gui/create_installer_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/one_click_windows_gui/create_installer_windows.bat b/release/one_click_windows_gui/create_installer_windows.bat index beaebe8b..a72da579 100644 --- a/release/one_click_windows_gui/create_installer_windows.bat +++ b/release/one_click_windows_gui/create_installer_windows.bat @@ -13,7 +13,7 @@ call python setup.py sdist bdist_wheel call cd release/one_click_windows_gui call pip install "../../dist/picassosr-0.7.2-py3-none-any.whl" -call pip install pyinstaller==5.7 +call pip install pyinstaller==5.12 call pyinstaller ../pyinstaller/picasso.spec -y --clean call pyinstaller ../pyinstaller/picassow.spec -y --clean call conda deactivate From 94cd55ed67fe01c6f24f901812490a23ed87ea11 Mon Sep 17 00:00:00 2001 From: rafalkowalewski1 Date: Wed, 2 Oct 2024 15:32:59 +0200 Subject: [PATCH 2/4] localize GUI FIX --- picasso/gui/localize.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/picasso/gui/localize.py b/picasso/gui/localize.py index 2c485923..8d315845 100644 --- a/picasso/gui/localize.py +++ b/picasso/gui/localize.py @@ -1924,7 +1924,7 @@ def run(self): if self.use_gpufit: self.progressMade.emit(1, 1) theta = gausslq.fit_spots_gpufit(spots) - em = self.camera_info["gain"] > 1 + em = self.camera_info["Gain"] > 1 locs = gausslq.locs_from_fits_gpufit( self.identifications, theta, self.box, em ) @@ -1937,7 +1937,7 @@ def run(self): ) time.sleep(0.2) theta = gausslq.fits_from_futures(fs) - em = self.camera_info["gain"] > 1 + em = self.camera_info["Gain"] > 1 locs = gausslq.locs_from_fits(self.identifications, theta, self.box, em) elif self.method == "mle": curr, thetas, CRLBs, llhoods, iterations = gaussmle.gaussmle_async( @@ -1963,7 +1963,7 @@ def run(self): self.progressMade.emit(round(N * lib.n_futures_done(fs) / n_tasks), N) time.sleep(0.2) theta = avgroi.fits_from_futures(fs) - em = self.camera_info["gain"] > 1 + em = self.camera_info["Gain"] > 1 locs = avgroi.locs_from_fits(self.identifications, theta, self.box, em) else: print("This should never happen...") From 06fb7841a5fddf32423b20ac850cdf1c5ebb60de Mon Sep 17 00:00:00 2001 From: rafalkowalewski1 Date: Thu, 3 Oct 2024 10:08:45 +0200 Subject: [PATCH 3/4] CLEAN --- changelog.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.rst b/changelog.rst index 3e551a23..9626d883 100644 --- a/changelog.rst +++ b/changelog.rst @@ -1,9 +1,9 @@ Changelog ========= -Last change: 19-SEP-2024 MTS +Last change: 02-OCT-2024 MTS -0.7.1 - 0.7.2 +0.7.1 - 0.7.3 ------------- - SMLM clusterer in picked regions deleted - Show legend in Render property displayed rounded tick label values From ee55307a84f972e0221dd694b145d0b477f0de09 Mon Sep 17 00:00:00 2001 From: rafalkowalewski1 Date: Thu, 3 Oct 2024 10:08:54 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=200.7.2=20=E2=86=92=200.7.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- distribution/picasso.iss | 4 ++-- docs/conf.py | 2 +- picasso/__init__.py | 2 +- picasso/__version__.py | 2 +- release/one_click_windows_gui/create_installer_windows.bat | 2 +- release/one_click_windows_gui/picasso_innoinstaller.iss | 4 ++-- setup.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index d905e322..4a32aa0c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.7.2 +current_version = 0.7.3 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? diff --git a/distribution/picasso.iss b/distribution/picasso.iss index 78e1008b..b348b3e8 100644 --- a/distribution/picasso.iss +++ b/distribution/picasso.iss @@ -2,10 +2,10 @@ AppName=Picasso AppPublisher=Jungmann Lab, Max Planck Institute of Biochemistry -AppVersion=0.7.2 +AppVersion=0.7.3 DefaultDirName={commonpf}\Picasso DefaultGroupName=Picasso -OutputBaseFilename="Picasso-Windows-64bit-0.7.2" +OutputBaseFilename="Picasso-Windows-64bit-0.7.3" ArchitecturesAllowed=x64 ArchitecturesInstallIn64BitMode=x64 diff --git a/docs/conf.py b/docs/conf.py index 147bb3c6..3e5b94db 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -26,7 +26,7 @@ # The short X.Y version version = "" # The full version, including alpha/beta/rc tags -release = "0.7.2" +release = "0.7.3" # -- General configuration --------------------------------------------------- diff --git a/picasso/__init__.py b/picasso/__init__.py index dd8d0476..13e48c82 100644 --- a/picasso/__init__.py +++ b/picasso/__init__.py @@ -8,7 +8,7 @@ import os.path as _ospath import yaml as _yaml -__version__ = "0.7.2" +__version__ = "0.7.3" _this_file = _ospath.abspath(__file__) _this_dir = _ospath.dirname(_this_file) diff --git a/picasso/__version__.py b/picasso/__version__.py index 98011931..996c86f6 100644 --- a/picasso/__version__.py +++ b/picasso/__version__.py @@ -1 +1 @@ -VERSION_NO = "0.7.2" +VERSION_NO = "0.7.3" diff --git a/release/one_click_windows_gui/create_installer_windows.bat b/release/one_click_windows_gui/create_installer_windows.bat index a72da579..f935ae94 100644 --- a/release/one_click_windows_gui/create_installer_windows.bat +++ b/release/one_click_windows_gui/create_installer_windows.bat @@ -11,7 +11,7 @@ call conda activate picasso_installer call python setup.py sdist bdist_wheel call cd release/one_click_windows_gui -call pip install "../../dist/picassosr-0.7.2-py3-none-any.whl" +call pip install "../../dist/picassosr-0.7.3-py3-none-any.whl" call pip install pyinstaller==5.12 call pyinstaller ../pyinstaller/picasso.spec -y --clean diff --git a/release/one_click_windows_gui/picasso_innoinstaller.iss b/release/one_click_windows_gui/picasso_innoinstaller.iss index 69d1ddae..23ba5673 100644 --- a/release/one_click_windows_gui/picasso_innoinstaller.iss +++ b/release/one_click_windows_gui/picasso_innoinstaller.iss @@ -1,10 +1,10 @@ [Setup] AppName=Picasso AppPublisher=Jungmann Lab, Max Planck Institute of Biochemistry -AppVersion=0.7.2 +AppVersion=0.7.3 DefaultDirName={commonpf}\Picasso DefaultGroupName=Picasso -OutputBaseFilename="Picasso-Windows-64bit-0.7.2" +OutputBaseFilename="Picasso-Windows-64bit-0.7.3" ArchitecturesAllowed=x64 ArchitecturesInstallIn64BitMode=x64 diff --git a/setup.py b/setup.py index 9898d5e1..9e36657c 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="picassosr", - version="0.7.2", + version="0.7.3", author="Joerg Schnitzbauer, Maximilian T. Strauss, Rafal Kowalewski", author_email=("joschnitzbauer@gmail.com, straussmaximilian@gmail.com, rafalkowalewski998@gmail.com"), url="https://github.com/jungmannlab/picasso",