Changeset 488 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/elementBeam.cc

Timestamp:

Feb 7, 2014, 2:00:55 PM (10 years ago)

Author:

lemeur

Message:

lecture fichier sauvegarde AML

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/elementBeam.cc (modified) (3 diffs)

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

@@ -97 +97 @@
 // }
 
-string elementBeam::FileOutputFlow() const 
-{
-  ostringstream sortie;
-  // sortie << elementName_.getElementType() << endl;
-  sortie << elementName_.getGenericLabel() << endl;
-  sortie  << specificName_ << endl;
-  sortie << x_ << "  " << xp_ << " " <<  y_  << " " <<  yp_  << endl;
-  sortie << dl_ << "  " << del_ << " " <<  p0_  << endl;
-  cout << " elementBeam::FileOutputFlow, p0 = " << p0_ << endl;
-  return sortie.str();
-}
+// string elementBeam::FileOutputFlow() const 
+// {
+//   ostringstream sortie;
+//   // sortie << elementName_.getElementType() << endl;
+//   sortie << elementName_.getGenericLabel() << endl;
+//   sortie  << specificName_ << endl;
+//   sortie << x_ << "  " << xp_ << " " <<  y_  << " " <<  yp_  << endl;
+//   sortie << dl_ << "  " << del_ << " " <<  p0_  << endl;
+//   cout << " elementBeam::FileOutputFlow, p0 = " << p0_ << endl;
+//   return sortie.str();
+// }
 
 vector< pair<string, vector<string> > > elementBeam::parametersToSoftware () const 
@@ -128 +128 @@
 }
 
-void elementBeam::elementBeam::FileInput(ifstream& ifs) 
-{
-  ifs >> specificName_;
-  ifs >> x_ >> xp_ >>  y_ >> yp_;
-  ifs >> dl_ >> del_ >> p0_;
-  cout << " elementBeam::FileFileInput, p0 = " << p0_ << endl;
+// void elementBeam::FileInput(ifstream& ifs) 
+// {
+//   ifs >> specificName_;
+//   ifs >> x_ >> xp_ >>  y_ >> yp_;
+//   ifs >> dl_ >> del_ >> p0_;
+//   cout << " elementBeam::FileFileInput, p0 = " << p0_ << endl;
+//   lenghtElem_ = getLenghtOfElement();
+//   cout << " elementBeam::FileInput calcule longueur = " << lenghtElem_ << endl;
+// }
+
+void elementBeam::FileAMLInput(UAPNode* entree) 
+{
+  // if ( !entree ) return;
+  // string nonGenerique;
+  // AMLtools::readAMLParameterAttribut(*iter, "description", "type", nonGenerique);
+  // if ( nonGenerique != elementName_.getGenericLabel() ) {
+  //   cout << " elementBeam::FileAMLInput ERREUR d'element : " << nonGenerique << " ? attendu : " <<  elementName_.getGenericLabel() << endl;
+  //   return;
+  // }
+
+  if ( !checkAMLelementGenericName(entree) ) return;
+  UAPNode* faisceau = entree->getChildByName("beam");
+  if ( !faisceau ) {
+    cout << " elementBeam::FileAMLInput ERREUR pas de noeud AML <beam> : " << endl;
+    return;
+  }
+  AMLtools::readAMLParameterAttribut(faisceau, "11", "design", x_);
+  AMLtools::readAMLParameterAttribut(faisceau, "22", "design", xp_);
+  AMLtools::readAMLParameterAttribut(faisceau, "33", "design", y_);
+  AMLtools::readAMLParameterAttribut(faisceau, "44", "design", yp_);
+  AMLtools::readAMLParameterAttribut(faisceau, "55", "design", dl_);
+  AMLtools::readAMLParameterAttribut(faisceau, "66", "design", del_);
+  AMLtools::readAMLParameterAttribut(faisceau, "pc", "design", p0_);
   lenghtElem_ = getLenghtOfElement();
-  cout << " elementBeam::FileInput calcule longueur = " << lenghtElem_ << endl;
-}
+  cout << " elementBeam::FileAMLInput calcule longueur = " << lenghtElem_ << endl;
+}
+
+
 
 string elementBeam::print() 
@@ -161 +190 @@
 void elementBeam::InputRep(UAPNode* root)
 {
-  UAPNode* ele = root->addChild("element");
-  ele->addAttribute("name",specificName_);
+  // UAPNode* ele = root->addChild("element");
+  // ele->addAttribute("name",specificName_);
+  UAPNode* ele = setAMLelementHeader(root);
   
   UAPNode* node = ele->addChild("beam");