Changeset 320 in PSPA

Timestamp:

Feb 12, 2013, 2:21:19 PM (11 years ago)

Author:

garnier

Message:

Début de stockage de façon plus générique des parametres (ne change rien pour le moment)

Location:

Interface_Web/trunk/pspaWT

Files:

• History (modified) (1 diff)
• sources/userInterface/include/GWt_abstractElement.h (modified) (2 diffs)
• sources/userInterface/src/GWt_abstractElement.cc (modified) (3 diffs)
• sources/userInterface/src/GWt_beam.cc (modified) (1 diff)
• sources/userInterface/src/GWt_pspaApplication.cc (modified) (3 diffs)

Interface_Web/trunk/pspaWT/History

@@ -8 +8 @@
 12 Février 2013 Laurent Garnier
 - Correction du fond qui ne passait pas sur le serveur
+- GWt_abstractElement : Début de stockage de façon plus générique des parametres (ne change rien pour le moment) 
 
 5 Février 2013 Laurent Garnier

Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_abstractElement.h

@@ -20 +20 @@
 #include <Wt/WContainerWidget>
 
+#include <boost/variant.hpp>
+
 using namespace Wt;
 using namespace std;
+using namespace boost;
 
 class GWt_elementLigneFaisceau;
+
+// defined to ensure that the boost::variant could return something even when there is nothing
+class NullType {};
 
 class GWt_abstractElement : public WContainerWidget
@@ -71 +77 @@
     WImage* image_;
     GWt_elementLigneFaisceau* elementLigneFaiseauContainer_;
+
+    
+    // Nom, type de parametre
+    std::map<std::string, variant<int, string, bool, float, NullType> > parameterMapValue;
+    std::map<std::string, std::string > parameterMapDescription;
+    
+    inline void registerParam(string name, variant<int, string, bool, float, NullType> value, string desc) {
+        parameterMapValue[name] = value;
+        parameterMapDescription[name] = desc;
+    }
+    
+    variant<int, string, bool, float, NullType> getParamValue(string elem);
+    string getParamDescription(string elem);
+
 };
 #endif

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_abstractElement.cc

@@ -2 +2 @@
 #include <iostream>
 #include <string>
+#include <boost/variant.hpp>
+#include <boost/variant/get.hpp>
 
 #include "GWt_abstractElement.h"
@@ -24 +26 @@
 #include <Wt/WMessageBox>
 
+
 GWt_abstractElement::GWt_abstractElement(abstractElement* elem)
 : WContainerWidget()
@@ -146 +149 @@
     }
 }
+
+
+
+variant<int, string, bool, float, NullType> GWt_abstractElement::getParamValue(string elem) {
+
+    if (parameterMapValue.find(elem) == parameterMapValue.end() )
+    {
+        return new NullType();
+    }
+
+    std::map<std::string, variant<int, string, bool, float, NullType> >::iterator it;
+    it = parameterMapValue.find(elem);
+    
+    variant <int, string, bool, float, NullType> value = it->second;
+    
+    try {
+        int pi = boost::get<int>(value);
+        printf("%s Type is int\n",elem.c_str());
+        return pi;
+    }
+    catch (boost::bad_get v) {
+        try {
+            string si = boost::get<string>(value);
+            printf("%s Type is string\n",elem.c_str());
+            return si;
+        }
+        catch (boost::bad_get v) {
+            try {
+                bool bi = boost::get<bool>(value);
+                printf("%s Type is bool\n",elem.c_str());
+                return bi;
+            }
+            catch (boost::bad_get v) {
+                printf("%s Type is NULL\n",elem.c_str());
+                return new NullType();
+            }
+        }
+    }
+    printf("%s Type is NULL NULL\n",elem.c_str());
+    return new NullType();
+}
+
+
+string GWt_abstractElement::getParamDescription(string elem) {
+    
+    if (parameterMapDescription.find(elem) == parameterMapDescription.end() )
+    {
+        printf("%s Descr is NULL NULL\n",elem.c_str());
+        return "";
+    } else {
+        printf("%s Descr is %s\n",elem.c_str(),parameterMapDescription.find(elem)->second.c_str());
+        return parameterMapDescription.find(elem)->second;
+    }
+}

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_beam.cc

@@ -19 +19 @@
 void GWt_beam::initilializeDialog() {
     string* param = beginDialog();
-    
+
+    registerParam("int____",2000, " 1/2 horizontal beam extend rms (cm) : ");
+    getParamValue("int____");
+    getParamDescription("int____");
+    registerParam("bool____",true, " 1/2 horizontal beam extend rms (cm) : ");
+    getParamValue("bool____");
+    getParamDescription("bool____");
+
+    string t = "ttttt";
+    registerParam("str____",t, " 1/2 horizontal beam extend rms (cm) : ");
+    getParamValue("str____");
+    getParamDescription("str____");
+
     new WText(" 1/2 horizontal beam extend rms (cm) : ",dialog_->contents());
     xEdit_ = new WLineEdit(param->c_str(), dialog_->contents());

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

@@ -274 +274 @@
     dessin->addWidget(caroule);
     dessin->addWidget(new WBreak());
-    
+
+
     
     
@@ -282 +283 @@
     WPushButton* okHisto = new WPushButton("histogramme");
     dessin->addWidget(okHisto);
+
     okHisto->clicked().connect(this,&PspaApplication::dessinerHistogramme);
     /////////////////////////////////////////////////////////////////////
@@ -359 +361 @@
     GWt_globalParameters* bibi = static_cast<GWt_globalParameters*>(globalParam_);
     bibi->renew();
-    
-    GWt_LigneFaisceau* bobo = static_cast<GWt_LigneFaisceau*>(beamLine_);
-//    bobo->restoreElementCollectionFromDataManager();
-    
+        
     console_->addConsoleMessage(string("...terminee"));
 }