Changeset 428 in PSPA

Timestamp:

Nov 4, 2013, 12:21:18 PM (11 years ago)

Author:

touze

Message:

sauver/restaurer une config ok

Location:

Interface_Web/trunk/pspaWT/sources/userInterface

Files:

• include/GWt_globalParameters.h (modified) (2 diffs)
• src/GWt_globalParameters.cc (modified) (6 diffs)
• src/GWt_pspaApplication.cc (modified) (5 diffs)

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

@@ -33 +33 @@
   GWt_globalParameters() {;}
   GWt_globalParameters(dataManager*);
-  GWt_globalParameters(dataManager*,WContainerWidget*);
   virtual ~GWt_globalParameters() {;}
    
@@ -40 +39 @@
   void updateGlobals();
   void renew();
-  string* getGlobalParameters();
+  void setText(WContainerWidget*);
 };
 #endif

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

@@ -15 +15 @@
 }
 
-GWt_globalParameters::GWt_globalParameters(dataManager* dt,WContainerWidget* wt)
+void GWt_globalParameters::setText(WContainerWidget* wt)
 {
-  dt_ = dt;
   status_ = new WText("Go ahead...",wt);
 }
@@ -23 +22 @@
 void GWt_globalParameters::initilializeDialog()
 {
+  dialog_ = new WDialog("global parameters");
   string* param = dialogBegin();
 
-  dialog_ = new WDialog("global parameters");
   new WText("Enter frequency (MHz) : ",dialog_->contents());
   frequencyEdit_ = new WLineEdit(param[1].c_str(),dialog_->contents());
@@ -72 +71 @@
   envoi_[3] = param[3].c_str();
   envoi_[4] = param[4].c_str();
-  setStatus();
   return param;
 }
@@ -78 +76 @@
 void GWt_globalParameters::dialogDone(WDialog::DialogCode code)
 {
-  if (code == WDialog::Accepted) updateGlobals();
+  if (code == WDialog::Accepted) {
+    updateGlobals();
+    setStatus();
+  }
   return;
 }
@@ -89 +90 @@
   envoi_[3] = nstepMAxEdit_->text().toUTF8();
   envoi_[4] = nscEdit_->text().toUTF8();
-
-  setStatus();
   dt_->getGlobalParameters()->setParametersString(envoi_);
 }
@@ -97 +96 @@
 {
   string* param = dialogBegin();
-
-  frequencyEdit_->setText(param[1].c_str());
-  stepEdit_->setText(param[2].c_str());
-  nstepMAxEdit_->setText(param[3].c_str());
-  nscEdit_->setText(param[4].c_str());
-}
-
-string* GWt_globalParameters::getGlobalParameters()
-{
-  return envoi_;
+  setStatus();
+  frequencyEdit_ = new WLineEdit(param[1].c_str());
+  stepEdit_ = new WLineEdit(param[2].c_str());
+  nstepMAxEdit_ = new WLineEdit(param[3].c_str());
+  nscEdit_ = new WLineEdit(param[4].c_str());
 }
 

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

@@ -143 +143 @@
   // xx mainGridLayout->addWidget(globalParam_,3,1);
 
+  globalParam_ = new GWt_globalParameters(dtmanage_);
   WWidget* dboard = createDashBoard();
   dboard->setMinimumSize(300,100);
@@ -187 +188 @@
   textdiv = new WContainerWidget();
   textdiv->setStyleClass("text");
-  
-  globalParam_ = new GWt_globalParameters(dtmanage_,textdiv);
+  globalParam_->setText(textdiv);
 
   WContainerWidget *cnt = new WContainerWidget();
@@ -396 +396 @@
 }
 
-
 void PspaApplication::dialogSaveDone(WDialog::DialogCode code)
 {
-    if ( code != Wt::WDialog::Accepted ) {
-        return;
-    }
-    nameOfCase_ = saveNameEdit_->text().toUTF8();
-    delete dialogSave_;
-    dialogSave_ = NULL;
-
-    GWt_globalParameters* bibi = static_cast<GWt_globalParameters*>(globalParam_);
-    bibi->updateGlobals();
-
-    //  dtmanage_->saveConfiguration(nameOfCase_);
-    dtmanage_->saveConfiguration(sessionId(),nameOfCase_);
-
-    // en test: j'ajoute la sauvegarde sur .aml
-    dtmanage_->writeToAMLFile(nameOfCase_);
-}
-
+  if ( code != Wt::WDialog::Accepted ) {
+    return;
+  }
+  nameOfCase_ = saveNameEdit_->text().toUTF8();
+  delete dialogSave_;
+  dialogSave_ = NULL;
+
+  globalParam_->updateGlobals();
+
+  //  dtmanage_->saveConfiguration(nameOfCase_);
+  dtmanage_->saveConfiguration(sessionId(),nameOfCase_);
+
+  // en test: j'ajoute la sauvegarde sur .aml
+  dtmanage_->writeToAMLFile(nameOfCase_);
+}
 
 void PspaApplication::restaurer()
@@ -432 +429 @@
   if (nameOfCase_ == "")
     return;
-  cout << " je restaure le fichier " << fileName << endl;
+  cout << " PspaApplication:: restaure le fichier " << fileName << endl;
   dialogSave_ = NULL;
   
@@ -445 +442 @@
   }
   
-  GWt_globalParameters* bibi = static_cast<GWt_globalParameters*>(globalParam_);
-  bibi->renew();
-  
+  globalParam_->renew();  
   console_->addConsoleMessage(string("restauration terminee \n"));
 }