Changeset 133 in PSPA for Interface_Web/trunk/pspaWT/include


Ignore:
Timestamp:
Dec 4, 2012, 1:57:53 PM (12 years ago)
Author:
touze
Message:

bug fixed for build in Jenkins

Location:
Interface_Web/trunk/pspaWT/include
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Interface_Web/trunk/pspaWT/include/GWt_LigneFaisceau.h

    r126 r133  
    2727  WHBoxLayout* beamLayout_;
    2828  PspaApplication* pspa_;
    29   //Compteur *nObjets_[nElements];
    3029  Compteur *nObjets_;
    3130
    32   //string createLabel(abstractElement* elem, int n);
    3331  string createLabel(nomdElements el,int n);
    3432
    3533 public :
     34 
     35  GWt_LigneFaisceau() {;}
     36  GWt_LigneFaisceau(PspaApplication*);
    3637
    37   GWt_LigneFaisceau(PspaApplication*);
     38  ~GWt_LigneFaisceau() {
     39    if(nObjets_ != NULL) delete[] nObjets_;
     40  }
     41 
    3842  void restoreElementCollection();
    3943

  • Interface_Web/trunk/pspaWT/include/globalParameters.h

    r50 r133  
    66#include <fstream>
    77
    8 
    98using namespace std;
    109
    1110class globalParameters 
     11{
     12  double frequencyDef_;
     13  double integrationStepDef_;
     14  int nstepsMaxDef_;
     15  int nscDef_;
    1216
    13 {
    14 
    15 double frequencyDef_;
    16 double integrationStepDef_;
    17 int nstepsMaxDef_;
    18 int nscDef_;
    19 
    20 double frequency_;
    21 double integrationStep_;
    22 int nstepsMax_;
    23 int nsc_;
     17  double frequency_;
     18  double integrationStep_;
     19  int nstepsMax_;
     20  int nsc_;
    2421
    2522  int nbParam_;
    2623  string* parametersString_;
    2724
     25  void setDefaultValues()
     26  {
     27    frequencyDef_ = 2998.652;
     28    integrationStepDef_ = 1.0;
     29    nstepsMaxDef_ = 100000;
     30    nscDef_ = 10;
     31  }
    2832
    29  void setDefaultValues()
    30  {
    31    frequencyDef_ = 2998.652;
    32    integrationStepDef_ = 1.0;
    33    nstepsMaxDef_ = 100000;
    34    nscDef_ = 10;
    35  }
    36  void setDefaults()
    37  {
    38    frequency_ = frequencyDef_;
    39    integrationStep_ = integrationStepDef_;
    40    nstepsMax_ = nstepsMaxDef_;
    41    nsc_ = nscDef_;
    42  }
    43 
    44 
    45 
    46 public:
    47  globalParameters();
    48 
    49  ~globalParameters()
    50 {
    51   if ( parametersString_ != NULL) delete [] parametersString_;
    52 }
    53 
    54  inline void raz() { setDefaults();}
    55 
    56  inline double getFrequency() const {return frequency_;}
    57  inline double getIntegrationStep() const {return integrationStep_;}
    58  inline int getNbSteps() const {return nstepsMax_;}
    59 
    60  inline int getScPeriod() const {return nsc_;}
    61 
     33  void setDefaults()
     34  {
     35    frequency_ = frequencyDef_;
     36    integrationStep_ = integrationStepDef_;
     37    nstepsMax_ = nstepsMaxDef_;
     38    nsc_ = nscDef_;
     39  }
     40 
     41 public:
     42 
     43  globalParameters();
     44  ~globalParameters()
     45    {
     46      if ( parametersString_ != NULL) delete [] parametersString_;
     47    }
     48 
     49  inline void raz() { setDefaults();}
     50  inline double getFrequency() const {return frequency_;}
     51  inline double getIntegrationStep() const {return integrationStep_;}
     52  inline int getNbSteps() const {return nstepsMax_;} 
     53  inline int getScPeriod() const {return nsc_;}
    6254  string* getParametersString() const;
    63 
    64 
    65  void setParametersString(string* param);
    66 
    67  string FileOutputFlow() const;
    68 
    69  void FileInput(ifstream& ifs);
    70 
    71 
     55  void setParametersString(string* param);
     56  string FileOutputFlow() const;
     57  void FileInput(ifstream& ifs);
    7258};
    73 
    7459#endif
Note: See TracChangeset for help on using the changeset viewer.