X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvUtils.cxx;h=3ef9cc606b2d6d7a87a6ee97b2699ce01056aadf;hb=acdc20ec4afc95db1db29bf8d885a3b72c9c7ee0;hp=1e0148256db12b90aa91c6227396d5e1e5edb727;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git

diff --git a/vv/vvUtils.cxx b/vv/vvUtils.cxx
index 1e01482..3ef9cc6 100644
--- a/vv/vvUtils.cxx
+++ b/vv/vvUtils.cxx
@@ -1,9 +1,9 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,45 +14,59 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
-#include <fstream>
+===========================================================================**/
+#include <sstream>
 #include <algorithm>
 #include <QDir>
-
 #include "clitkCommon.h"
 #include "vvUtils.h"
 
 const std::string vv_user_file=".vv_settings.txt";
+const std::string recentFileList="recentFiles";
 typedef std::list<std::string> FileListType;
 
+QString getVVSettingsPath(){
+  return QDir::homePath()+QString::fromStdString("/"+vv_user_file);
+}
+
+QSettings::Format getSettingsOptionFormat(){
+  return QSettings::IniFormat;
+}
+
 ///Returns the last images opened by the user
 FileListType GetRecentlyOpenedImages()
 {
-    std::ifstream in((QDir::homePath().toStdString() + "/" + vv_user_file).c_str());
-    std::string current_file;
-    FileListType result;
-    in >> current_file;
-    while (in.good())
-    {
-        result.push_back(current_file);
-        in >> current_file;
+  QSettings settings(getVVSettingsPath(), getSettingsOptionFormat());
+  FileListType result;
+  settings.beginGroup(QString::fromStdString(recentFileList));
+    QStringList keys = settings.childKeys();
+    for(int i=0; i<keys.size(); i++){
+      std::string value=settings.value(QString::fromStdString (keys[i].toStdString())).toString().toStdString();
+      result.push_back(value);
     }
-    in.close();
-    return result;
+  settings.endGroup();
+  return result;
 }
 
 ///Adds an image to the list of recently opened images
 void AddToRecentlyOpenedImages(std::string filename)
 {
-    FileListType file_list = GetRecentlyOpenedImages();
-    FileListType::iterator i = std::find(file_list.begin(),file_list.end(),filename);
-    if (i != file_list.end()) // avoid dupes
-        file_list.erase(i);
-    while (file_list.size() >= 6) //keep list to a reasonable size
-        file_list.pop_back();
-    file_list.push_front(filename);
-    std::ofstream out((QDir::homePath().toStdString() + "/" + vv_user_file).c_str(),std::ios_base::out | std::ios_base::trunc);
-    for (FileListType::iterator j = file_list.begin() ; j != file_list.end() ; j++)
-        out << (*j) << std::endl;
-    out.close();
+  QSettings settings(getVVSettingsPath(), getSettingsOptionFormat());
+  FileListType file_list = GetRecentlyOpenedImages();
+  
+  FileListType::iterator i = std::find(file_list.begin(),file_list.end(),filename);
+  if (i != file_list.end()) // avoid dupes
+    file_list.erase(i);
+  while (file_list.size() >= 6) //keep list to a reasonable size
+    file_list.pop_back();
+  file_list.push_front(filename);
+  
+  settings.beginGroup(QString::fromStdString(recentFileList));
+    int index=0;
+    for (FileListType::iterator j = file_list.begin() ; j != file_list.end() ; j++){
+      QString s=QString(index++);
+      settings.setValue(s, QString::fromStdString ( *j ));
+    }
+  settings.endGroup();
 }
+