Changeset 485 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/include/abstractSoftware.h

Timestamp:

Jan 28, 2014, 11:56:15 AM (10 years ago)

Author:

lemeur

Message:

liste des logiciels compatibles dans les tooltip des elements

File:

• Interface_Web/trunk/pspaWT/sources/controler/include/abstractSoftware.h (modified) (4 diffs)

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

@@ -24 +24 @@
   dataManager* dataManager_;
   string inputFileName_;
-  nomDeLogiciel nameOfSoftware_;
+  nomDeLogiciel* nameOfSoftware_;
 
   /**
      Accepted elements list for this software
   */
-  std::vector <nomdElements::typedElement> acceptedElements_;
+  //  std::vector <nomdElements::typedElement> acceptedElements_;
 
   /**
      Ignore software list for this element
   */
-  std::vector <nomdElements::typedElement> ignoredElements_;
+  //  std::vector <nomdElements::typedElement> ignoredElements_;
   
   abstractSoftware();
@@ -40 +40 @@
   bool launchJob(string commandLine, string& resul);
 
-  void registerElement(nomdElements::typedElement nomdel,trivaluedBool b);
+  //  void registerElement(nomdElements::typedElement nomdel,trivaluedBool b);
 
   sectionToExecute* getSectionToExecute() {
@@ -49 +49 @@
 
   abstractSoftware(string, sectionToExecute*, dataManager* );
-  ~abstractSoftware() {;}
+  ~abstractSoftware() {
+    delete nameOfSoftware_;
+}
 
   inline const nomDeLogiciel* getNomDeLogiciel() const {
-    return &nameOfSoftware_;
+    return nameOfSoftware_;
   }
 
-  trivaluedBool doAcceptElement(nomdElements::typedElement typdel);
+  //   trivaluedBool doAcceptElement(nomdElements::typedElement typdel);
 
   virtual bool createInputFile(particleBeam* beamBefore, string workingDir) = 0;
@@ -69 +71 @@
    */
   inline string getName() const {
-    return nameOfSoftware_.getString();
+    return nameOfSoftware_->getString();
   }
   private :