adding the possibility of calculating expressions in AddPlane::process()

GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/shape/AddPlane.h

@@ -10,11 +10,14 @@ XERCES_CPP_NAMESPACE_BEGIN
 class DOMElement;
 XERCES_CPP_NAMESPACE_END
 
+class GmxUtil;
+
 class AddPlane {
 public:
     AddPlane() {};
     ~AddPlane() {};
     void process(const xercesc::DOMElement *element, double &zPlane, double &rMinPlane, double &rMaxPlane);
+    GmxUtil* gmxUtil=nullptr;
 };
 
 

GeoModelTools/GeoModelXML/GeoModelXml/src/AddPlane.cxx

@@ -3,6 +3,7 @@
 */
 
 #include "GeoModelXml/shape/AddPlane.h"
+#include "GeoModelXml/GmxUtil.h"
 #include <string>
 #include <sstream>
 
@@ -13,12 +14,17 @@ using namespace xercesc;
 
 void AddPlane::process(const xercesc::DOMElement *element, double &zPlane, double &rMinPlane, double &rMaxPlane) {
 
+  if (!gmxUtil)
+  {
+	std::cout<<"This is AddPlane::process()!! gmxUtil is 0!!!!!"<<std::endl;
+	return;
+  }
   XMLCh * zplane_tmp = XMLString::transcode("zplane");
-  std::istringstream(XMLString::transcode(element->getAttribute(zplane_tmp))) >> zPlane;
+  zPlane=gmxUtil->evaluate(XMLString::transcode(element->getAttribute(zplane_tmp)));
   XMLCh * rminplane_tmp = XMLString::transcode("rminplane");
-  std::istringstream(XMLString::transcode(element->getAttribute(rminplane_tmp))) >> rMinPlane;
+  rMinPlane=gmxUtil->evaluate(XMLString::transcode(element->getAttribute(rminplane_tmp)));
   XMLCh * rmaxplane_tmp = XMLString::transcode("rmaxplane");
-  std::istringstream(XMLString::transcode(element->getAttribute(rmaxplane_tmp))) >> rMaxPlane;
+  rMaxPlane=gmxUtil->evaluate(XMLString::transcode(element->getAttribute(rmaxplane_tmp)));
   XMLString::release(&zplane_tmp);
   XMLString::release(&rminplane_tmp);
   XMLString::release(&rmaxplane_tmp);

GeoModelTools/GeoModelXML/GeoModelXml/src/MakePcon.cxx

@@ -31,6 +31,7 @@ char *toRelease;
 //
 //    Add planes
 //
+    if (!gmxUtil.tagHandler.addplane.gmxUtil) gmxUtil.tagHandler.addplane.gmxUtil=&gmxUtil;
     double zPlane = 0.;
     double rMinPlane = 0.;
     double rMaxPlane = 0.;

GeoModelTools/GeoModelXML/GeoModelXml/src/MakePgon.cxx

@@ -31,6 +31,7 @@ char *toRelease;
 //
 //    Add planes
 //
+    if (!gmxUtil.tagHandler.addplane.gmxUtil) gmxUtil.tagHandler.addplane.gmxUtil=&gmxUtil;
     double zPlane = 0.;
     double rMinPlane = 0.;
     double rMaxPlane = 0.;