aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-07-03 16:29:44 +0200
committerThomas White <taw@physics.org>2020-07-29 18:53:45 +0200
commit2f3670d8fe5fbef48c5d323e617b3e3913708b0e (patch)
treebaffe32081e1c75211f4c7de15269a702d0c2a11
parentac7e3f165635c5f9b39ec314b3b0647d11ec1ddb (diff)
Reset zoom when loading new data
If the image size changes, bad things happen.
-rw-r--r--src/crystfel_gui.c1
-rw-r--r--src/crystfelimageview.c8
-rw-r--r--src/crystfelimageview.h2
3 files changed, 11 insertions, 0 deletions
diff --git a/src/crystfel_gui.c b/src/crystfel_gui.c
index 370d901a..e18dae41 100644
--- a/src/crystfel_gui.c
+++ b/src/crystfel_gui.c
@@ -372,6 +372,7 @@ static void finddata_response_sig(GtkWidget *dialog, gint resp,
proj->unsaved = 1;
proj->cur_frame = 0;
+ crystfel_image_view_reset_zoom(CRYSTFEL_IMAGE_VIEW(proj->imageview));
update_imageview(proj);
update_peaks(proj);
diff --git a/src/crystfelimageview.c b/src/crystfelimageview.c
index 45a0bf96..8334cb2e 100644
--- a/src/crystfelimageview.c
+++ b/src/crystfelimageview.c
@@ -807,6 +807,14 @@ int crystfel_image_view_set_image(CrystFELImageView *iv,
}
+void crystfel_image_view_reset_zoom(CrystFELImageView *iv)
+{
+ iv->detector_w = 1.0;
+ iv->detector_h = 1.0;
+ iv->zoom = -1.0;
+}
+
+
void crystfel_image_view_set_brightness(CrystFELImageView *iv,
double brightness)
{
diff --git a/src/crystfelimageview.h b/src/crystfelimageview.h
index d17f394f..90c406b7 100644
--- a/src/crystfelimageview.h
+++ b/src/crystfelimageview.h
@@ -103,6 +103,8 @@ extern GtkWidget *crystfel_image_view_new(void);
extern int crystfel_image_view_set_image(CrystFELImageView *iv,
const struct image *image);
+extern void crystfel_image_view_reset_zoom(CrystFELImageView *iv);
+
extern void crystfel_image_view_set_brightness(CrystFELImageView *iv,
double brightness);