Changeset 489 in PSPA

Timestamp:

Feb 10, 2014, 4:34:03 PM (10 years ago)

Author:

touze

Message:

nvx elts: quadrupole & sextupole

Location:

Interface_Web/trunk/pspaWT/sources

Files:

• controler/src/nomDeLogiciel.cc (modified) (2 diffs)
• userInterface/include/GWt_abstractElementFactory.h (modified) (1 diff)
• userInterface/include/GWt_elementQpole.h (modified) (1 diff)
• userInterface/include/GWt_elementSpole.h (modified) (1 diff)
• userInterface/src/GWt_pspaApplication.cc (modified) (1 diff)

Interface_Web/trunk/pspaWT/sources/controler/src/nomDeLogiciel.cc

@@ -81 +81 @@
 void nomDeLogiciel::setCompatiblesElements() 
 {
-  cout << " nomDeLogiciel::setCompatiblesElements() " << program_ << endl;
+  //cout << " nomDeLogiciel::setCompatiblesElements() " << program_ << endl;
   switch (program_) 
     {
@@ -138 +138 @@
   //xx
 
-  cout << " nomDeLogiciel::doAcceptElement type : " << typdel << endl;
-  cout << " nomDeLogiciel::doAcceptElement nb el/ acc. " << acceptedElements_.size() << endl;
+  //cout << " nomDeLogiciel::doAcceptElement type : " << typdel << endl;
+  //cout << " nomDeLogiciel::doAcceptElement nb el/ acc. " << acceptedElements_.size() << endl;
   if (acceptedElements_.size() == 0 ) {
     return TBoolError;

Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_abstractElementFactory.h

@@ -71 +71 @@
   /* Enable the qpole element creation
    */
-  inline void setQPoleEnable(bool a) { isMPoleElementEnable = a;};
+  inline void setQPoleEnable(bool a) { isQPoleElementEnable = a;};
   
  /* Enable the spole element creation
    */
-  inline void setSPoleEnable(bool a) { isMPoleElementEnable = a;};
+  inline void setSPoleEnable(bool a) { isSPoleElementEnable = a;};
   
   GWt_elementDrift* createDriftElement();

Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_elementQpole.h

@@ -27 +27 @@
   WImage* getImage();
     
-  inline string getMimeType() {return "htdocs/mpole.jpg";}
-  inline string getSmallImageURL() {return "htdocs/mpole.jpg";}
-  inline string getBigImageURL() {return "htdocs/mpole.jpg";}
-  inline string getName() {return "mpole";}
+  inline string getMimeType() {return "htdocs/qpole.jpg";}
+  inline string getSmallImageURL() {return "htdocs/qpole.jpg";}
+  inline string getBigImageURL() {return "htdocs/qpole.jpg";}
+  inline string getName() {return "qpole";}
   
  private :

Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_elementSpole.h

@@ -27 +27 @@
   WImage* getImage();
     
-  inline string getMimeType() {return "htdocs/mpole.jpg";}
-  inline string getSmallImageURL() {return "htdocs/mpole.jpg";}
-  inline string getBigImageURL() {return "htdocs/mpole.jpg";}
-  inline string getName() {return "mpole";}
+  inline string getMimeType() {return "htdocs/spole.jpg";}
+  inline string getSmallImageURL() {return "htdocs/spole.jpg";}
+  inline string getBigImageURL() {return "htdocs/spole.jpg";}
+  inline string getName() {return "spole";}
   
  private :

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

@@ -66 +66 @@
   abstractElementFactory_->setSnapshotEnable(true);
   abstractElementFactory_->setMPoleEnable(true);
+  abstractElementFactory_->setQPoleEnable(true);
+  abstractElementFactory_->setSPoleEnable(true);
+
   cout << " PspaApplication::PspaApplication abstractElementFactory REPUTEE CONSTRUITE " << endl;
+
   // include the styleSheetcd 
   WContainerWidget *mainContainerWidget = root();