Various fixes for #20

Author: mistic100

installer/package.bat

@@ -1 +1 @@
-"C:\Program Files\7-Zip\7z.exe" a UMWP_Autochanger_2.1.zip ./data/* -x!*.ico
+"C:\Program Files\7-Zip\7z.exe" a UMWP_Autochanger_2.2.zip ./data/* -x!*.ico

installer/setup.iss

@@ -1,6 +1,6 @@
 #define AppId "{401CCECB-FFCC-4AF3-846D-A535F59D0834}"
 #define AppName "UMWP Autochanger"
-#define AppVersion "2.1"
+#define AppVersion "2.2"
 #define AppPublisher "StrangePlanet"
 #define PublisherURL "http://www.strangeplanet.fr"
 #define ProjectURL "http://www.strangeplanet.fr/work/umwp-autochanger"

src/customlayoutgenerator.cpp

@@ -85,15 +85,15 @@ QList<QRect> CustomLayoutGenerator::generate(const CustomLayout &_conf)
 
     // compute the surface occupied by all pool items
     int poolSurface = 0;
-    foreach (const QRect block, pool)
+    foreach (const QRect &block, pool)
         poolSurface+= block.width() * block.height();
 
     // compute how many times each item must be duplicated in the pool
     // in order to fill the whole surface
     int nbPool = poolSurface==0 ? 0 : qCeil(totalSurface / poolSurface);
 
     // actually duplicate the items
-    foreach (const QRect block, pool)
+    foreach (const QRect &block, pool)
         for (int k=0; k<nbPool; k++)
             pool.append(block);
 

src/gui/previewdialog.cpp

@@ -54,17 +54,25 @@ void PreviewDialog::draw()
 
     WallpaperGenerator::Result current = m_ctrl->current();
 
-    int width = 100;
-    if (current.type == UM::W_DESKTOP)
+    int width;
+    if (current.type == UM::W_DESKTOP && current.sets.at(0)->style() != UM::IM_CUSTOM)
     {
-        width*= m_ctrl->settings()->nbEnabledMonitors();
+        width = 200 * m_ctrl->settings()->nbEnabledMonitors();
+    }
+    else if (current.files.size() <= 4)
+    {
+        width = 150;
+    }
+    else
+    {
+        width = 100;
     }
 
     int col = 0; int row = 0;
 
     bool showEdit = !m_settings->param(UM::CONF::open_program).toString().isEmpty();
 
-    foreach (QString file, current.files)
+    foreach (const QString &file, current.files)
     {
         if (file.isEmpty())
         {

src/set.cpp

@@ -50,14 +50,14 @@ Set::Set(const QDomElement* _dom)
         m_mode = static_cast<UM::MODE>(_dom->attribute("mode").toInt());
     }
 
-    // added in 2.1.1
+    // added in 2.2
     if (_dom->hasAttribute("frequency"))
     {
         m_frequency = _dom->attribute("frequency").toDouble();
     }
 
-    // added in 2.1.1
-    if (_dom->hasAttribute("monitors"))
+    // added in 2.2
+    if (_dom->hasAttribute("monitors") && !_dom->attribute("monitors").isEmpty())
     {
         QStringList monitors = _dom->attribute("monitors").split(",");
         foreach (QString monitor, monitors)

src/settings.cpp

@@ -90,7 +90,7 @@ const int Settings::nbEnabledMonitors() const
 {
     int n = 0;
 
-    foreach (const UM::Monitor mon, m_monitors)
+    foreach (const UM::Monitor &mon, m_monitors)
     {
         if (mon.enabled) n++;
     }
@@ -115,15 +115,14 @@ void Settings::log()
         hotkeys.append(it.key() +": "+ QString::number(it.value()));
     }
 
-    QList<QString> sets;
-    for (QVector<Set*>::const_iterator it = m_sets.constBegin(); it != m_sets.constEnd(); ++it)
-    {
-        sets.append((*it)->name()+": "+((*it)->isActive()?"active":"inactive"));
-    }
-
     QLOG_DEBUG() << "== OPTIONS" << options;
     QLOG_DEBUG() << "== HOTKEYS" << hotkeys;
-    QLOG_DEBUG() << "== SETS" << sets;
+    QLOG_DEBUG() << "== SETS";
+
+    foreach (Set* set, m_sets)
+    {
+        QLOG_DEBUG()<<"   "<<set->name()<<(set->isActive()?"active":"inactive")<<","<<set->nbFiles()<<"files,"<<set->nbFolders()<<"folders";
+    }
 }
 
 /**
@@ -287,14 +286,14 @@ bool Settings::load(QString _filename)
         save();
     }
 
-    if (QsLogging::Logger::instance().loggingLevel() != QsLogging::OffLevel)
+    foreach (Set* set, m_sets)
     {
-        log();
+        set->init();
     }
 
-    foreach (Set* set, m_sets)
+    if (QsLogging::Logger::instance().loggingLevel() != QsLogging::OffLevel)
     {
-        set->init();
+        log();
     }
 
     return true;
@@ -363,7 +362,7 @@ bool Settings::save(QString _filename)
     // monitors node
     writer.writeStartElement("monitors");
 
-    foreach (const UM::Monitor mon, m_monitors)
+    foreach (const UM::Monitor &mon, m_monitors)
     {
         writer.writeStartElement("monitor");
         writer.writeAttribute("enabled", QString::number(mon.enabled));
@@ -597,45 +596,6 @@ int const Settings::nbActiveSets() const
     return totalSets;
 }
 
-/**
- * @brief Get one of the active sets on a monitor
- * @param int _i - position in the sub-vector of active sets
- * @return Set*
- */
-Set* Settings::activeSetOnMonitor(int _i, int _monitor) const
-{
-    QVector<Set*> activeSets;
-
-    foreach (Set* set, m_sets)
-    {
-        if (set->isValid() && set->isActive() && set->isActiveOnMonitor(_monitor) && set->nbFiles() > 0)
-        {
-            activeSets.append(set);
-        }
-    }
-
-    return activeSets.at(_i);
-}
-
-/**
- * @brief Get the number of active sets on a monitor
- * @return int
- */
-int const Settings::nbActiveSetsOnMonitor(int _monitor) const
-{
-    int totalSets = 0;
-
-    foreach (const Set* set, m_sets)
-    {
-        if (set->isValid() && set->isActive() && set->isActiveOnMonitor(_monitor) && set->nbFiles() > 0)
-        {
-            totalSets++;
-        }
-    }
-
-    return totalSets;
-}
-
 /**
  * @brief Build sets hotkeys when migrating from version 1.3
  * @param int WinMod

src/settings.h

@@ -41,8 +41,6 @@ class Settings
     const int       nbSets() const    { return m_sets.size(); }
     Set*            activeSet(int _i) const;
     const int       nbActiveSets() const;
-    Set*            activeSetOnMonitor(int _i, int _monitor) const;
-    const int       nbActiveSetsOnMonitor(int _monitor) const;
 
     // setters
     void setParam(const QString &_key, const QVariant &_val) { m_options[_key] = _val; }

src/wallpapergenerator.cpp

@@ -42,7 +42,7 @@ WallpaperGenerator::Result WallpaperGenerator::generate()
 
     WallpaperGenerator::Result result;
 
-    Set* tempSet = getRandomSet(-1, QVector<Set*>());
+    Set* tempSet = getRandomSet();
 
     if (tempSet == NULL)
     {
@@ -88,14 +88,11 @@ WallpaperGenerator::Result WallpaperGenerator::generate()
         tempFiles.append(getFile(0, &result));
     }
 
+    m_enviro->setWallpaper(generateFile(tempFiles, &result));
+
     QLOG_DEBUG() << "Current type:" << result.type;
     QLOG_DEBUG() << "Current sets:" << result.sets;
     QLOG_DEBUG() << "Current files:" << result.files;
-
-    QString filepath = generateFile(tempFiles, &result);
-
-    m_enviro->setWallpaper(filepath);
-
     QLOG_INFO() << "Wallpaper generated in" << timer.elapsed() << "milliseconds";
 
     return result;
@@ -143,7 +140,13 @@ Set* WallpaperGenerator::getRandomSet(const int _monitor, const QVector<Set*> &_
     for (int i=0; i<nbSets; i++)
     {
         Set* set = sets.at(i);
+
         int setWeight = qRound(set->nbFiles() * set->frequency());
+        if (set->type() == UM::W_DESKTOP && set->style() != UM::IM_CUSTOM)
+        {
+            setWeight*= m_settings->nbEnabledMonitors();
+        }
+
         nbWalls.append(nbWalls.last() + setWeight);
     }
 
@@ -217,13 +220,13 @@ QString WallpaperGenerator::getFile(int _idx, Result* _context)
  * @param Set* _set
  * @return string
  */
-QString WallpaperGenerator::getRandomFolder(Set *_set)
+QString WallpaperGenerator::getRandomFolder(Set* _set)
 {
     int nbFolders = _set->nbFolders();
 
     if (nbFolders == 0)
     {
-        return _set->path();
+        return "";
     }
 
     if (nbFolders == 1)
@@ -241,7 +244,7 @@ QString WallpaperGenerator::getRandomFolder(Set *_set)
  * @brief Get a file in set a position _idx and adapt it for the monitor
  * @param int _idx
  * @param Result* _context
- * @return
+ * @return string
  */
 QString WallpaperGenerator::getAndAdaptFile(int _idx, Result* _context)
 {
@@ -275,7 +278,7 @@ QString WallpaperGenerator::getAndAdaptFile(int _idx, Result* _context)
  * @param Set* _set
  * @param int _nb
  * @param Result* _context
- * @return
+ * @return string[]
  */
 QVector<QString> WallpaperGenerator::getFilesForCustom(Set* _set, int _nb, Result* _context)
 {
@@ -293,7 +296,7 @@ QVector<QString> WallpaperGenerator::getFilesForCustom(Set* _set, int _nb, Resul
 
         for (int i=0; i<_nb; i++)
         {
-            files.append(getRandomFile(_set, folder));
+            files.append(getRandomFile(_set, folder, files));
         }
 
         if (layout.perFolder)
@@ -363,7 +366,7 @@ QString WallpaperGenerator::getNextFile(Set* _set)
  * @param string _folder optional
  * @return string
  */
-QString WallpaperGenerator::getRandomFile(Set *_set, const QString &_folder)
+QString WallpaperGenerator::getRandomFile(Set* _set, const QString &_folder, const QVector<QString> &_files)
 {
     int totalFiles = _set->nbFilesInFolder(_folder);
 
@@ -379,13 +382,35 @@ QString WallpaperGenerator::getRandomFile(Set *_set, const QString &_folder)
     }
 
     std::uniform_int<int> unif(0, totalFiles-1);
-    int counter = unif(m_randomEngine);
 
-    return _set->fileInFolder(_folder, counter);
+   // search a random unused file
+   short loop = 10; // the collisions detection will only try 10 times
+   QString file;
+
+   // if all files are already used, disable collisions detection
+   if (totalFiles <= _files.size())
+   {
+       loop = 1;
+   }
+
+   while (loop > 0)
+   {
+       loop--;
+
+       int counter = unif(m_randomEngine);
+       file = _set->fileInFolder(_folder, counter);
+
+       if (!_files.contains(file))
+       {
+           loop = 0;
+       }
+   }
+
+   return file;
 }
 
 /**
- * @brief Generate one custom layout file for set at position _idx
+ * @brief Generate one custom layout file for the set at position _idx
  * @param int _idx
  * @param Result* _context
  * @return string
@@ -412,7 +437,7 @@ QString WallpaperGenerator::generateCustomFile(int _idx, WallpaperGenerator::Res
     double wRatio =  scrRect.width() / (double) layout.cols;
     double hRatio =  scrRect.height() / (double) layout.rows;
 
-    foreach (const QRect block, rawBlocks)
+    foreach (const QRect &block, rawBlocks)
     {
         QRect newBlock = UM::scaledRect(block, wRatio, hRatio);
 
@@ -432,6 +457,8 @@ QString WallpaperGenerator::generateCustomFile(int _idx, WallpaperGenerator::Res
     // get necessary files from set
     QVector<QString> files = getFilesForCustom(set, blocks.size(), _context);
 
+    QLOG_DEBUG()<<"Custom sources:"<<files;
+
     QImage image(scrRect.size(), QImage::Format_RGB32);
     QPainter painter(&image);
 
@@ -463,9 +490,9 @@ QString WallpaperGenerator::generateCustomFile(int _idx, WallpaperGenerator::Res
         pen.setWidth(layout.borderWidth);
         painter.setPen(pen);
 
-        foreach (const QRect block, blocks)
+        foreach (const QRect &block, blocks)
         {
-            foreach (const QLine line, UM::rectBorders(block))
+            foreach (const QLine &line, UM::rectBorders(block))
             {
                 if (
                         (line.x1()==0 && line.x2()==0) ||
@@ -773,7 +800,7 @@ QString WallpaperGenerator::generateFile(const QVector<QString> &_files, Result*
 
 /**
  * @brief Compute the total size of enabled monitors
- * @return  QRect
+ * @return QRect
  */
 QRect WallpaperGenerator::getDesktopEnabledRect()
 {

src/wallpapergenerator.h

@@ -46,9 +46,9 @@ class WallpaperGenerator : public QObject
 
     // random access
     QString getFile(int _idx, Result* _context);
-    Set* getRandomSet(const int _monitor, const QVector<Set*> &_existingSets);
+    Set* getRandomSet(const int _monitor=-1, const QVector<Set*> &_existingSets=QVector<Set*>());
     QString getRandomFolder(Set* _set);
-    QString getRandomFile(Set* _set, const QString &_folder="");
+    QString getRandomFile(Set* _set, const QString &_folder="", const QVector<QString> &_files=QVector<QString>());
     QString getNextFile(Set* _set);
 
     // custom generation