Changeset 328 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_bend.cc

Timestamp:

Feb 18, 2013, 5:05:07 PM (11 years ago)

Author:

touze

Message:

ajout du bouton cancel aux elts

File:

• Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_bend.cc (modified) (1 diff)

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

@@ -12 +12 @@
 :GWt_abstractElement(new elementBend())
 {
-    elementLigneFaiseauContainer_ = elemLigne;
-    initialize();
+  elementLigneFaiseauContainer_ = elemLigne;
+  initialize();
 }
 
-
-void GWt_bend::initilializeDialog() {
-    string* param = beginDialog();
+void GWt_bend::initilializeDialog() 
+{
+  string* param = beginDialog();
     
-    new WText("angle (deg.) : ",dialog_->contents());
-    angleEdit_ = new WLineEdit( param->c_str(), dialog_->contents());
-    new WBreak(dialog_->contents());
+  new WText("angle (deg.) : ",dialog_->contents());
+  angleEdit_ = new WLineEdit( param->c_str(), dialog_->contents());
+  new WBreak(dialog_->contents());
+  
+  new WText("radius (m) : ",dialog_->contents());
+  radiusEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents());
+  new WBreak(dialog_->contents());
     
-    new WText("radius (m) : ",dialog_->contents());
-    radiusEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents());
-    new WBreak(dialog_->contents());
+  new WText("momentum (MeV/c) : ",dialog_->contents());
+  momentumEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents());
+  new WBreak(dialog_->contents());
     
-    new WText("momentum (MeV/c) : ",dialog_->contents());
-    momentumEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents());
-    new WBreak(dialog_->contents());
+  new WText("length (cm) : ",dialog_->contents());
+  xlengthEdit_ = new WLineEdit("0", dialog_->contents());
+  xlengthEdit_->setDisabled(true);
+  new WBreak(dialog_->contents());
     
-    new WText("length (cm) : ",dialog_->contents());
-    xlengthEdit_ = new WLineEdit("0", dialog_->contents());
-    xlengthEdit_->setDisabled(true);
-    new WBreak(dialog_->contents());
+  new WText("aperture (cm) : ",dialog_->contents());
+  apertureEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents());
+  apertureEdit_->setDisabled(true);
+  new WBreak(dialog_->contents());
     
-    new WText("aperture (cm) : ",dialog_->contents());
-    apertureEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents());
-    apertureEdit_->setDisabled(true);
-    new WBreak(dialog_->contents());
-    
-    new WText("pole face rotations (deg.) entrance : ",dialog_->contents());
-    beta1Edit_ = new WLineEdit( (++param)->c_str(), dialog_->contents());
-    new WText("exit : ",dialog_->contents());
-    beta2Edit_ = new WLineEdit( (++param)->c_str(), dialog_->contents());
-    new WBreak(dialog_->contents());
-    
-    WPushButton *submit = new WPushButton("OK",dialog_->contents());
-    submit->clicked().connect(dialog_, &Wt::WDialog::accept);
-    dialog_->finished().connect(this, &GWt_bend::dialogDone);
+  new WText("pole face rotations (deg.) entrance : ",dialog_->contents());
+  beta1Edit_ = new WLineEdit( (++param)->c_str(), dialog_->contents());
+  new WText("exit : ",dialog_->contents());
+  beta2Edit_ = new WLineEdit( (++param)->c_str(), dialog_->contents());
+  new WBreak(dialog_->contents());
+  
+  WPushButton *annule= new WPushButton("cancel",dialog_->contents());  
+  annule->clicked().connect(dialog_, &Wt::WDialog::reject); 
+  WPushButton *submit= new WPushButton("OK",dialog_->contents());
+  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
+  dialog_->finished().connect(this, &GWt_bend::dialogDone);
 }
 
+void GWt_bend::dialogDone(WDialog::DialogCode code)
+{
+  if (code != Wt::WDialog::Accepted) return;
 
-void GWt_bend::dialogDone()
-{
-    unsigned nbParam = abstractElement_->getNbParams();
-    string* envoi = new string[nbParam+1];
-    int compteur = -1;
-    envoi[++compteur] = string(mixedTools::intToString(nbParam) );
-    envoi[++compteur] = labelEdit_->text().toUTF8();
-    cout << " GWt_bend::dialogDone() j'envoie " << envoi[compteur] << endl;
-    envoi[++compteur] = angleEdit_->text().toUTF8();
-    envoi[++compteur] = radiusEdit_->text().toUTF8();
-    envoi[++compteur] = momentumEdit_->text().toUTF8();
-    envoi[++compteur] = apertureEdit_->text().toUTF8();
-    envoi[++compteur] = beta1Edit_->text().toUTF8();
-    envoi[++compteur] = beta2Edit_->text().toUTF8();
-    
-    if ( compteur !=  (int)nbParam ) {
-        cerr << " GWt_bend::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
-        return;
-    }
-    abstractElement_->setParametersString(envoi);
-    delete [] envoi;
+  unsigned nbParam = abstractElement_->getNbParams();
+  string* envoi = new string[nbParam+1];
+  int compteur = -1;
+  
+  envoi[++compteur] = string(mixedTools::intToString(nbParam) );
+  envoi[++compteur] = labelEdit_->text().toUTF8();
+  envoi[++compteur] = angleEdit_->text().toUTF8();
+  envoi[++compteur] = radiusEdit_->text().toUTF8();
+  envoi[++compteur] = momentumEdit_->text().toUTF8();
+  envoi[++compteur] = apertureEdit_->text().toUTF8();
+  envoi[++compteur] = beta1Edit_->text().toUTF8();
+  envoi[++compteur] = beta2Edit_->text().toUTF8(); 
+  if ( compteur !=  (int)nbParam ) {
+    cerr << " GWt_bend::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
+    return;
+  }
+  abstractElement_->setParametersString(envoi);
+  delete [] envoi;
 }
 
-
 WImage* GWt_bend::getImage() {
-    return image_;
+  return image_;
 }