Changeset 385 in PSPA

Timestamp:

Mar 12, 2013, 12:37:20 PM (11 years ago)

Author:

garnier

Message:

debut des modifications pour le comboBox : changement de sectionToExecute

Location:

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources

Files:

• controler/include/dataManager.h (modified) (3 diffs)
• controler/include/sectionToExecute.h (modified) (1 diff)
• controler/src/dataManager.cc (modified) (2 diffs)
• controler/src/sectionToExecute.cc (added)
• userInterface/include/GWt_ligneFaisceau.h (modified) (1 diff)
• userInterface/src/GWt_dialog.cc (modified) (1 diff)
• userInterface/src/GWt_ligneFaisceau.cc (modified) (2 diffs)
• userInterface/src/GWt_softwarePanel.cc (modified) (2 diffs)

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/controler/include/dataManager.h

@@ -30 +30 @@
   particleBeam* getDiagnosticBeam(unsigned index);
     
-  void addSectionToExecute(int debut, int fin, nomDeLogiciel prog);
+  void addSectionToExecute(abstractElement* debut,int debutIndex, abstractElement* fin, int finIndex, abstractSoftware* prog);
 
     abstractElement* addElement(typedElement elemType);
@@ -64 +64 @@
     bool restoreElements(string inputFileName);
     
+    abstractSoftware* createSoftwareConnexion(nomDeLogiciel logi);
     
 
@@ -79 +80 @@
     void removeFile(string nameOfFile);
     void clearSectionToExecute();
-    abstractSoftware* createSoftwareConnexion(nomDeLogiciel logi);
  
   };

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/controler/include/sectionToExecute.h

@@ -3 +3 @@
 
 #include "nomDeLogiciel.h"
+#include "abstractElement.h"
+#include "abstractSoftware.h"
 
-typedef struct  
+class sectionToExecute
 {
-  unsigned firstElement;  // numero premier element
-  unsigned lastElement;   // numero dernier element
-  nomDeLogiciel software;
-}  sectionToExecute;
+    public :
+    sectionToExecute(abstractElement*, abstractElement*, abstractSoftware*);
+
+    /** Deprecated : To be removed ! */
+    sectionToExecute(abstractElement*, int, abstractElement*, int, abstractSoftware*);
+    ~sectionToExecute() {;}
+
+    inline abstractElement* getFirstElement() {
+        return firstElement;
+    }
+    
+    inline abstractElement* getLastElement() {
+        return lastElement;
+    }
+    
+    /** Deprecated : To be removed ! */
+    inline int getFirstElementNumberInBeamLine() {
+        return firstElementNumberInBeamLine;
+    }
+    
+    /** Deprecated : To be removed ! */
+    inline int getLastElementNumberInBeamLine()  {
+        return lastElementNumberInBeamLine;
+    }
+    inline abstractSoftware* getSoftware() {
+        return software;
+    }
+    
+    private :
+    abstractElement*  firstElement;
+    abstractElement*  lastElement;
+
+    int firstElementNumberInBeamLine;
+    int lastElementNumberInBeamLine;
+    
+    abstractSoftware* software;
+};
 
 #endif

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/controler/src/dataManager.cc

@@ -64 +64 @@
 }
 
-void dataManager::addSectionToExecute(int debut, int fin, nomDeLogiciel prog)
-{
-    jobList_.push_back(new sectionToExecute);
-    jobList_.back()->firstElement = debut;
-    jobList_.back()->lastElement = fin;
-    jobList_.back()->software  = prog;
+void dataManager::addSectionToExecute(abstractElement* debut,int debutIndex, abstractElement* fin, int finIndex, abstractSoftware* prog)
+{
+    jobList_.push_back(new sectionToExecute(debut, debutIndex, fin, finIndex, prog));
 }
 
@@ -122 +119 @@
   for(unsigned k = 0; k < jobList_.size(); k++)
     {
-      cout << " dataManager::executeAll je m'apprete a executer : " << (jobList_[k]->software).getString() << endl;
-      
-      int debut = jobList_[k]->firstElement;
-      int fin = jobList_[k]->lastElement;
-      softw = createSoftwareConnexion(jobList_[k]->software);
+      cout << " dataManager::executeAll je m'apprete a executer : " << (jobList_[k]->getSoftware()->getName()) << endl;
+      
+      int debut = jobList_[k]->getFirstElementNumberInBeamLine();
+      int fin = jobList_[k]->getLastElementNumberInBeamLine();
+      softw = jobList_[k]->getSoftware();
       
       if (softw == NULL) {

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/include/GWt_ligneFaisceau.h

@@ -54 +54 @@
      */
     abstractElement* getAbstractElement(int i);
+
+    /** return the index of the abstract element 
+     @param : label of this abstractElement in the beam line
+     */
+    int getAbstractElementIndexFromLabel(std::string str);
+
     //    void restoreElementCollectionFromDataManager();
     void clickEvent(WContainerWidget*);

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/src/GWt_dialog.cc

@@ -24 +24 @@
         hLayout->addWidget(wc);
         widgt->setLayout(hLayout);
+
+        setClosable(true);
+        setModal (modal);
+        show();
     }
-    
-    setClosable(true);
-    setModal (modal);
 }
 

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/src/GWt_ligneFaisceau.cc

@@ -203 +203 @@
     }
     
-    // first if 1
-    //    i--;
     for (int a=0; a< ligneFaisceauLayout_->count(); a++) {
         if (ligneFaisceauLayout_->itemAt(a)) {
@@ -222 +220 @@
 
 
+int GWt_LigneFaisceau::getAbstractElementIndexFromLabel(std::string txt){
+    int index = 0;
+    if (txt == "") {
+        return NULL;
+    }
+    
+    for (int a=0; a< ligneFaisceauLayout_->count(); a++) {
+        if (ligneFaisceauLayout_->itemAt(a)) {
+            
+            if (GWt_elementLigneFaisceau* elem = dynamic_cast <GWt_elementLigneFaisceau*> (ligneFaisceauLayout_->itemAt(a)->widget ())) {
+                if (elem->getGWt_AbstractElement()) {
+                    if (elem->getGWt_AbstractElement()->getAbstractElement()->getLabel() == txt) {
+                        return index;
+                    }
+                }
+                index ++;
+            }
+        }
+    }
+    return NULL;
+    
+}
+
+
 int GWt_LigneFaisceau::getBeamLineSize() {
   int count = 0;

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/src/GWt_softwarePanel.cc

@@ -275 +275 @@
       string finString = (*itr)->fin->text().toUTF8();
       
-      int debut = dtmanage_->getNumeroFromElementLabel(debString);
-      int fin = dtmanage_->getNumeroFromElementLabel(finString);
+      int debut = pspa_->getBeamLine()->getAbstractElementIndexFromLabel(debString)+1; // FIXME : Should NOT be +1
+        int fin = pspa_->getBeamLine()->getAbstractElementIndexFromLabel(finString)+1; // FIXME : Should NOT be +1
+
       nomDeLogiciel prog = nomDeLogiciel ( (*itr)->selection->currentIndex() );
-      dtmanage_->addSectionToExecute(debut,fin,prog);
+      dtmanage_->addSectionToExecute(pspa_->getBeamLine()->getAbstractElement(debut),
+                                     debut,
+                                     pspa_->getBeamLine()->getAbstractElement(fin),
+                                     fin,
+                                     dtmanage_->createSoftwareConnexion(prog));
         
       // check sections
@@ -337 +342 @@
       (*selectedSections_.begin())->fin->setText(dernierText);
     }
-  
-  cout << "PspaApplication::updateSelections(): " << premierText << " à  " << dernierText << endl;
 }