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


Ignore:
Timestamp:
Dec 13, 2012, 7:25:01 PM (12 years ago)
Author:
lemeur
Message:

ajout d'un element 'beam' (transport)

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

Legend:

Unmodified
Added
Removed

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

    r153 r179  
    44#include "GWt_pspaApplication.h"
    55#include "GWt_abstractElement.h"
    6 #include "abstractElement.h"
    7 
    8 #include <iostream>
    9 #include <string>
    10 #include <sstream>
    11 
    12 using namespace Wt;
    13 using namespace std;
    146
    157class GWt_bend : public GWt_abstractElement

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

    r177 r179  
    3333 
    3434 dataManager* dtmanage_;
    35  
     35 string nameOfCase_;
     36
     37 WDialog* dialogSave_;
     38 WLineEdit* saveNameEdit_;
     39
     40
    3641 WContainerWidget* console_;
    3742 WWidget* globalParam_;
    … …  
    5863 void executer();
    5964 void sauver();
     65 void dialogSaveDone();
    6066 void restaurer();
    6167 void chargerConfig();

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

    r149 r179  
    2222
    2323  void createInputFileParmela( unsigned int indexDeb, unsigned int indexFin);
    24   bool createInputFileTransport( unsigned int indexDeb, unsigned int indexFin);
     24  bool createInputFileTransport( unsigned int numeroDeb, unsigned int numeroFin);
    2525  void removeFile(string nameOfFile);
    2626  void clearSectionToExecute();
    … …  
    5353  bool executeParmela( unsigned int indexDeb, unsigned int indexFin, string& resul);
    5454  bool executeAll(string& resul);
    55   void saveAll();
     55  void saveConfiguration(string nameOfFile);
    5656  void restoreElements();
    5757  void donneesRmsEnveloppe( string type, unsigned int numeroDeb, unsigned int numeroFin, vector<double>& xcor, vector<double>& ycor);

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

    r160 r179  
    44using namespace std;
    55
    6 enum typedElement {RFgun, drift, cell, bend, soleno, inconnu};
     6enum typedElement {RFgun, drift, cell, bend, soleno, beam, inconnu};
    77
    88
    … …  
    1414  std::string eImg_;  // nom du fichier de l'icone
    1515  std::string eLabel_; // label affiche sous l'icone
    16 
     16  unsigned nbParam_;   // nombre de parametres a saisir
    1717
    1818  static   typedElement fromImage(std::string s);
    … …  
    2020  static   std::string toImage(typedElement eType);
    2121  static   std::string toLabel(typedElement eType);
     22  static   unsigned toNbParam(typedElement eType);
    2223
    2324 public :
    … …  
    3839  std::string getElementLabel() const;
    3940  std::string getElementImage() const;
     41  unsigned getElementNbParameters() const;
    4042
    4143  // operators

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

    r166 r179  
    1212#include "mathematicalTools.h"
    1313#include "nomdElements.h"
     14#include "transportMoments.h"
    1415
    1516using namespace std;
    … …  
    4344  vector<bareParticle> goodPartic_;
    4445
    45   vector< vector<double> > rij_transportMoments_;
     46  transportMoments rij_;
     47
     48  //  vector< vector<double> > rij_transportMoments_;
    4649  vector<double> centroid_;
    4750  double P0Transport_;
    … …  
    6568  bool  setFromTransport(string elementLabel, const nomdElements elem);
    6669
     70  //  void setFromBeamParameters(double x, double xp, double y, double yp, double dl, double del, double P0);
     71
     72
     73
    6774  void clear();
    6875
    6976  int getNbParticles() const;
    7077
    71   const vector< vector<double> >&  getTransportMoments() const;
     78  const transportMoments&  getTransportMoments() const;
    7279  double getP0Transport() const;
    7380  bool particleRepresentationOk() const;
Note: See TracChangeset for help on using the changeset viewer.