Changeset 476 in PSPA

Timestamp:

Jan 6, 2014, 4:17:29 PM (10 years ago)

Author:

garnier

Message:

Impleméntation en partie de setFirstElement

Location:

Interface_Web/trunk/pspaWT/sources

Files:

• controler/include/sectionToExecute.h (modified) (1 diff)
• controler/src/sectionToExecute.cc (modified) (1 diff)
• controler/src/sector.cc (modified) (1 diff)
• userInterface/include/GWt_sectionToExecute.h (modified) (1 diff)
• userInterface/src/GWt_sectionToExecute.cc (modified) (4 diffs)

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

@@ -58 +58 @@
    If needed, it will change the last element of the previous section
    */
-  void setFirstElement(std::string);
+  void setFirstElement(int);
   
   private :

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

@@ -65 +65 @@
 
 
-void sectionToExecute::setFirstElement(std::string name) {
-// Possible cases :
+void sectionToExecute::setFirstElement(int index) {
+// This will set the beginning of this section to the element with the given name
+  
+  // Possible cases :
+  //
+  // | section 1 | section 2 | section 3   |  section 4 | section 5 |
+  // |  a b c d  |  e f g h  |  i j k l    |  m n o p   |  q r  | Before (example)
 
-  // | 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
+  // Moved in a previous section :
+  // |  a b c d  |  e f      |  _g_ h i j k l  |  m n o p |  q r  |  Case 1 : move beginning of section 3 to "g"
+  // |  a b c    |           |  _d_ e f g h i j k l  |  m n o p  |  q r  |  Case 2 : move beginning of section 3 to "d" => section 2 will be removed !
+  // => all elements from "d"/"g" to "l" will be moved in the 3rd section
+  
+  // Moved in the same section :
+  // |  a b c d  |  e f g h i j  | _k_ l  |  m n o p   |  q r  | Case 3 : move beginning of section 3 to "k"
+  // => all elements from "i"(begin of 3rd section) to before "k" will be moved in the 2nd (3-1) section
+  
+  // Moved in a next section :
+  // |  a b c d  |  e f g h i j k l m |  _n_ | o p  |  q r  | Case 4 : move beginning of section 3 to "n"
+  // |  a b c d  |  e f g h i j k l m  n o p  |  _q_ |   | r  | Case 5 : move beginning of section 3 to "q" => remove section 4 !
+  // => all elements from "i"(begin of 3rd section) to before "n"/"q" will be moved in the 2nd (3-1) section
+  // => "n"/"q" element is set to be alone in 3rd section
   
   std::vector <sectionToExecute*> sectVect = sector_->getSectionsToExecute();
-  sectionToExecute* previousSection = NULL;
+  unsigned int sectionNumber = 0;
+  int newBeginSectionNumber = 0;
+  unsigned long indexOfNewBeginSectionNumber = 0;
+  
+  // get this section number
+  // get the section number of the new begin element
+  unsigned int n = 0;
+  bool newFound = false;
 
   for (unsigned int a=0; a< sectVect.size(); a++) {
     if (sectVect[a] == this) {
-      if (a >= 1) {
-        previousSection = sectVect[a-1];
+      sectionNumber = a;
+    }
+    n += sectVect[a]->getElements().size();
+    if ((n >index ) && (!newFound)) {
+      newBeginSectionNumber = a;
+      indexOfNewBeginSectionNumber = index - (n-sectVect[a]->getElements().size());
+      newFound = true;
+    }
+  }
+  
+  if (!newFound ) {
+    return;  // Impossible to find this index
+  }
+  
+  // Moved in a previous section
+  if ( newBeginSectionNumber < sectionNumber ) {
+    for (int a = sectionNumber-1 ; a >= newBeginSectionNumber; a--) {
+      std::vector< abstractElement* > elemsVect = sectVect[a]->getElements();
+      long stop = 0;
+      if (a == newBeginSectionNumber) {
+        stop = indexOfNewBeginSectionNumber;
+      }
+      for (long elemIndex = elemsVect.size(); elemIndex > stop; elemIndex--) {
+        insertAtFirst(elemsVect.back());
+        elemsVect.pop_back();
+
+        // remove elements
+        sectVect[a]->removeLastElement();
       }
     }
+    
+    // Moved in the same section :
+  } else if ( newBeginSectionNumber == sectionNumber ) {
+    
+    
+    // Moved in a next section :
+  } else if ( newBeginSectionNumber > sectionNumber ) {
+    
+    
   }
-  if (previousSection == NULL) {
-    return;
+  
+  // Suppress the empty sections
+  for (unsigned int a=0; a< sectVect.size(); a++) {
+    if (sectVect[a]->getElements().size() == 0  ) {
+      sector_->clearSectionToExecute(a);
+    }
   }
-  // FIXME : NOt finished !! 02/2014
 }

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

@@ -128 +128 @@
   const abstractSoftware* soft = sectionToExecute_.at(a)->getSoftware();
   if ( soft != NULL ) delete soft;
+  delete sectionToExecute_[a];
   sectionToExecute_.erase (sectionToExecute_.begin()+a);
 }

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

@@ -36 +36 @@
     }
     
-    void setFirstElementCurrentSelection(Wt::WString);
-    void setLastElementCurrentSelection(Wt::WString);
-    void setSoftwareElementCurrentSelection(Wt::WString);
+    void setFirstElementCurrentSelection_deprecated(Wt::WString);
+    void setLastElementCurrentSelection_deprecated(Wt::WString);
+    void setSoftwareElementCurrentSelection_deprecated(Wt::WString);
     
     inline void setWarnings(Wt::WString warn){

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

@@ -99 +99 @@
 
 
-void GWt_sectionToExecute::setFirstElementCurrentSelection(Wt::WString txt){
+void GWt_sectionToExecute::setFirstElementCurrentSelection_deprecated(Wt::WString txt){
     for (int a=0; a< firstElement_->count(); a++) {
         if (firstElement_->itemText(a) == txt) {
@@ -108 +108 @@
 }
 
-void GWt_sectionToExecute::setLastElementCurrentSelection(Wt::WString txt){
+void GWt_sectionToExecute::setLastElementCurrentSelection_deprecated(Wt::WString txt){
     for (int a=0; a< lastElement_->count(); a++) {
         if (lastElement_->itemText(a) == txt) {
@@ -117 +117 @@
 }
 
-void GWt_sectionToExecute::setSoftwareElementCurrentSelection(Wt::WString txt){
+void GWt_sectionToExecute::setSoftwareElementCurrentSelection_deprecated(Wt::WString txt){
   for (int a=0; a< softElement_->count(); a++) {
     if (softElement_->itemText(a) == txt) {
@@ -151 +151 @@
 void GWt_sectionToExecute::changeFirstElement()
 {
-  section_->setFirstElement(firstElement_->currentText().toUTF8());
+  if (!section_) return;
+  if (!UIsector_) return;
+
+  section_->setFirstElement(firstElement_->currentIndex());
   UIsector_->getExecuteWidget()->displayFromControler();
+  UIsector_->getBeamLineWidget()->buildBeamLineWidget();
 }