Changes in src/Actions/MapOfActions.cpp [7230be:bd2390]

File:

• src/Actions/MapOfActions.cpp (modified) (7 diffs)

src/Actions/MapOfActions.cpp

@@ -31 +31 @@
 #include <boost/optional.hpp>
 #include <boost/program_options.hpp>
+#include <boost/filesystem.hpp>
 
 #include <iostream>
@@ -190 +191 @@
   BV.zz = boost::lexical_cast<double>(components.at(5));
   v = boost::any(BoxValue(BV));
+}
+
+void validate(boost::any& v, const std::vector<std::string>& values, boost::filesystem::path *, int)
+{
+  boost::filesystem::path filename;
+  std::vector<std::string> components;
+
+  std::cout << "boost::filesystem::path validator used." << std::endl;
+
+  // split comma-separated values
+  if (values.size() != 1) {
+    cerr <<  "Not one file but " << components.size() << " given " << endl;
+    throw boost::program_options::validation_error("Unequal to one file given");
+  }
+  filename = values.at(0);
+  v = boost::any(boost::filesystem::path(filename));
 }
 
@@ -367 +384 @@
   TypeMap["fill-void"] = &typeid(std::string);
   TypeMap["fragment-mol"] = &typeid(std::string);
-  TypeMap["input"] = &typeid(std::string);
+  TypeMap["input"] = &typeid(boost::filesystem::path);
   TypeMap["linear-interpolate"] = &typeid(std::string);
   TypeMap["molecular-volume"] = &typeid(molecule);
@@ -446 +463 @@
   TypeEnumMap[&typeid(bool)] = Boolean;
   TypeEnumMap[&typeid(int)] = Integer;
+  TypeEnumMap[&typeid(boost::filesystem::path)] = File;
   TypeEnumMap[&typeid(std::vector<int>)] = ListOfIntegers;
   TypeEnumMap[&typeid(double)] = Double;
@@ -825 +843 @@
 }
 
+void MapOfActions::queryCurrentValue(const char * name, boost::filesystem::path&_T)
+{
+  std::string tmp;
+  if (typeid( boost::filesystem::path ) == *TypeMap[name]) {
+    if (CurrentValue.find(name) == CurrentValue.end())
+      throw MissingValueException(__FILE__, __LINE__);
+    std::istringstream stream(CurrentValue[name]);
+    CurrentValue.erase(name);
+    if (!stream.fail()) {
+      stream >> tmp >> ws;
+      _T = tmp;
+    }
+  } else
+    throw IllegalTypeException(__FILE__,__LINE__);
+}
+
 
 void MapOfActions::setCurrentValue(const char * name, class atom * &_T)
@@ -927 +961 @@
       stream << (*iter)->getId() << " ";
     }
+    CurrentValue[name] = stream.str();
+  } else
+    throw IllegalTypeException(__FILE__,__LINE__);
+}
+
+void MapOfActions::setCurrentValue(const char * name, boost::filesystem::path &_T)
+{
+  if (typeid( boost::filesystem::path ) == *TypeMap[name]) {
+    std::ostringstream stream;
+    stream << _T.string();
     CurrentValue[name] = stream.str();
   } else
@@ -1051 +1095 @@
               ;
             break;
+          case File:
+            ListRunner->second->add_options()
+              (getKeyAndShortForm(*OptionRunner).c_str(),
+                  po::value< boost::filesystem::path >(),
+                  getDescription(*OptionRunner).c_str())
+              ;
+            break;
           case Integer:
             ListRunner->second->add_options()