Changeset 481 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

Timestamp:

Jan 8, 2014, 6:05:38 PM (10 years ago)

Author:

garnier

Message:

Suppression de methodes deprecated et de quelques warning de compilation

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc (modified) (2 diffs)

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

@@ -34 +34 @@
   if (console) console->addConsoleMessage(message + "\n");
   pspa_->processEvents();
-}
-
-string dataManager::getLabelFromElementNumero_deprecated(int numero)
-{
-/*
- abstractElement* ptr = pspa_->getBeamLine_deprecated()->getAbstractElement(numero-1);
-  if ( ptr == NULL ) return "";
-  return ptr->getLabel();
-*/
-return "";
-}
-
-int dataManager::getNumeroFromElementLabel_deprecated(string label)
-{
-/*  int index = -1;
-  for (int k = 0; k < getBeamLineSize() ; k++) {
-    if (pspa_->getBeamLine_deprecated()->getAbstractElement(k) != NULL) {
-      if ( pspa_->getBeamLine_deprecated()->getAbstractElement(k)->getLabel() == label )
-        {
-          index = (int)k + 1;
-          return index;
-        }
-    }
-  }
-  return index;
-*/
-  return 0;
 }
 
@@ -378 +351 @@
 }
 
-int dataManager::getBeamLineSize_deprecated() {
-// FIXME : Cette methode ne doit pas exister, mis a part pour savoir quelle est la taille de la beamLine
-  unsigned int i = 0;
-  for (unsigned k = 0; k < jobList_.size(); k++) {
-    sector* sector = jobList_[k];
-    for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
-      i += sector->getSectionsToExecute()[l]->getElements().size();
-    }
-  }
-  return i;
-}