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

Timestamp:

Dec 4, 2012, 7:46:42 PM (12 years ago)

Author:

lemeur

Message:

dessins

Location:

Interface_Web/trunk/pspaWT/include

Files:

• GWt_pspaApplication.h (modified) (4 diffs)
• dataManager.h (modified) (1 diff)

Interface_Web/trunk/pspaWT/include/GWt_pspaApplication.h

@@ -37 +37 @@
  WWidget* globalParam_;
  WWidget* beamLine_;
- WWidget* leDessin_;
+ WContainerWidget* leDessin_;
  WPushButton *exec_go_;
  WText* probleme_;
-
+ WText* encours_;
+  WComboBox* choixElementDessin_;
+ WContainerWidget* toto_;
  WContainerWidget* contenuSections_;
  list<GWt_sectionToExecute*> selectedSections_;
@@ -49 +51 @@
  WWidget* createGlobalParamWidget();
  WWidget* createExecuteWidget();
- WWidget* createDrawingWidget();
+ WContainerWidget* createDrawingWidget();
  
  void createDragImage(const char *url,const char *smallurl,const char *mimeType,WContainerWidget *p,WString name);
@@ -55 +57 @@
  void sauver();
  void restaurer();
- 
+ void dessiner();
+
  void addSectionToExecuteW();
  void deleteSectionToExecuteW();
@@ -62 +65 @@
  bool areDataCoherent();
  void faireDessin();
- void faireDessinParmela();
- void faireDessinTransport();
+ void faireDessinParmela(WContainerWidget* toto, particleBeam* beam);
+ void faireDessinTransport(WContainerWidget* toto, particleBeam* beam);
 
  public :

Interface_Web/trunk/pspaWT/include/dataManager.h

@@ -41 +41 @@
   inline elementsCollection* getCollection() {return &elementsGallery_;}
   inline particleBeam* getCurrentBeam() {return currentBeam_;}
+
+  particleBeam* getDiagnosticBeam(int index);
+
   void addSectionToExecute(int debut, int fin, nomDeLogiciel prog);