Reduced memory usage by 2/3. #56

Author: davidcorbin

include/ui/ClassroomViewItem.hpp

@@ -20,7 +20,6 @@ class ClassroomViewItem : public QWidget {
 
  private:
   QVBoxLayout *verticalLayout;
-  QPixmap defImage;
   QLabel *imageLabel;
   QLabel *nameLabel;
 };

include/ui/StudentImage.hpp

@@ -6,13 +6,19 @@
 #define INCLUDE_UI_STUDENTIMAGE_HPP_
 
 #include <include/ui/Image.hpp>
+#include <QImageReader>
 #include <string>
 
-class StudentImage : public Image {
+class StudentImage {
  public:
-  explicit StudentImage(std::string *profileImage) : Image(profileImage, new
-      std::string("default_user.jpg")) {}
-  QPixmap setup() override;
+  explicit StudentImage(const std::string *data_filename);
+  QImageReader* setup();
+
+ private:
+  QImageReader *imageReader;
+
+  void loadImage(const std::string *data_filename,
+                 const std::string *resource_filename);
 };
 
 #endif  // INCLUDE_UI_STUDENTIMAGE_HPP_

src/ui/ClassroomViewItem.cpp

@@ -42,6 +42,7 @@ void ClassroomViewItem::updateImage() {
   auto relImgPath = new std::string(std::string("imgcache/") +
                                     std::to_string(student->getId()) + ".jpg");
   auto *studentImage = new StudentImage(relImgPath);
-  defImage = studentImage->setup();
-  imageLabel->setPixmap(defImage);
+  QImage defImage = studentImage->setup()->read();
+
+  imageLabel->setPixmap(QPixmap::fromImage(defImage));
 }

src/ui/Image.cpp

@@ -30,7 +30,6 @@ void Image::loadImage(const std::string *data_filename,
     // Get path to data directory image
     path = fm->getDataPath(*data_filename);
   } catch (FileNotFound &exception) {
-    qDebug("User specified image not found; using default");
     // Get path to resource directory image
     path = fm->getResourcePath(*resource_filename);
   }

src/ui/StudentImage.cpp

@@ -3,7 +3,43 @@
  */
 
 #include <include/ui/StudentImage.hpp>
+#include <include/FileManager.hpp>
+#include <include/FileNotFound.hpp>
+#include <QImageReader>
+#include <string>
 
-QPixmap StudentImage::setup() {
-  return image.scaled(409, 543, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+#define DEFAULT_USER_IMG                "default_user.jpg"
+
+StudentImage::StudentImage(const std::string *data_filename) {
+  loadImage(data_filename, new std::string(DEFAULT_USER_IMG));
+}
+
+QImageReader* StudentImage::setup() {
+  imageReader->setScaledSize(QSize(409, 543));
+  return imageReader;
+}
+
+void StudentImage::loadImage(const std::string *data_filename,
+                             const std::string *resource_filename) {
+  auto *fm = new FileManager();
+
+  // Try to load image from data directory and then try to load from resource
+  // directory
+  std::string path;
+  try {
+    if (data_filename->empty()) {
+      throw FileNotFound(new std::string("No image specified"));
+    }
+    // Get path to data directory image
+    path = fm->getDataPath(*data_filename);
+  } catch (FileNotFound &exception) {
+    // Get path to resource directory image
+    path = fm->getResourcePath(*resource_filename);
+  }
+  imageReader = new QImageReader(path.c_str());
+
+  // Check that image was loaded; this case should never occur but check anyway
+  if (imageReader->error()) {
+    qFatal("Image could not be loaded: %s\n", path.c_str());
+  }
 }