Changeset 474 in PSPA

Timestamp:

Jan 2, 2014, 10:15:24 PM (10 years ago)

Author:

garnier

Message:

prise en charge de la restauration dun fichier de sauvegarde

Location:

Interface_Web/trunk/pspaWT/sources

Files:

• controler/include/sectionToExecute.h (modified) (4 diffs)
• controler/include/sector.h (modified) (1 diff)
• controler/src/dataManager.cc (modified) (3 diffs)
• controler/src/sectionToExecute.cc (modified) (2 diffs)
• controler/src/sector.cc (modified) (3 diffs)
• userInterface/include/GWt_accelerator.h (modified) (1 diff)
• userInterface/include/GWt_pspaApplication.h (modified) (1 diff)
• userInterface/include/GWt_sectionToExecute.h (modified) (1 diff)
• userInterface/src/GWt_accelerator.cc (modified) (3 diffs)
• userInterface/src/GWt_console.cc (modified) (1 diff)
• userInterface/src/GWt_pspaApplication.cc (modified) (5 diffs)
• userInterface/src/GWt_sectionToExecute.cc (modified) (2 diffs)
• userInterface/src/GWt_softwarePanel.cc (modified) (3 diffs)

Interface_Web/trunk/pspaWT/sources/controler/include/sectionToExecute.h

@@ -5 +5 @@
 #include "abstractElement.h"
 #include "abstractSoftware.h"
+#include "sector.h"
 
 class sectionToExecute
@@ -12 +13 @@
   /** Create a new sectionToExecute and initialize it with the given element and software
    */
-  sectionToExecute(abstractElement*,abstractSoftware*,dataManager*);
+  sectionToExecute(abstractElement*,abstractSoftware*,dataManager*,sector*);
   
   /** Deprecated : To be removed ! */
@@ -53 +54 @@
     elements_.insert ( elements_.begin() ,abs);
   };
+
+  /** Set the first element of this section.
+   If needed, it will change the last element of the previous section
+   */
+  void setFirstElement(std::string);
   
   private :
@@ -59 +65 @@
   dataManager* dataManager_;
   std::vector< abstractElement* > elements_;
+  sector* sector_;
 };
 #endif

Interface_Web/trunk/pspaWT/sources/controler/include/sector.h

@@ -75 +75 @@
   void addElementAfter(abstractElement*,abstractElement*);
   
-  /**
+  /** Add an element after another one. Will put it in the same sectionToExecuteList. If the element after is NULL
+   it will create a new sectionToExecute and put it inside.
+   if the previous element is NULL, it will try to add at the beginning of the first section
+   @return : the new element
+   */
+  abstractElement* addElementAfter(nomdElements::typedElement, abstractElement* );
+
+    /**
  set the specific software for the given sectionToExecute number
  */

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

@@ -261 +261 @@
   //NOTE:: je ne sais pas si les "secteurs" seront conservés, aussi pour ne pas trop changer les fichiers je lis les données aprÚs "globals" dans la boucle 
   
-  pspa_->getBeamLine_deprecated()->clear();
+  // Clear the BeamLine
+  jobList_.clear();
+
+  // FIXME : For test purpose !!!
+  sector* mySect = addNewSector();
+  
   nomdElements::typedElement elementType;
   string elementLabel;
@@ -275 +280 @@
     } else {
       elementType = nomdElements::getTypeFromLabel(elementLabel);
-      GWt_abstractElement* nouveau = pspa_->getBeamLine_deprecated()->addElement(elementType);
+      abstractElement* nouveau = mySect->addElementAfter(elementType,NULL);
       if ( nouveau == NULL ) {
         cerr << " dataManager::restoreElements() : restore element " << elementLabel << " failed " << endl;
@@ -286 +291 @@
   
 #if BAVARD > 1
-  unsigned k;
+/*  unsigned k;
   for(k = 0; k < getBeamLineSize(); k++) {
     abstractElement* ptr = pspa_->getBeamLine_deprecated()->getAbstractElement(k);
     cout << "recupere " << ptr->getLabel() << endl;
   }
+*/
 #endif
 

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

@@ -10 +10 @@
 
 
-sectionToExecute::sectionToExecute(abstractElement* f, abstractSoftware* s,dataManager* data) {
+sectionToExecute::sectionToExecute(abstractElement* f, abstractSoftware* s,dataManager* data,sector* sect) {
   dataManager_ = data;
+  sector_ = sect;
   
   elements_.push_back(f);
@@ -63 +64 @@
 }
 
+
+void sectionToExecute::setFirstElement(std::string name) {
+// Possible cases :
+
+  // | section 1 | section 2 |
+  // |  a b c d  |  e f g h  |  i X j k l  |  m n o p  | Before : X is in the 3rd sectionToExcute
+  // |  a b c d e f g h i | X j k l  ||  m n o p  | Case 1 : X move in the 2nd
+  // |  a b c d  |  e f g h  |  i  |  X j k l m n o p  | Case 2 : X move in the 4nd
+
+  // Case 1 : Have to change X and
+  
+  std::vector <sectionToExecute*> sectVect = sector_->getSectionsToExecute();
+  sectionToExecute* previousSection = NULL;
+
+  for (unsigned int a=0; a< sectVect.size(); a++) {
+    if (sectVect[a] == this) {
+      if (a >= 1) {
+        previousSection = sectVect[a-1];
+      }
+    }
+  }
+  if (previousSection == NULL) {
+    return;
+  }
+  // FIXME : NOt finished !! 02/2014
+}

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

@@ -11 +11 @@
 #include "sectionToExecute.h"
 #include "dataManager.h"
+#include "elementDrift.h"
+#include "elementRfgun.h"
+#include "elementCell.h"
+#include "elementSoleno.h"
+#include "elementBend.h"
+#include "elementBeam.h"
+#include "elementFit.h"
+#include "elementSnapshot.h"
+#include "elementMultipole.h"
 
 sector::sector(dataManager* data, std::string name):
@@ -27 +36 @@
 }
 
+abstractElement* sector::addElementAfter(nomdElements::typedElement eType ,abstractElement* previousElement){
+
+  // create a new abstractElement
+  // FIXME : To be move in an abstractFactory in the controler !!
+  abstractElement* currentElement = NULL;
+  switch (  eType ) {
+    case nomdElements::RFgun :
+      currentElement = new elementRfgun();
+      break;
+    case nomdElements::drift :
+      currentElement = new elementDrift();
+      break;
+    case nomdElements::cell  :
+      currentElement = new elementCell();
+      break;
+    case nomdElements::bend  :
+      currentElement = new elementBend();
+      break;
+    case nomdElements::soleno  :
+      currentElement = new elementSoleno();
+      break;
+    case nomdElements::beam  :
+      currentElement = new elementBeam();
+      break;
+    case nomdElements::fit  :
+      currentElement = new elementFit();
+      break;
+    case nomdElements::mpole  :
+      currentElement = new elementMultipole();
+      break;
+    case nomdElements::snapshot :
+    {
+      // FIXME : Snapshot a gérér
+      /*        int incr = dataManager_->getPspaApplication()->getExtensionFile();
+       incr++;
+       dataManager_->getPspaApplication()->setExtensionFile(incr);
+       */
+      currentElement = new elementSnapshot();
+      break;
+    }
+  }
+  if (!currentElement) {
+    return NULL;
+  }
+  addElementAfter(currentElement,previousElement);
+  return currentElement;
+  
+}
+
+
 void sector::addElementAfter(abstractElement* currentElement ,abstractElement* previousElement){
 // if the previous element is NULL, it will try to add at the beginning of the first section
@@ -32 +91 @@
   if (previousElement == NULL) {
     if (sectionToExecute_.size() == 0) {
-      sectionToExecute_.push_back(new sectionToExecute(currentElement,NULL,dataManager_));
+      sectionToExecute_.push_back(new sectionToExecute(currentElement,NULL,dataManager_,this));
     } else {
         sectionToExecute* section = sectionToExecute_.front();

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

@@ -35 +35 @@
   WContainerWidget* acceleratorDetailledView_;
   void addSector();
+  void readConfiguration();
   void run();
   void closeGraphicDialog();

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

@@ -53 +53 @@
   GWt_console* console_;
   GWt_abstractElementFactory* abstractElementFactory_;
-      
+  WContainerWidget* acceleratorContainerWidget_;
+  
   WText* createTitle(const WString&);
   WWidget* createPalette(WContainerWidget* parent);

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

@@ -18 +18 @@
 
     void setSoftware();
-
+  void changeFirstElement();
+  
     inline Wt::WString getFirstElementCurrentText() {
         return firstElement_->currentText();

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

@@ -15 +15 @@
 #include <string>
 
+//- Ouvrir le premier secteur quand il est chargé
+//- Ajouter les sectionToExecute
+//- Fixer le addConsoleMessage()
+//- remise a jour des éléments si on on change un bout de section
+
 GWt_accelerator::GWt_accelerator(WContainerWidget* parent, dataManager* dt) :
 WContainerWidget(parent),
@@ -84 +89 @@
   acceleratorGlobalView->setLayout(acceleratorGlobalViewLayout_);
 
-  // Add the first sector
-  addSector();
+  // read configuration
+  readConfiguration();
 
   // Actions
@@ -107 +112 @@
 {
   sector* sect = getDataManager()->addNewSector();
-  GWt_sector* addedSector = new GWt_sector(this,sect);
-}
+  new GWt_sector(this,sect);
+}
+
+
+void GWt_accelerator::readConfiguration()
+{
+  std::vector <sector*> sect = dataManager_->getSectors();
+  if (sect.size() == 0) {
+    // Add the first sector
+    addSector();
+  } else {
+    for (unsigned long a=0; a< sect.size(); a++) {
+      new GWt_sector(this,sect[a]);
+    }
+  }
+}
+
 
 void GWt_accelerator::run()

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

@@ -129 +129 @@
   
   // apply filter, will modify outputCurrent
+// FIXME !!!
+  return;
   searchFilter();
   /*

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

@@ -120 +120 @@
   
   // create accelerator main widget
-  WContainerWidget* acceleratorContainerWidget = new WContainerWidget();
-  gridLayout->addWidget(acceleratorContainerWidget, 2, 1);
+  acceleratorContainerWidget_ = new WContainerWidget();
+  gridLayout->addWidget(acceleratorContainerWidget_, 2, 1);
 
   // Let column 2 take the excess space.
@@ -129 +129 @@
 
   
-  new GWt_accelerator(acceleratorContainerWidget,dtmanage_);
-  new WBreak(acceleratorContainerWidget);
+  new GWt_accelerator(acceleratorContainerWidget_,dtmanage_);
+  new WBreak(acceleratorContainerWidget_);
 
 
@@ -138 +138 @@
   beamLine_deprecated_ = NULL;
   /*
-   WScrollArea* scroll = new  WScrollArea(acceleratorContainerWidget);
+   WScrollArea* scroll = new  WScrollArea(acceleratorContainerWidget_);
    scroll->setWidget(createBeamLine__deprecated());
    scroll->setMinimumSize(300,150);
    */
   
-  new WBreak(acceleratorContainerWidget);
+  new WBreak(acceleratorContainerWidget_);
   //-----------
 
@@ -152 +152 @@
   globalParam_ = new GWt_globalParameters(dtmanage_);
   sectorParam_ = new GWt_sectorParameters();
-  WWidget* dboard = createDashBoard(acceleratorContainerWidget);
+  WWidget* dboard = createDashBoard(acceleratorContainerWidget_);
   dboard->setMinimumSize(300,100);
 
-  new WBreak(acceleratorContainerWidget);
+  new WBreak(acceleratorContainerWidget_);
 
   //-----------
 
   
-  new WBreak(acceleratorContainerWidget);
-  
-  console_ = new GWt_console(acceleratorContainerWidget);
+  new WBreak(acceleratorContainerWidget_);
+  
+  console_ = new GWt_console(acceleratorContainerWidget_);
   console_->setMinimumSize(300,100);
 
@@ -317 +317 @@
   }
   
-  globalParam_->renew(); 
+  // reload new elements in the GUI
+// FIXME : Don't do that in the futur !
+  // In the futur, we should be able to have lot of accelerator at the same time and each with ONE datamanager
+  acceleratorContainerWidget_->clear();
+  new GWt_accelerator(acceleratorContainerWidget_,dtmanage_);
+
+  globalParam_->renew();
   //sectorParam_->renew();
   console_->addConsoleMessage(string("restauration terminee \n"));

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

@@ -91 +91 @@
   softElement_->setMinimumSize(80,12);
   
-//  firstElement_->activated().connect(softwarePanel,&GWt_softwarePanel::updateSections);
+  firstElement_->activated().connect(this,&GWt_sectionToExecute::changeFirstElement);
 //  lastElement->activated().connect(softwarePanel,&GWt_softwarePanel::updateSections);
   softElement_->activated().connect(this,&GWt_sectionToExecute::setSoftware);
@@ -148 +148 @@
 }
 
+
+void GWt_sectionToExecute::changeFirstElement()
+{
+  section_->setFirstElement(firstElement_->currentText().toUTF8());
+  UIsector_->getExecuteWidget()->displayFromControler();
+}

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

@@ -64 +64 @@
   } else {
 
-    unsigned long firstSectionToExecuteIndex = 0;
+    unsigned int firstSectionToExecuteIndex = 0;
     for (unsigned int a=0; a<UIsector_->getSectorControler()->getSectionsToExecute().size(); a++) {
       abstractElement* premierElement = NULL;
@@ -86 +86 @@
       lineFromCombo->setCurrentIndex(firstSectionToExecuteIndex);
       // set to last
-      lineToCombo->setCurrentIndex(firstSectionToExecuteIndex + UIsector_->getSectorControler()->getSectionsToExecute()[a]->getElements().size() - 1);
+      lineToCombo->setCurrentIndex(firstSectionToExecuteIndex + (unsigned int)UIsector_->getSectorControler()->getSectionsToExecute()[a]->getElements().size() - 1);
       
       WComboBox* softCombo = new WComboBox();
-      sector * sector = UIsector_->getSectorControler();
       sectionToExecute* sect = UIsector_->getSectorControler()->getSectionsToExecute()[a];
-      abstractSoftware* abs = sect->getSoftware();
       
       fillComboWithSoftwares(softCombo,UIsector_->getSectorControler()->getSectionsToExecute()[a]->getSoftware()->getName());
@@ -267 +265 @@
   if (s > 0) {
     abstractElement* abs = UIsector_->getSectorControler()->getSectionsToExecute()[s-1]->getLastElement();
-    UIsector_->getSectorControler()->addSectionToExecute(new sectionToExecute(abs,NULL,dtmanage_));
+    UIsector_->getSectorControler()->addSectionToExecute(new sectionToExecute(abs,NULL,dtmanage_,UIsector_->getSectorControler()));
     UIsector_->getSectorControler()->getSectionsToExecute()[s-1]->removeLastElement();
   }