diff options
| author | Thomas White <taw27@cam.ac.uk> | 2008-11-04 16:03:36 +0000 |
|---|---|---|
| committer | Thomas White <taw27@cam.ac.uk> | 2008-11-04 16:03:36 +0000 |
| commit | cb76590c2cb5370aba709cee8a2e0514a9f423ff (patch) | |
| tree | c69d29eb366ab9d524bf5b583e7f27743574dda4 | |
| parent | 4702bbb6ae06a7c51bb2d85a93a651240d166a05 (diff) | |
| parent | 5ae5ffb68747c07d8b4e8b4f0ff802b7cfda1cf4 (diff) | |
Merge branch 'master' into simple-search
| -rw-r--r-- | src/mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mapping.c b/src/mapping.c index 4897450..16dbe34 100644 --- a/src/mapping.c +++ b/src/mapping.c @@ -134,7 +134,7 @@ double mapping_scale_bar_length(ImageRecord *image) { switch ( image->fmode ) { case FORMULATION_PIXELSIZE : return 1.0e9/image->pixel_size; - case FORMULATION_CLEN : return image->camera_len*image->lambda; + case FORMULATION_CLEN : return 1.0e9*image->resolution*image->camera_len*image->lambda; default : fprintf(stderr, "Unrecognised formulation mode in mapping_scale_bar_length.\n"); } |