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


Ignore:
Timestamp:
Nov 9, 2012, 10:01:24 PM (12 years ago)
Author:
lemeur
Message:

implementation sections de calcul

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

Legend:

Unmodified
Added
Removed

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

    r54 r58  
    1515{
    1616
    17   WPanel* panneau_;
    1817  PspaApplication* pspa_;
    1918  //  dataManager* dtmanage_;
    … …  
    2322  WLineEdit* nscEdit_;
    2423
     24  //  vector<WComboBox*> sectionSelection_;
    2525
     26
     27  /* WLineEdit* origineEdit1_; */
     28  /* WLineEdit* origineEdit2_; */
     29  /* WComboBox* selectionBox1_; */
     30
     31  /* WLineEdit* extremiteEdit1_; */
     32  /* WLineEdit* extremiteEdit2_; */
     33  /* WComboBox* selectionBox2_; */
     34
     35  //  WContainerWidget* contenuSections_;
    2636
    2737    GWt_globalParameters() {;}
    … …  
    3747    void renew();
    3848
     49    //    void addElem();
     50
     51    //    void addSection();
     52
     53    //   void getExecute(unsigned index, unsigned& first, unsigned& last, int& programm);
     54
    3955    //  void lancerCalcul();
    4056

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

    r56 r58  
    11#ifndef PSPA_SEEN
    22#define  PSPA_SEEN
     3
     4
     5#include <list>
    36
    47#include <Wt/WApplication>
    … …  
    69#include <Wt/WContainerWidget>
    710#include <Wt/WTextArea>
     11#include <Wt/WPanel>
     12#include <Wt/WComboBox>
    813
    914#include "dataManager.h"
    10 
    11 // c++0x only, for std::bind
    12 // #include <functional>
    1315
    1416using namespace Wt;
    … …  
    2022{
    2123
     24typedef struct
     25{
     26  WLineEdit* debut;
     27  WLineEdit*  fin;
     28  WComboBox* selection;
     29} GWt_sectionToExecute;
     30
     31
    2232
    2333 private :
    … …  
    2838  WContainerWidget* leDessin_;
    2939
     40  WContainerWidget* contenuSections_;
    3041
     42  list<GWt_sectionToExecute*> selectedSections_;
    3143
    3244  WWidget* createPalette();
    3345  WWidget* createBeamLine();
    3446  WWidget* createGlobalParamWidget();
     47  WWidget* createExecuteWidget();
     48
    3549  void createDragImage(const char *url, const char *smallurl,
    3650                  const char *mimeType,
    3751                  WContainerWidget *p);
     52
    3853
    3954  void executer();
    … …  
    4156  void restaurer();
    4257
     58  void addSectionToExecuteW();
     59
    4360
    4461  void faireDessin();
     62
     63
    4564
    4665public:
    … …  
    5675  }
    5776
     77  //  void addElemToGlobals();
     78  void updateSelections();
     79
    5880};
    5981

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

    r56 r58  
    11#ifndef DATAMANAGER_SEEN
    22#define DATAMANAGER_SEEN
     3
     4
     5//#include<vector>
     6
    37
    48#include "abstractElement.h"
    … …  
    711#include "nomdElements.h"
    812#include "particleBeam.h"
     13#include "sectionToExecute.h"
     14#include "nomDeLogiciel.h"
     15
    916
    1017//using namespace std;
    … …  
    1724  particleBeam currentBeam_;
    1825
     26    vector<sectionToExecute*> jobList_;
     27
    1928  void createInputFileParmela( unsigned int indexDeb, unsigned int indexFin);
    20   string executeParmela( unsigned int indexDeb, unsigned int indexFin);
    2129
    2230 public:
    … …  
    2432 
    2533  dataManager() {;}
    26   ~dataManager() {;}
     34  ~dataManager()
     35{
     36  unsigned k;
     37
     38  for (k=0; k < jobList_.size();k++)
     39    {
     40      if ( jobList_[k] != NULL ) delete jobList_[k];
     41    }
     42}
    2743
    2844  inline int beamLineSize() {return elementsGallery_.size();}
    … …  
    3046  inline elementsCollection* getCollection() {return &elementsGallery_;}
    3147  inline particleBeam& getCurrentBeam() {return currentBeam_;}
     48
     49    void addSectionToExecute(int debut, int fin, nomDeLogiciel prog);
     50 
    3251  abstractElement* addElement(nomdElement elemType);
    3352  abstractElement* addCell();
    3453  abstractElement* addDrift();
    3554  abstractElement* addInitialBeam();
     55  string executeTransport( unsigned int indexDeb, unsigned int indexFin);
     56  string executeParmela( unsigned int indexDeb, unsigned int indexFin);
    3657  string executeAll();
    3758  void saveAll();
    3859  void restoreAll();
    39 
    4060};
    4161

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

    r50 r58  
    22#define NOMDELEMENTS_SEEN
    33
    4 #include <string>
    54
    65using namespace std;
Note: See TracChangeset for help on using the changeset viewer.