reworked the slowcotnrol call abck functions so that the values in th…

src/ServiceDiscovery/SlowControlCollection.cpp

@@ -694,6 +694,7 @@ bool SlowControlCollection::Update(SlowControlCollection* SCC, std::string key,
 
 	  (*SCC)[key]->SetValue(value);
 	  //(*SCC)[key]->Print();
+	  /*
 	  SCFunction tmp_func= (*SCC)[key]->GetChangeFunction();
 	  if (tmp_func!=nullptr){
 	    try{ 
@@ -703,11 +704,13 @@ bool SlowControlCollection::Update(SlowControlCollection* SCC, std::string key,
 	    catch(...){
 	      reply= "change function failed";
 	    }
-	  }	  
+	  }
+	  */
 	}
 	else reply = key + " locked";
       }
       else{
+	/*
 	SCFunction tmp_func= (*SCC)[key]->GetReadFunction();
 	if (tmp_func!=nullptr){
 	  try{
@@ -718,8 +721,8 @@ bool SlowControlCollection::Update(SlowControlCollection* SCC, std::string key,
 	  }
 	}
 	else (*SCC)[key]->GetValue(reply);
-
-
+	*/
+	(*SCC)[key]->GetValue(reply);	
       }
     }
     return true;

src/ServiceDiscovery/SlowControlElement.cpp

@@ -35,12 +35,19 @@ std::string SlowControlElement::Print(){
   else if (m_type==SlowControlElementType(OPTIONS)) out+="OPTIONS\"";
   else if (m_type==SlowControlElementType(COMMAND)) out+="COMMAND\"";
   else if (m_type==SlowControlElementType(INFO)) out+="INFO\"";
-
-  mtx.lock();
 
+    mtx.lock();
 
+  if(m_read_function!=0){
+    try{
+       options.Set("value",m_read_function(""));        
+    }
+    catch(...){
+      std::cerr<<"failed to call read fucntion"<<std::endl;
+    }
+  }
+
   for(std::map<std::string,std::string>::iterator it=options.begin(); it!=options.end(); it++){
-
     out+=",\""+it->first+"\":"+it->second;
   }
   out+="}";
@@ -210,6 +217,16 @@ bool SlowControlElement::SetValue(const char value[]){
 
 bool SlowControlElement::SetValue(std::string value){
   mtx.lock();
+
+  if(m_change_function!=0){
+    try{
+      m_change_function(value.c_str());
+    }
+    catch(...){
+      std::cerr<<"failed to call change fucntion"<<std::endl;
+    }
+  }
+
   if(m_type == SlowControlElementType(VARIABLE)){
     std::stringstream tmp(value);
     double val=0;
@@ -233,6 +250,14 @@ bool SlowControlElement::SetValue(std::string value){
 
 bool SlowControlElement::GetValue(std::string &value){
   mtx.lock();
+  if(m_read_function!=0){
+    try{
+      options.Set("value",m_read_function("")); 
+    }
+    catch(...){
+      std::cerr<<"failed to call read fucntion"<<std::endl;
+    }
+  }
   if(!options.Has("value")){
     mtx.unlock();
     return false;

src/ServiceDiscovery/SlowControlElement.h

@@ -101,6 +101,16 @@ namespace ToolFramework{
 	  if(value>max) value=max;
 	}
       }
+      if(m_change_function!=0){
+	std::stringstream tmp;
+	tmp<<value;
+	try{
+	  m_change_function(tmp.str().c_str());
+	}
+	catch(...){
+	    std::cerr<<"failed to call change fucntion"<<std::endl;
+	}
+      }
       options.Set("value", value);
       mtx.unlock();
       return true;
@@ -110,14 +120,30 @@ namespace ToolFramework{
     template<typename T> T GetValue(){
       T tmp;
       mtx.lock();
+      if(m_read_function!=0){
+	try{
+	  options.Set("value",m_read_function(""));
+	}
+	catch(...){
+	  std::cerr<<"failed to call read fucntion"<<std::endl;
+	}
+      }
       options.Get("value", tmp);
       mtx.unlock();
       return tmp;
 
     }
 
     template<typename T> bool GetValue(T &value){
-      mtx.lock();
+      mtx.lock();  
+      if(m_read_function!=0){
+	try{
+	  options.Set("value",m_read_function("")); 
+	}
+	catch(...){
+	  std::cerr<<"failed to call read fucntion"<<std::endl;
+	}
+      }
       bool ret=options.Get("value", value);
       mtx.unlock();
       return ret;