fix image cache

ubdirdoc · Jul 22, 2019 · 645ccab · 645ccab
1 parent 176a2ce
commit 645ccab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/base/plugins/segment/SEGMent/Model/Image.hpp b/base/plugins/segment/SEGMent/Model/Image.hpp
@@ -19,7 +19,6 @@ struct Image
   Image& operator=(Image&&) = default;
 
   QString path;
-  mutable QPixmap cache;
 
   operator QString&() { return path; }
   operator const QString&() const { return path; }

diff --git a/base/plugins/segment/SEGMent/Model/Scene.cpp b/base/plugins/segment/SEGMent/Model/Scene.cpp
@@ -3,6 +3,7 @@
 #include <QUrl>
 
 #include <SEGMent/Model/Model.hpp>
+#include <SEGMent/ImageCache.hpp>
 #include <wobjectimpl.h>
 W_OBJECT_IMPL(SEGMent::SceneModel)
 namespace SEGMent
@@ -181,8 +182,10 @@ void JSONObjectReader::read(const SEGMent::SceneModel& v)
 
   obj["Ambience"] = toJsonObject(v.m_ambience);
   obj["Image"] = v.m_image.path;
-  obj["ImageSize"]
-      = QJsonArray{v.m_image.cache.width(), v.m_image.cache.height()};
+
+  auto parent_doc = score::IDocument::documentFromObject(v);
+  auto& cache = SEGMent::ImageCache::instance().cache(SEGMent::toLocalFile(v.m_image.path, parent_doc->context()));
+  obj["ImageSize"] = QJsonArray{cache.full_size.width(), cache.full_size.height()};
   obj["Rect"] = toJsonValue(v.m_rect);
   obj["SceneType"] = (int)v.m_sceneType;
   obj["StartText"] = v.m_startText;