Changeset 310 in PSPA for Interface_Web

Timestamp:

Feb 5, 2013, 11:26:22 AM (11 years ago)

Author:

garnier

Message:

Bug #28 fixed

Location:

Interface_Web/trunk/pspaWT

Files:

• History (modified) (1 diff)
• sources/userInterface/include/GWt_abstractElement.h (modified) (2 diffs)
• sources/userInterface/include/GWt_beam.h (modified) (1 diff)
• sources/userInterface/include/GWt_bend.h (modified) (1 diff)
• sources/userInterface/include/GWt_cell.h (modified) (1 diff)
• sources/userInterface/include/GWt_drift.h (modified) (1 diff)
• sources/userInterface/include/GWt_fit.h (modified) (1 diff)
• sources/userInterface/include/GWt_rfgun.h (modified) (1 diff)
• sources/userInterface/include/GWt_soleno.h (modified) (1 diff)
• sources/userInterface/src/GWt_abstractElement.cc (modified) (5 diffs)
• sources/userInterface/src/GWt_beam.cc (modified) (1 diff)
• sources/userInterface/src/GWt_bend.cc (modified) (1 diff)
• sources/userInterface/src/GWt_cell.cc (modified) (1 diff)
• sources/userInterface/src/GWt_drift.cc (modified) (1 diff)
• sources/userInterface/src/GWt_elementLigneFaisceau.cc (modified) (1 diff)
• sources/userInterface/src/GWt_fit.cc (modified) (1 diff)
• sources/userInterface/src/GWt_rfgun.cc (modified) (1 diff)
• sources/userInterface/src/GWt_soleno.cc (modified) (1 diff)

Interface_Web/trunk/pspaWT/History

@@ -8 +8 @@
 5 Février 2013 Laurent Garnier
 - Change cursor style on drag elements
+- Correction d'un bug introduit dans la derniere revision #28
+- Quelques renommages
 
 4 Février 2013 Laurent Garnier

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

@@ -43 +43 @@
     
     GWt_abstractElement(abstractElement*);
-    
-    // methode Factory
-    static GWt_abstractElement *ajoute(abstractElement* ptr);
-    
+        
     void initialize();
     void clicked();
@@ -66 +63 @@
     virtual string getBigImageURL()= 0;
     virtual string getName()= 0;
-    virtual void initializeElement() = 0;
+    virtual void initilializeDialog() = 0;
 
     void createDragImage(WContainerWidget*);

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

@@ -29 +29 @@
 
     private :
-    void initializeElement();
+    void initilializeDialog();
 };
 

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

@@ -30 +30 @@
     
     private :
-    void initializeElement();
+    void initilializeDialog();
 
 };

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

@@ -41 +41 @@
     
     private :
-    void initializeElement();
+    void initilializeDialog();
 
 };

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

@@ -32 +32 @@
     
     private :
-    void initializeElement();
+    void initilializeDialog();
 
 };

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

@@ -27 +27 @@
     
     private :
-    void initializeElement();
+    void initilializeDialog();
 
 };

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

@@ -40 +40 @@
     
     private :
-    void initializeElement();
+    void initilializeDialog();
 
 };

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

@@ -39 +39 @@
     
     private :
-    void initializeElement();
+    void initilializeDialog();
 
 };

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

@@ -29 +29 @@
     abstractElement_ = elem;
     setStyleClass("beamLineIcon");
-
 }
 
@@ -42 +41 @@
     image_->clicked().connect(this,&GWt_abstractElement::clicked);
     addWidget(image_);
-    initializeElement();
     updateLabelAndToolTipWidget();
 }
@@ -87 +85 @@
 void GWt_abstractElement::clicked()
 {
+    initilializeDialog();
     dialog_->show();
 }
@@ -118 +117 @@
 }
 
-GWt_abstractElement* GWt_abstractElement::ajoute(abstractElement* ptr)
-{
-    /*
-     typedElement eType = ptr->getNomdElement().getElementType();
-     
-     switch (  eType ) {
-     case RFgun : return new GWt_rfgun(ptr);
-     case drift : return new GWt_drift(ptr);
-     case cell  : return new GWt_cell(ptr);
-     case bend  : return new GWt_bend(ptr);
-     case soleno  : return new GWt_soleno(ptr);
-     case beam  : return new GWt_beam(ptr);
-     case fit  : return new GWt_fit(ptr);
-     case inconnu : return NULL;
-     default : return NULL;
-     }
-     */
-    return NULL;
-}
-
 
 void GWt_abstractElement::createDragImage(WContainerWidget* w){
@@ -157 +136 @@
 void GWt_abstractElement::FileInput(ifstream& ifs){
     getAbstractElement()->FileInput(ifs);
-    initialize();
+    initilializeDialog();
+    updateLabelAndToolTipWidget();
 }

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

@@ -12 +12 @@
 {
     elementLigneFaiseauContainer_ = elemLigne;
+    initialize();
 
 }
 
 
-void GWt_beam::initializeElement() {
+void GWt_beam::initilializeDialog() {
     string* param = beginDialog();
     

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

@@ -13 +13 @@
 {
     elementLigneFaiseauContainer_ = elemLigne;
+    initialize();
 }
 
 
-void GWt_bend::initializeElement() {
+void GWt_bend::initilializeDialog() {
     string* param = beginDialog();
     

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

@@ -14 +14 @@
 {
     elementLigneFaiseauContainer_ = elemLigne;
+    initialize();
 }
 
-void GWt_cell::initializeElement() {
+void GWt_cell::initilializeDialog() {
 
     string* param = beginDialog();

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

@@ -13 +13 @@
 {
     elementLigneFaiseauContainer_ = elemLigne;
+    initialize();
 }
 
 
-void GWt_drift::initializeElement() {
+void GWt_drift::initilializeDialog() {
     string* param = beginDialog();
     

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

@@ -210 +210 @@
 
 void GWt_elementLigneFaisceau::setElementLabel(std::string label) {
-    elementLabel_->setText(label);
-}
-
+    if (elementLabel_) {
+        elementLabel_->setText(label);
+    }
+}
+

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

@@ -13 +13 @@
 {
     elementLigneFaiseauContainer_ = elemLigne;
+    initialize();
 }
 
 
-void GWt_fit::initializeElement() {
+void GWt_fit::initilializeDialog() {
 
     string* param = beginDialog();

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

@@ -12 +12 @@
 {
     elementLigneFaiseauContainer_ = elemLigne;
+    initialize();
 }
 
 
-void GWt_rfgun::initializeElement() {
+void GWt_rfgun::initilializeDialog() {
 
     string* param = beginDialog();

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

@@ -12 +12 @@
 {
     elementLigneFaiseauContainer_ = elemLigne;
+    initialize();
 }
 
 
-void GWt_soleno::initializeElement() {
+void GWt_soleno::initilializeDialog() {
 
     string* param = beginDialog();