X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvUtils.cxx;h=2dc0a96e07ec54166cf1c7ab83be7c282f24e465;hb=8209f988394a0706a9f8834a325d687ec3555bd1;hp=361c7809f4fc22867c08b6771cd81f14af45549b;hpb=8e0671d3fff58c9232517f0b91cc0d1d3d3821ed;p=clitk.git

diff --git a/vv/vvUtils.cxx b/vv/vvUtils.cxx
index 361c780..2dc0a96 100644
--- a/vv/vvUtils.cxx
+++ b/vv/vvUtils.cxx
@@ -18,19 +18,27 @@
 #include <sstream>
 #include <algorithm>
 #include <QDir>
-#include <QSettings>
 #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;
 
-static QSettings settings(QDir::homePath()+QString::fromStdString("/"+vv_user_file), QSettings::NativeFormat);
+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()
 {
+  QSettings settings(getVVSettingsPath(), getSettingsOptionFormat());
   FileListType result;
-  settings.beginGroup("recentFiles");
+  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();
@@ -40,9 +48,54 @@ FileListType GetRecentlyOpenedImages()
   return result;
 }
 
+/// Add new Dicom Server
+void AddDicomServer(std::string nickname, std::string aetitle, std::string adress, std::string port)
+{
+	QSettings settings(getVVSettingsPath(), getSettingsOptionFormat());
+	 settings.beginGroup(QString::fromStdString("DICOMSERVER"));
+	 settings.beginWriteArray(QString::fromStdString(nickname));
+	 settings.setValue("nickname",QString::fromStdString(nickname));
+	 settings.setValue("AETITLE",QString::fromStdString(aetitle));
+	 settings.setValue("ADRESS",QString::fromStdString(adress));
+	 settings.setValue("PORT",QString::fromStdString(port));
+	 settings.endGroup();
+}
+
+
+//std::map <std::string, std::vector<std::string> > getDicomServers()
+QStringList getDicomServers()
+{
+
+	QStringList list;
+	QSettings settings(getVVSettingsPath(), getSettingsOptionFormat());
+	 settings.beginGroup(QString::fromStdString("DICOMSERVER"));
+	 QStringList  keys = settings.allKeys();
+	 for(int i =0; i < keys.size(); i++)
+	 {
+		 QString val = keys.at(i);
+		 if (val.contains("nickname"))
+			 list.push_back(settings.value(val).toString());
+	 }
+	 return list;
+}
+
+std::map <std::string,std::string > getDicomServer(QString nickname)
+{
+		std::map< std::string, std::string  >results;
+		QSettings settings(getVVSettingsPath(), getSettingsOptionFormat());
+	 settings.beginGroup(QString::fromStdString("DICOMSERVER"));
+	 settings.beginReadArray(nickname);
+	   QStringList keys = settings.childKeys();
+	   for (int i = 0; i <keys.size(); i++)
+		   results[keys.at(i).toStdString()] = settings.value(keys.at(i)).toString().toStdString();
+	   return results;
+
+}
+
 ///Adds an image to the list of recently opened images
 void AddToRecentlyOpenedImages(std::string filename)
 {
+  QSettings settings(getVVSettingsPath(), getSettingsOptionFormat());
   FileListType file_list = GetRecentlyOpenedImages();
   
   FileListType::iterator i = std::find(file_list.begin(),file_list.end(),filename);
@@ -52,11 +105,12 @@ void AddToRecentlyOpenedImages(std::string filename)
     file_list.pop_back();
   file_list.push_front(filename);
   
-  settings.beginGroup("recentFiles");
-  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.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();
 }
+