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

Timestamp:

Jan 3, 2013, 9:50:36 AM (11 years ago)

Author:

lemeur

Message:

labels et dessins

Location:

Interface_Web/trunk/pspaWT/include

Files:

• GWt_abstractElement.h (modified) (2 diffs)
• GWt_soleno.h (modified) (2 diffs)
• abstractElement.h (modified) (2 diffs)
• elementSoleno.h (modified) (1 diff)
• particleBeam.h (modified) (1 diff)
• transportMoments.h (modified) (1 diff)

Interface_Web/trunk/pspaWT/include/GWt_abstractElement.h

@@ -22 +22 @@
   WPushButton* dropped_;
   WContainerWidget* wc_;
-
+  WText* wc_item_;
   WLineEdit* labelEdit_;
 
@@ -36 +36 @@
 
   void clicked();
+  void setLabelWidget();
   void updateLabelWidget();
   WPushButton* getButton();

Interface_Web/trunk/pspaWT/include/GWt_soleno.h

@@ -1 +1 @@
 #ifndef GWTSOLENO_SEEN
 #define GWTSOLENO_SEEN
+
+#include <Wt/WCheckBox>
 
 //#include "GWt_pspaApplication.h"
@@ -18 +20 @@
   WLineEdit* apertureEdit_;
   WLineEdit* B0Edit_;
+  WCheckBox* varyB0Edit_;
 
   GWt_soleno() {;}

Interface_Web/trunk/pspaWT/include/abstractElement.h

@@ -15 +15 @@
   
   bool parmelaOk_;
+  bool parmelaIgnored_;
   bool transportOk_;
   int nbParam_;
@@ -54 +55 @@
   double getLenghtOfElement() const;
   int getNbParams() const;  
+  bool is_parmela_ignored() const;
   bool is_parmela_element() const;
   bool is_transport_element() const;

Interface_Web/trunk/pspaWT/include/elementSoleno.h

@@ -16 +16 @@
   double B0Def_;   // en kilogauss 
 
+  bool varyB0_;
+  bool varyB0Def_;
 
 

Interface_Web/trunk/pspaWT/include/particleBeam.h

@@ -51 +51 @@
 
 
-  void readTransportMoments(ifstream& inp);
+  //  void readTransportMoments(ifstream& inp);
+  void readTransportMoments(stringstream& inp);
 
   void impressionDesMoments() const;

Interface_Web/trunk/pspaWT/include/transportMoments.h

@@ -32 +32 @@
  void raz();
 
- void readFromTransportOutput(ifstream& inp);
+ // void readFromTransportOutput(ifstream& inp);
+ void readFromTransportOutput(stringstream& inp);
  string writeToTransportInput(double P0) const;