Changeset 455 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/sectorParameters.cc

Timestamp:

Dec 16, 2013, 5:16:54 PM (11 years ago)

Author:

garnier

Message:

grosse modification pour intégrer les sections

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/sectorParameters.cc (modified) (6 diffs)

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

@@ -5 +5 @@
 #define BAVARD 1
 
-sectorParameters::sectorParameters()
+sectorParameters::sectorParameters(sector* sect):
+sector_(sect)
 {
   geometry_= string("CIRCULAR");
-  sectors_.push_back(statements("vide",vector<string>()));
-  sectors_.back().second.push_back("xxx");
-  sectors_.back().second.push_back("xxx");
-  sectors_.back().second.push_back("Unchecked");
-  sectors_.back().second.push_back("1");
+  sectorsStatements_.push_back(statements("vide",vector<string>()));
+  sectorsStatements_.back().second.push_back("xxx");
+  sectorsStatements_.back().second.push_back("xxx");
+  sectorsStatements_.back().second.push_back("Unchecked");
+  sectorsStatements_.back().second.push_back("1");
 }
 
@@ -45 +46 @@
 void sectorParameters::raz()
 {
-  if(!sectors_.empty()) sectors_.clear();
+  if(!sectorsStatements_.empty()) sectorsStatements_.clear();
 }
 
@@ -52 +53 @@
   ostringstream sortie;
   sortie << " sectors " << endl;
-  sortie << sectors_.size() << endl;
-  for(int i = 0; i < sectors_.size(); i++) {
-    sortie << sectors_.at(i).first << " " << sectors_.at(i).second.at(0) << " " << sectors_.at(i).second.at(1) << " " << sectors_.at(i).second.at(2) << " " << sectors_.at(i).second.at(3) << endl;
+  sortie << sectorsStatements_.size() << endl;
+  for(int i = 0; i < sectorsStatements_.size(); i++) {
+    sortie << sectorsStatements_.at(i).first << " " << sectorsStatements_.at(i).second.at(0) << " " << sectorsStatements_.at(i).second.at(1) << " " << sectorsStatements_.at(i).second.at(2) << " " << sectorsStatements_.at(i).second.at(3) << endl;
   }
   return sortie.str();  
@@ -66 +67 @@
   for(int i = 0; i < n; i++) {
     ifs >> txt;
-    sectors_.push_back(statements(txt,vector<string>()));
+    sectorsStatements_.push_back(statements(txt,vector<string>()));
     for(int j = 0; j < 4; j++) {
       ifs >> txt;
-      sectors_.back().second.push_back(txt);
+      sectorsStatements_.back().second.push_back(txt);
     }
   } 
@@ -104 +105 @@
 
 vector<statements> sectorParameters::getSectors() const {
-  return sectors_;
+  return sectorsStatements_;
 }
 
@@ -114 +115 @@
 #endif
 
-  if(!sectors_.empty()) sectors_.clear();
+  if(!sectorsStatements_.empty()) sectorsStatements_.clear();
 
   for(int i = 0; i < v.size(); i++) {
-    sectors_.push_back(statements(v.at(i).first,vector<string>()));
+    sectorsStatements_.push_back(statements(v.at(i).first,vector<string>()));
     for(int j = 0; j < 4; j++) 
-      sectors_.back().second.push_back(v.at(i).second.at(j));
+      sectorsStatements_.back().second.push_back(v.at(i).second.at(j));
   }
 
 #if BAVARD > 0
-  cout << "sectors_.size()= " << sectors_.size() << endl;
-  for(int i = 0; i < sectors_.size(); i++) {
-    cout << "name= " << sectors_.at(i).first << ", de " << sectors_.at(i).second.at(0) << ", Ã  " << sectors_.at(i).second.at(1) << ", reflection = " << sectors_.at(i).second.at(2) << ", repeat= " << sectors_.at(i).second.at(3) << endl << endl;
+  cout << "sectorsStatements_.size()= " << sectorsStatements_.size() << endl;
+  for(int i = 0; i < sectorsStatements_.size(); i++) {
+    cout << "name= " << sectorsStatements_.at(i).first << ", de " << sectorsStatements_.at(i).second.at(0) << ", Ã  " << sectorsStatements_.at(i).second.at(1) << ", reflection = " << sectorsStatements_.at(i).second.at(2) << ", repeat= " << sectorsStatements_.at(i).second.at(3) << endl << endl;
   }
 #endif