aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2019-07-16 11:43:26 +0200
committerThomas White <taw@physics.org>2019-07-16 11:43:26 +0200
commit30fd08a502f59c30315a06ba595ff3a3aaf78a5f (patch)
treeb9e5265cfe32875c214ff2e081e2f5f6afccce15
parent1fb9ee9b38a970982ae9bed949dff155f6bbbbee (diff)
hdfsee: Get rid of "simple"
-rw-r--r--src/dw-hdfsee.c4
-rw-r--r--src/dw-hdfsee.h2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c
index 0ff40918..4fbae1ad 100644
--- a/src/dw-hdfsee.c
+++ b/src/dw-hdfsee.c
@@ -1555,7 +1555,7 @@ static gint displaywindow_set_calibmode(GtkWidget *d, DisplayWindow *dw)
w = gtk_ui_manager_get_widget(dw->ui,
"/ui/displaywindow/tools/calibmode");
- if ( dw->simple ) {
+ if ( dw->geom_filename == NULL ) {
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(w), 0);
return 0;
}
@@ -2959,7 +2959,6 @@ DisplayWindow *displaywindow_open(char *filename, char *geom_filename,
dw->boostint = 1;
dw->motion_callback = 0;
dw->numbers_window = NULL;
- dw->simple = 0;
dw->image = NULL;
dw->show_rings = show_rings;
dw->show_peaks = 0;
@@ -3084,7 +3083,6 @@ DisplayWindow *displaywindow_open(char *filename, char *geom_filename,
element);
}
check = imagefile_read_simple(dw->imagefile, dw->image);
- dw->simple = 1;
}
if ( check ) {
ERROR("Couldn't load file\n");
diff --git a/src/dw-hdfsee.h b/src/dw-hdfsee.h
index a7871654..5a545936 100644
--- a/src/dw-hdfsee.h
+++ b/src/dw-hdfsee.h
@@ -100,8 +100,6 @@ typedef struct {
int not_ready_yet;
- int simple;
-
struct imagefile *imagefile;
struct image *image;
int peaktype;