support rating tag from EXIF/XMP

rtengine/imagedata.cc

@@ -71,7 +71,7 @@ FramesMetaData* FramesMetaData::fromFile (const Glib::ustring& fname, std::uniqu
 
 FrameData::FrameData (rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory* rootDir, rtexif::TagDirectory* firstRootDir)
     : frameRootDir(frameRootDir_), iptc(nullptr), time(), timeStamp(), iso_speed(0), aperture(0.), focal_len(0.), focal_len35mm(0.), focus_dist(0.f),
-      shutter(0.), expcomp(0.), make("Unknown"), model("Unknown"), orientation("Unknown"), lens("Unknown"),
+      shutter(0.), expcomp(0.), make("Unknown"), model("Unknown"), orientation("Unknown"), rating(0), lens("Unknown"),
       sampleFormat(IIOSF_UNKNOWN), isPixelShift(false), isHDR(false)
 {
     memset (&time, 0, sizeof(time));
@@ -97,6 +97,7 @@ FrameData::FrameData (rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
     serial.clear();
     orientation.clear();
     lens.clear();
+    rating = 0;
 
     tag = newFrameRootDir->findTag("Make");
     if (!tag) {
@@ -187,6 +188,11 @@ FrameData::FrameData (rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
         orientation = tag->valueToString ();
     }
 
+    tag = newFrameRootDir->findTagUpward("Rating");
+    if (tag) {
+        rating = tag->toInt();
+    }
+
     tag = newFrameRootDir->findTagUpward("MakerNote");
     rtexif::TagDirectory* mnote = nullptr;
     if (tag) {
@@ -876,6 +882,11 @@ std::string FrameData::getOrientation () const
     return orientation;
 }
 
+int FrameData::getRating () const
+{
+    return rating;
+}
+
 
 
 void FramesData::setDCRawFrameCount (unsigned int frameCount)
@@ -1168,6 +1179,10 @@ std::string FramesData::getOrientation(unsigned int frame) const
         }
     );
 }
+int FramesData::getRating (unsigned int frame) const
+{
+    return frames.empty() || frame >= frames.size()  ? 0 : frames.at(frame)->getRating ();
+}
 
 
 //------inherited functions--------------//

rtengine/imagedata.h

@@ -49,6 +49,7 @@ protected:
     std::string make, model, serial;
     std::string orientation;
     std::string lens;
+    int rating;
     IIOSampleFormat sampleFormat;
 
     // each frame has the knowledge of "being an"
@@ -84,6 +85,7 @@ public:
     std::string getLens () const;
     std::string getSerialNumber () const;
     std::string getOrientation () const;
+    int getRating () const;
 };
 
 class FramesData : public FramesMetaData {
@@ -125,7 +127,8 @@ public:
     std::string getModel (unsigned int frame = 0) const override;
     std::string getLens (unsigned int frame = 0) const override;
     std::string getSerialNumber (unsigned int frame = 0) const;
-    std::string getOrientation (unsigned int frame = 0) const override;
+    std::string getOrientation (unsigned int frame = 0) const;
+    int getRating (unsigned int frame = 0) const override;
 };
 
 

rtengine/rtengine.h

@@ -133,6 +133,8 @@ public:
     virtual std::string getLens     (unsigned int frame = 0) const = 0;
     /** @return the orientation of the image */
     virtual std::string getOrientation (unsigned int frame = 0) const = 0;
+    /** @return the rating of the image */
+    virtual int getRating (unsigned int frame = 0) const = 0;
 
     /** @return true if the file is a PixelShift shot (Pentax and Sony bodies) */
     virtual bool getPixelShift () const = 0;

rtexif/rtexif.cc

@@ -3037,6 +3037,12 @@ void ExifManager::parse (bool isRaw, bool skipIgnored)
             }
         }
 
+        if (!root->getTag ("Rating")) {
+            Tag *t = new Tag (root, root->getAttrib("Rating"));
+            t->initInt (0, LONG);
+            root->addTag (t);
+        }
+
         // --- detecting image root IFD based on SubFileType, or if not provided, on PhotometricInterpretation
 
         bool frameRootDetected = false;

rtgui/cacheimagedata.cc

@@ -27,7 +27,7 @@
 CacheImageData::CacheImageData ()
     : md5(""), supported(false), format(FT_Invalid), rankOld(-1), inTrashOld(false), recentlySaved(false),
       timeValid(false), year(0), month(0), day(0), hour(0), min(0), sec(0), exifValid(false), frameCount(1),
-      fnumber(0.0), shutter(0.0), focalLen(0.0), focalLen35mm(0.0), focusDist(0.f), iso(0), isHDR (false),
+      fnumber(0.0), shutter(0.0), focalLen(0.0), focalLen35mm(0.0), focusDist(0.f), iso(0), rating(0), isHDR (false),
       isPixelShift (false), sensortype(rtengine::ST_NONE), sampleFormat(rtengine::IIOSF_UNKNOWN),
       redAWBMul(-1.0), greenAWBMul(-1.0), blueAWBMul(-1.0), rotate(0), thumbImgType(0)
 {

rtgui/cacheimagedata.h

@@ -54,6 +54,7 @@ public:
     double focalLen, focalLen35mm;
     float focusDist;
     unsigned iso;
+    int rating;
     bool isHDR;
     bool isPixelShift;
     int sensortype;
@@ -108,6 +109,7 @@ public:
     std::string getModel    (unsigned int frame = 0) const override { return camModel; }
     std::string getLens     (unsigned int frame = 0) const override { return lens; }
     std::string getOrientation (unsigned int frame = 0) const override { return ""; } // TODO
+    int getRating (unsigned int frame = 0) const override { return rating; } // FIXME-piotr : missing rating
     bool getPixelShift () const override { return isPixelShift; }
     bool getHDR (unsigned int frame = 0) const override { return isHDR; }
     std::string getImageType (unsigned int frame) const override { return isPixelShift ? "PS" : isHDR ? "HDR" : "STD"; }

rtgui/thumbnail.cc

@@ -813,6 +813,7 @@ int Thumbnail::infoFromImage (const Glib::ustring& fname, std::unique_ptr<rtengi
         cfs.lens         = idata->getLens();
         cfs.camMake      = idata->getMake();
         cfs.camModel     = idata->getModel();
+        cfs.rating       = idata->getRating();
 
         if (idata->getOrientation() == "Rotate 90 CW") {
             deg = 90;

rtgui/thumbnail.h

@@ -164,7 +164,10 @@ public:
         return cfs.md5;
     }
 
-    int             getRank  () const;
+    int             getRank  () const
+    {
+        return cfs.rating;
+    }
     void            setRank  (int rank);
 
     int             getColorLabel  () const;