Commit d57837bd authored by Thomas White's avatar Thomas White
Browse files

Rename displaywindow.{c,h} -> dw-hdfsee.{c,h}, remove dw-geomatic.{c,h}

parent 8e8cd379
......@@ -50,7 +50,7 @@ endif
if HAVE_GTK
src_hdfsee_SOURCES = src/hdfsee.c src/displaywindow.c src/render.c \
src_hdfsee_SOURCES = src/hdfsee.c src/dw-hdfsee.c src/render.c \
src/hdf5-file.c src/utils.c src/image.c src/filters.c \
src/thread-pool.c src/detector.c
endif
......
......@@ -129,14 +129,14 @@ am_src_get_hkl_OBJECTS = src/get_hkl.$(OBJEXT) src/sfac.$(OBJEXT) \
src_get_hkl_OBJECTS = $(am_src_get_hkl_OBJECTS)
src_get_hkl_LDADD = $(LDADD)
src_get_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
am__src_hdfsee_SOURCES_DIST = src/hdfsee.c src/displaywindow.c \
am__src_hdfsee_SOURCES_DIST = src/hdfsee.c src/dw-hdfsee.c \
src/render.c src/hdf5-file.c src/utils.c src/image.c \
src/filters.c src/thread-pool.c src/detector.c
@HAVE_GTK_TRUE@am_src_hdfsee_OBJECTS = src/hdfsee.$(OBJEXT) \
@HAVE_GTK_TRUE@ src/displaywindow.$(OBJEXT) \
@HAVE_GTK_TRUE@ src/render.$(OBJEXT) src/hdf5-file.$(OBJEXT) \
@HAVE_GTK_TRUE@ src/utils.$(OBJEXT) src/image.$(OBJEXT) \
@HAVE_GTK_TRUE@ src/filters.$(OBJEXT) src/thread-pool.$(OBJEXT) \
@HAVE_GTK_TRUE@ src/dw-hdfsee.$(OBJEXT) src/render.$(OBJEXT) \
@HAVE_GTK_TRUE@ src/hdf5-file.$(OBJEXT) src/utils.$(OBJEXT) \
@HAVE_GTK_TRUE@ src/image.$(OBJEXT) src/filters.$(OBJEXT) \
@HAVE_GTK_TRUE@ src/thread-pool.$(OBJEXT) \
@HAVE_GTK_TRUE@ src/detector.$(OBJEXT)
src_hdfsee_OBJECTS = $(am_src_hdfsee_OBJECTS)
src_hdfsee_LDADD = $(LDADD)
......@@ -598,7 +598,7 @@ src_indexamajig_SOURCES = src/indexamajig.c src/hdf5-file.c \
src/dirax.c src/mosflm.c src/reflections.c src/templates.c \
src/symmetry.c src/geometry.c src/thread-pool.c \
src/beam-parameters.c src/reflist.c $(am__append_4)
@HAVE_GTK_TRUE@src_hdfsee_SOURCES = src/hdfsee.c src/displaywindow.c src/render.c \
@HAVE_GTK_TRUE@src_hdfsee_SOURCES = src/hdfsee.c src/dw-hdfsee.c src/render.c \
@HAVE_GTK_TRUE@ src/hdf5-file.c src/utils.c src/image.c src/filters.c \
@HAVE_GTK_TRUE@ src/thread-pool.c src/detector.c
......@@ -842,7 +842,7 @@ src/get_hkl$(EXEEXT): $(src_get_hkl_OBJECTS) $(src_get_hkl_DEPENDENCIES) src/$(a
$(AM_V_CCLD)$(LINK) $(src_get_hkl_OBJECTS) $(src_get_hkl_LDADD) $(LIBS)
src/hdfsee.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/displaywindow.$(OBJEXT): src/$(am__dirstamp) \
src/dw-hdfsee.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/hdfsee$(EXEEXT): $(src_hdfsee_OBJECTS) $(src_hdfsee_DEPENDENCIES) src/$(am__dirstamp)
@rm -f src/hdfsee$(EXEEXT)
......@@ -935,7 +935,7 @@ mostlyclean-compile:
-rm -f src/diffraction-gpu.$(OBJEXT)
-rm -f src/diffraction.$(OBJEXT)
-rm -f src/dirax.$(OBJEXT)
-rm -f src/displaywindow.$(OBJEXT)
-rm -f src/dw-hdfsee.$(OBJEXT)
-rm -f src/estimate_background.$(OBJEXT)
-rm -f src/filters.$(OBJEXT)
-rm -f src/geometry.$(OBJEXT)
......@@ -983,7 +983,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/diffraction-gpu.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/diffraction.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dirax.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/displaywindow.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dw-hdfsee.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/estimate_background.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/filters.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/geometry.Po@am__quote@
......
This diff is collapsed.
/*
* dw-geomatic.h
*
* GUI geometry calibration
*
* (c) 2006-2011 Thomas White <taw@physics.org>
*
* Part of CrystFEL - crystallography with a FEL
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifndef DW_GEOMATIC_H
#define DW_GEOMATIC_H
#include <gtk/gtk.h>
#include "cell.h"
#include "reflist.h"
struct gmdialog {
GtkWidget *window;
GtkWidget *entry;
};
typedef struct {
GtkWidget *window;
GtkWidget *drawingarea;
GtkUIManager *ui;
GtkActionGroup *action_group;
GdkPixbuf *pixbuf;
gulong motion_callback;
struct hdfile *hdfile;
struct image *image;
int width;
int height;
double boostint;
/* Dialog boxes */
struct gmdialog *boostint_dialog;
int show_col_scale;
int scale;
GdkPixbuf *col_scale;
double motion_origx;
double motion_origy;
UnitCell *cell;
double pos_x;
double pos_y;
double pos_z;
} DWGeomatic;
/* Return an image display window showing the given filename, or NULL */
extern DWGeomatic *geomatic_open(const char *filename);
#endif /* DW_GEOMATICs_H */
/*
* displaywindow.c
* dw-hdfsee.c
*
* Quick yet non-crappy HDF viewer
*
......@@ -21,7 +21,7 @@
#include <cairo.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "displaywindow.h"
#include "dw-hdfsee.h"
#include "render.h"
#include "hdf5-file.h"
#include "hdfsee.h"
......
/*
* displaywindow.h
* dw-hdfsee.h
*
* Quick yet non-crappy HDF viewer
*
......
......@@ -17,7 +17,7 @@
#include <gtk/gtk.h>
#include <getopt.h>
#include "displaywindow.h"
#include "dw-hdfsee.h"
#include "utils.h"
#include "render.h"
......
......@@ -17,7 +17,7 @@
#ifndef HDFSEE_H
#define HDFSEE_H
#include "displaywindow.h"
#include "dw-hdfsee.h"
extern void hdfsee_window_closed(DisplayWindow *dw);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment