jfjoch_viewer: Fit to window of image is now default when size of the grid changes
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 7m8s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 8m9s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 8m20s
Build Packages / Generate python client (push) Successful in 31s
Build Packages / Build documentation (push) Successful in 1m6s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m23s
Build Packages / build:rpm (rocky8) (push) Successful in 14m37s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 14m54s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 14m54s
Build Packages / build:rpm (rocky9) (push) Successful in 15m1s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m38s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 9m31s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 10m56s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 8m50s
Build Packages / Generate python client (pull_request) Successful in 22s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 9m38s
Build Packages / Build documentation (pull_request) Successful in 42s
Build Packages / Create release (pull_request) Has been skipped
Build Packages / build:rpm (rocky8) (pull_request) Successful in 9m48s
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 9m57s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 10m55s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 8m50s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 11m8s
Build Packages / Unit tests (push) Successful in 1h29m22s
Build Packages / Unit tests (pull_request) Successful in 1h15m37s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 7m8s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 8m9s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 8m20s
Build Packages / Generate python client (push) Successful in 31s
Build Packages / Build documentation (push) Successful in 1m6s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m23s
Build Packages / build:rpm (rocky8) (push) Successful in 14m37s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 14m54s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 14m54s
Build Packages / build:rpm (rocky9) (push) Successful in 15m1s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m38s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 9m31s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 10m56s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 8m50s
Build Packages / Generate python client (pull_request) Successful in 22s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 9m38s
Build Packages / Build documentation (pull_request) Successful in 42s
Build Packages / Create release (pull_request) Has been skipped
Build Packages / build:rpm (rocky8) (pull_request) Successful in 9m48s
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 9m57s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 10m55s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 8m50s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 11m8s
Build Packages / Unit tests (push) Successful in 1h29m22s
Build Packages / Unit tests (pull_request) Successful in 1h15m37s
This commit is contained in:
@@ -4,6 +4,7 @@ This is an UNSTABLE release.
|
||||
|
||||
* jfjoch_viewer: Fix bug when resolution estimation/B-Factor/Profile radius were not set (NaN)
|
||||
* jfjoch_viewer: Show spots is off by default, resolution ring mode is enabled by default
|
||||
* jfjoch_viewer: Fit to window of image is now default when size of the grid changes
|
||||
|
||||
## 1.0.0-rc.107
|
||||
This is an UNSTABLE release.
|
||||
|
||||
@@ -698,11 +698,16 @@ void JFJochImage::fitToView() {
|
||||
}
|
||||
|
||||
void JFJochImage::fitToViewShorterSideOnce() {
|
||||
if (initial_fit_done_)
|
||||
if (initial_fit_done_ && prev_H == H && prev_W == W)
|
||||
return;
|
||||
|
||||
|
||||
if (W == 0 || H == 0 || !viewport())
|
||||
return;
|
||||
|
||||
prev_H = H;
|
||||
prev_W = W;
|
||||
|
||||
// Guard against tiny or zero viewport (happens before layout settles)
|
||||
const QSize vp = viewport()->size();
|
||||
if (vp.width() < 8 || vp.height() < 8) {
|
||||
|
||||
@@ -35,6 +35,7 @@ protected:
|
||||
double scale_factor = 1.0;
|
||||
|
||||
size_t W = 0, H = 0;
|
||||
size_t prev_W = 0, prev_H = 0;
|
||||
|
||||
// Track initial fit state and last image size
|
||||
bool initial_fit_done_ = false;
|
||||
|
||||
Reference in New Issue
Block a user