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

Timestamp:

Nov 15, 2013, 3:30:50 PM (11 years ago)

Author:

touze

Message:

systeme periodique (mailles) + multipoles + madx

File:

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

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

@@ -7 +7 @@
 
 #include "nomdElements.h"
-//#include "nomDeLogiciel.h"
-//#include "trivaluedBool.h"
 #include "abstractSoftware.h"
-/* #include "softwareGenerator.h" */
-/* #include "softwareParmela.h" */
-/* #include "softwareTest.h" */
-/* #include "softwareTransport.h" */
 
 #include "UAP/UAPNode.hpp"
-
 using namespace std;
 
@@ -26 +19 @@
   int nbParam_;
   string* parametersString_;
-  double phaseStepMax_;
+  
+  string defaultSpecificName_;
+  string specificName_;
+  nomdElements elementName_;
     
   double defaultLength_;
   double defaultAperture_;
-  string defaultSpecificName_;
-  
-  string specificName_;
-  nomdElements elementName_;
+  double phaseStepMax_;
   
   double lenghtElem_; // cm
   double aperture_; // cm
-  
   double stepmaxcm_;
-  //  bool curvedTrajectory_;
   
   void setDefaultValues();
@@ -51 +42 @@
   
   void setParameters(double ll,double aper);
+  
+  nomdElements getNomdElement() const;
+  int getNbParams() const;
+
   void setLabel(string lab);
   string getLabel() const;
-  nomdElements getNomdElement() const;
-  
+
   double getLenghtOfElement() const;
-  int getNbParams() const;
   
   virtual void setPhaseStep(double);
@@ -67 +60 @@
   virtual void FileInput(ifstream& ifs) = 0;
   virtual string print() = 0;
-  
   virtual void InputRep(UAPNode* root) = 0;