Menu
▾
▴
[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Display also lens name
|
From: <hug...@li...> - 2011-10-16 09:21:54
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/97b53c996d01 changeset: 5620:97b53c996d01 user: tmodes date: Sun Oct 16 11:21:24 2011 +0200 description: Display also lens name diffstat: src/hugin1/hugin/ImagesPanel.cpp | 20 +++++++- src/hugin1/hugin/xrc/images_panel.xrc | 54 +++++++++++++---------- src/hugin_base/panodata/ImageVariableTranslate.h | 1 + src/hugin_base/panodata/SrcPanoImage.cpp | 13 +++++ src/hugin_base/panodata/image_variables.h | 1 + 5 files changed, 62 insertions(+), 27 deletions(-) diffs (212 lines): diff -r 75a8d1bb2a33 -r 97b53c996d01 src/hugin1/hugin/ImagesPanel.cpp --- a/src/hugin1/hugin/ImagesPanel.cpp Thu Oct 13 22:21:31 2011 +0200 +++ b/src/hugin1/hugin/ImagesPanel.cpp Sun Oct 16 11:21:24 2011 +0200 @@ -606,12 +606,22 @@ SetLabel(wxFileName(wxString(val.c_str(),HUGIN_CONV_FILENAME)).GetFullName()); val = img.getExifMake(); - XRCCTRL(*this, "images_camera_make",wxStaticText) -> - SetLabel(wxString(val.c_str(),wxConvLocal)); + if(val!="Unknown") + { + XRCCTRL(*this, "images_camera_make",wxStaticText)->SetLabel(wxString(val.c_str(),wxConvLocal)); + }; val = img.getExifModel(); - XRCCTRL(*this, "images_camera_model",wxStaticText) -> - SetLabel(wxString(val.c_str(),wxConvLocal)); + if(val!="Unknown") + { + XRCCTRL(*this, "images_camera_model",wxStaticText)->SetLabel(wxString(val.c_str(),wxConvLocal)); + }; + + val = img.getExifLens(); + if(val!="Unknown") + { + XRCCTRL(*this, "images_lens",wxStaticText)->SetLabel(wxString(val.c_str(),wxConvLocal)); + }; struct tm exifdatetime; if(img.getExifDateTime(&exifdatetime)==0) @@ -688,10 +698,12 @@ XRCCTRL(*this, "images_filename", wxStaticText) ->SetLabel(wxT("")); XRCCTRL(*this, "images_camera_make", wxStaticText) ->SetLabel(wxT("")); XRCCTRL(*this, "images_camera_model", wxStaticText) ->SetLabel(wxT("")); + XRCCTRL(*this, "images_lens", wxStaticText) ->SetLabel(wxT("")); XRCCTRL(*this, "images_capture_date", wxStaticText) ->SetLabel(wxT("")); XRCCTRL(*this, "images_focal_length", wxStaticText) ->SetLabel(wxT("")); XRCCTRL(*this, "images_aperture", wxStaticText) ->SetLabel(wxT("")); XRCCTRL(*this, "images_shutter_speed", wxStaticText) ->SetLabel(wxT("")); + XRCCTRL(*this, "images_iso", wxStaticText) ->SetLabel(wxT("")); } diff -r 75a8d1bb2a33 -r 97b53c996d01 src/hugin1/hugin/xrc/images_panel.xrc --- a/src/hugin1/hugin/xrc/images_panel.xrc Thu Oct 13 22:21:31 2011 +0200 +++ b/src/hugin1/hugin/xrc/images_panel.xrc Sun Oct 16 11:21:24 2011 +0200 @@ -453,29 +453,38 @@ <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> - <object class="wxStaticText" name="images_filename"> - <label></label> - </object> + <object class="wxStaticText" name="images_filename"/> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxStaticText"> <label>Camera Maker:</label> </object> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> - <object class="wxStaticText" name="images_camera_make"> - <label></label> - </object> + <object class="wxStaticText" name="images_camera_make"/> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxStaticText"> <label>Camera Model:</label> </object> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> - <object class="wxStaticText" name="images_camera_model"> - <label></label> + <object class="wxStaticText" name="images_camera_model"/> + <flag>wxALIGN_CENTRE_VERTICAL</flag> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Lens:</label> </object> + <flag>wxALIGN_CENTRE_VERTICAL</flag> + </object> + <object class="sizeritem"> + <object class="wxStaticText" name="images_lens"/> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxStaticText"> @@ -484,40 +493,39 @@ <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> - <object class="wxStaticText" name="images_capture_date"> - <label></label> - </object> + <object class="wxStaticText" name="images_capture_date"/> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxStaticText"> <label>Focal Length:</label> </object> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> - <object class="wxStaticText" name="images_focal_length"> - <label></label> - </object> + <object class="wxStaticText" name="images_focal_length"/> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxStaticText"> <label>Aperture:</label> </object> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> - <object class="wxStaticText" name="images_aperture"> - <label></label> - </object> + <object class="wxStaticText" name="images_aperture"/> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <cols>2</cols> <object class="sizeritem"> <object class="wxStaticText"> <label>Shutter Speed:</label> </object> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> - <object class="wxStaticText" name="images_shutter_speed"> - <label></label> - </object> + <object class="wxStaticText" name="images_shutter_speed"/> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <vgap>6</vgap> <hgap>6</hgap> @@ -525,11 +533,11 @@ <object class="wxStaticText"> <label>ISO:</label> </object> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> - <object class="wxStaticText" name="images_iso"> - <label></label> - </object> + <object class="wxStaticText" name="images_iso"/> + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> </object> <flag>wxALL|wxEXPAND</flag> diff -r 75a8d1bb2a33 -r 97b53c996d01 src/hugin_base/panodata/ImageVariableTranslate.h --- a/src/hugin_base/panodata/ImageVariableTranslate.h Thu Oct 13 22:21:31 2011 +0200 +++ b/src/hugin_base/panodata/ImageVariableTranslate.h Sun Oct 16 11:21:24 2011 +0200 @@ -319,6 +319,7 @@ typedef PTOVariableConverterNoOp PTOVariableConverterForExifModel; typedef PTOVariableConverterNoOp PTOVariableConverterForExifMake; +typedef PTOVariableConverterNoOp PTOVariableConverterForExifLens; typedef PTOVariableConverterNoOp PTOVariableConverterForExifCropFactor; typedef PTOVariableConverterNoOp PTOVariableConverterForExifFocalLength; typedef PTOVariableConverterNoOp PTOVariableConverterForExifOrientation; diff -r 75a8d1bb2a33 -r 97b53c996d01 src/hugin_base/panodata/SrcPanoImage.cpp --- a/src/hugin_base/panodata/SrcPanoImage.cpp Thu Oct 13 22:21:31 2011 +0200 +++ b/src/hugin_base/panodata/SrcPanoImage.cpp Sun Oct 16 11:21:24 2011 +0200 @@ -41,6 +41,7 @@ #include <hugin_utils/utils.h> #include <exiv2/exif.hpp> #include <exiv2/image.hpp> +#include <exiv2/easyaccess.hpp> #ifdef __FreeBSD__ #define log2(x) (log(x) / M_LN2) @@ -367,6 +368,18 @@ setExifModel("Unknown"); } + Exiv2::ExifData::const_iterator itr2 = Exiv2::lensName(exifData); + if (itr2!=exifData.end()) + { + //we are using prettyPrint function to get string of lens name + //it2->toString returns for many cameras only an ID number + setExifLens(itr2->print(&exifData)); + } + else + { + setExifLens("Unknown"); + }; + long orientation = 0; if (getExiv2Value(exifData,"Exif.Image.Orientation",orientation) && trustExivOrientation()) { switch (orientation) { diff -r 75a8d1bb2a33 -r 97b53c996d01 src/hugin_base/panodata/image_variables.h --- a/src/hugin_base/panodata/image_variables.h Thu Oct 13 22:21:31 2011 +0200 +++ b/src/hugin_base/panodata/image_variables.h Sun Oct 16 11:21:24 2011 +0200 @@ -122,6 +122,7 @@ // store camera information from exif tags... image_variable( ExifModel, std::string, "" ) image_variable( ExifMake, std::string, "" ) +image_variable( ExifLens, std::string, "" ) image_variable( ExifCropFactor, double, 0 ) image_variable( ExifFocalLength, double, 0 ) image_variable( ExifOrientation, double, 0 ) |