Changeset 418 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/include/abstractElement.h

Timestamp:

Jun 21, 2013, 10:16:56 AM (11 years ago)

Author:

lemeur

Message:

definition des compatibilites des elements dans les software

File:

• Interface_Web/trunk/pspaWT/sources/controler/include/abstractElement.h (modified) (5 diffs)

Interface_Web/trunk/pspaWT/sources/controler/include/abstractElement.h

@@ -7 +7 @@
 
 #include "nomdElements.h"
-#include "nomDeLogiciel.h"
-#include "trivaluedBool.h"
+//#include "nomDeLogiciel.h"
+//#include "trivaluedBool.h"
 #include "abstractSoftware.h"
-#include "softwareGenerator.h"
-#include "softwareParmela.h"
-#include "softwareTest.h"
-#include "softwareTransport.h"
+/* #include "softwareGenerator.h" */
+/* #include "softwareParmela.h" */
+/* #include "softwareTest.h" */
+/* #include "softwareTransport.h" */
 
 using namespace std;
@@ -23 +23 @@
     int nbParam_;
     string* parametersString_;
-    //  double phaseStep_; // a recuperer dans les parametres globaux (methode setPhaseStep)
     double phaseStepMax_;
     
     double defaultLength_;
     double defaultAperture_;
-    string defaultLabel_;
+    string defaultSpecificName_;
     
-    string label_;
+    string specificName_;
     nomdElements elementName_;
     
@@ -51 +50 @@
     void setLabel(string lab);
     string getLabel() const;
-    //  typedElement getName() const;
     nomdElements getNomdElement() const;
     
-    /* string getElementImage() const; */
-    /* string getElementName() const; */
     
     double getLenghtOfElement() const;
     int getNbParams() const;
 
-    trivaluedBool is_accepted_by_software(nomDeLogiciel soft);
     
     virtual void setPhaseStep(double);
@@ -67 +62 @@
     virtual void setParametersString(string* param) = 0;
     virtual string* getParametersString() const = 0;
-    virtual string parmelaOutputFlow() const = 0;
-    virtual string transportOutputFlow() const = 0;
-    virtual string generatorOutputFlow() const;
     virtual string FileOutputFlow() const = 0;
+    virtual vector< pair<string, vector<string> > > parametersToSoftware () const =0;
     virtual void FileInput(ifstream& ifs) = 0;
     virtual string print() = 0;
@@ -79 +72 @@
         return abstractSoftware_;
     }
+
+   
     
-    
-    void registerAcceptableSoftware(nomDeLogiciel abs,trivaluedBool b);
     /**
      Set the software to this element
-     @param abstractName the name of the abstract software
-     @return trivaluedBool if this software is/not allowed/ignore on this component
+     @param abstractSoftware a pointer to the abstract software
      */
-    trivaluedBool setSoftware(nomDeLogiciel abstractName);
+    inline  void setSoftware(abstractSoftware* prog) { abstractSoftware_ = prog; }
+
     
+
     private :
-    abstractSoftware *abstractSoftware_;
 
-    /**
-     Acceptable software list for this element
-     */
-    std::vector <nomDeLogiciel> acceptableSoftware_;
-
-    /**
-     Ignore software list for this element
-     */
-    std::vector <nomDeLogiciel> ignoreSoftware_;
+            abstractSoftware *abstractSoftware_;
+    
 };
 #endif