Changeset 168 in PSPA for Interface_Web/trunk/pspaWT/src

Timestamp:

Dec 11, 2012, 3:03:21 PM (12 years ago)

Author:

touze

Message:

use WSignalMapper class

Location:

Interface_Web/trunk/pspaWT/src

Files:

• GWt_LigneFaisceau.cc (modified) (6 diffs)
• GWt_abstractElement.cc (modified) (6 diffs)

Interface_Web/trunk/pspaWT/src/GWt_LigneFaisceau.cc

@@ -22 +22 @@
   beamLayout_ = new WHBoxLayout();
   decorationStyle().setBackgroundColor (WColor("orange")); 
-  //box_= new WBoxLayout(Wt::WBoxLayout::LeftToRight);
-  //setLayout(box_);
   setLayout(beamLayout_);
 
@@ -35 +33 @@
   // add a strech element at the end
   beamLayout_->addStretch(1);
-
-  // ajouter cette image ???
-  // acceptDrops("icons/final.jpg");
-
 }
  
@@ -57 +51 @@
   typedElement eType = e.getElementType();
   int cnts= pspa_->getDataManager()->beamLineSize();
-  cout<<"GWt_LigneFaisceau::dropEvent "<<e.getElementName()<<" ("<< cnts <<")"<< endl;
+
+  cout<<"GWt_LigneFaisceau::dropEvent "<<e.getElementName()<<" ("<< cnts <<")"<< endl;  
   
-  //cout << "GWt_LigneFaisceau::dropEvent " << evt.mimeType() << " " << eType << endl;
   if(eType == inconnu) {
     cout << "GWt_LigneFaisceau::element type " << eType << " inconnu " << endl;
@@ -68 +62 @@
   abstractElement* ptr = pspa_->getDataManager()->addElement(eType);
   ptr->setLabel(createLabel(e,nObjets_[eType].incr()));
+
   cout << " je vais ajouter l'element  " << ptr->getName().getElementName() << " de type " << ptr->getName().getElementType() << endl;
-  //  GWt_abstractElement* gw = GWt_abstractElement::ajoute(pspa_,ptr,evt.mimeType());
   GWt_abstractElement* gw = GWt_abstractElement::ajoute(pspa_,ptr);
-
-  WSignalMapper<WContainerWidget *> *MyMap = new Wt::WSignalMapper<Wt::WContainerWidget *>(this);
-   // connect mapped() to our target slot
-   MyMap->mapped().connect(this, &GWt_LigneFaisceau::clickEvent);
-
-   // connect and map every source signal to the mapper
-   MyMap->mapConnect(gw->getWidget()->clicked(),gw);
-
-  cout << "GWt_LigneFaisceau::dropEvent" <<gw<< endl;
-
-
-
-
-
   if(gw == NULL) return;
-
   gw->updateLabelWidget();
 
   //////////////////////////////////////////////////////////////////
-  ////////////////////// ORIGINE ///////////////////////////////////
+  // pourVoir
 
-  //beamLayout_->addWidget(gw->getWidget());
-  //pspa_->updateSelections();
+  cout<<"container: "<<gw->getWidget()->id()<<endl;
+  cout << "number of widgets in this container= " << gw->getWidget()->count() << ": ";
+  for(int k = 0; k < gw->getWidget()->count(); k++) {
+    WWidget *w= gw->getWidget()->widget(k);
+    cout << w->id() << ", ";
+  }
+  cout << endl;
 
-  ////////////////////// ESSAI ////////////////////////////////////////////
-  
-  //box_->addWidget(gw->getWidget(),0,Wt::AlignJustify);
+  //////////////////////////////////////////////////////////////////
+
+  WSignalMapper<GWt_abstractElement *> *mapper= new WSignalMapper<GWt_abstractElement *>(this);
+  mapper->mapped().connect(this,&GWt_LigneFaisceau::onClick);
+  mapper->mapConnect(gw->getButton()->doubleClicked(),gw);
+
+  //////////////////////////////////////////////////////////////////
+
   beamLayout_->insertWidget(cnts,gw->getWidget());
   gw->getWidget()->decorationStyle().setBackgroundColor (WColor("blue")); 
-
   pspa_->updateSelections();
 
-  cout << "number of items in the layout=  " << beamLayout_->count() << endl;
+  //////////////////////////////////////////////////////////////////
+  // pourVoir
+
+  cout << "number of items in the layout=  " << beamLayout_->count() << ": ";
   for(int k = 0; k < beamLayout_->count(); k++)
     {
       WLayoutItem *wi= beamLayout_->itemAt(k);
       WWidget *w= wi->widget();
-      cout << w->objectName() << ", " << w->id() << endl;
+      cout << w->id() << ", ";
     }
+  cout << endl;
+
   //////////////////////////////////////////////////////////////////
+  // pourVoir
 
-  // pourVoir
   int nElts= pspa_->getDataManager()->beamLineSize();
   cout << "GWt_LigneFaisceau:: nElts= " << nElts << endl;
@@ -122 +115 @@
   }
   
+}
+
+void GWt_LigneFaisceau::onClick(GWt_abstractElement* gw)
+{
+  cout << "mouse key was double clicked on this widget " << gw->getWidget()->id()<< endl;
+
+  message_= new GWt_dialog("Question","Are you sure you want to delete the selected item?",GWt_dialog::Warning,true,true);
+  message_->setClosable(true);
+
+  WSignalMapper<GWt_abstractElement *> *MyMap = new WSignalMapper<GWt_abstractElement *>(this);
+  MyMap->mapped().connect(this, &GWt_LigneFaisceau::removeDone);
+  MyMap->mapConnect(message_->finished(),gw);
+  message_->exec();
+}
+
+void GWt_LigneFaisceau::removeDone(GWt_abstractElement* gw)
+{
+  if (message_->result() == WDialog::Accepted) {
+
+    cout <<"GWt_LigneFaisceau:: removeDone "<< gw->getWidget()->id() << endl;
+    
+    gw->getWidget()->clear();
+    beamLayout_->removeWidget(gw->getWidget());
+    
+    string label= gw->getElement()->getLabel();
+    cout << "GWt_LigneFaisceau:: " << label << " a été supprimé" << endl;
+    pspa_->getDataManager()->getCollection()->eraseElement(label);
+    pspa_->updateSelections();
+  }
 }
     
@@ -152 +174 @@
 }
 
-void GWt_LigneFaisceau::clickEvent(WContainerWidget* elem)
-{
-  cout << "mouse key was double clicked on this widget" <<elem<< endl;
 
-  message_= new GWt_dialog("Question","Are you sure you want to delete the selected item?",GWt_dialog::Warning,true,true);
-  message_->setClosable(true);
-  //  message_->finished().connect(this,messageDone(elem));
-
-
-  WSignalMapper<WContainerWidget *> *MyMap = new Wt::WSignalMapper<Wt::WContainerWidget *>(this);
-   // connect mapped() to our target slot
-  MyMap->mapped().connect(this, &GWt_LigneFaisceau::messageDone);
-
-   // connect and map every source signal to the mapper
-  MyMap->mapConnect(message_->finished(), elem);
-
-  message_->exec();
-}
-
-void GWt_LigneFaisceau::messageDone(WContainerWidget* elem)
-{
-  if (message_->result() == WDialog::Accepted) {
-    cout <<"GWt_LigneFaisceau:: delete "<<elem<<endl;
-
-//     cout <<"GWt_abstractElement:: number of widgets= "<<wc_->count()<<endl;
-//     cout << wc_->objectName() << ", " << wc_->id() << endl;
-    
-
-
-    //    wc_->clear();
-    layout()->removeWidget (elem);
-
-//     string label= element_->getLabel();
-//     cout << "GWt_abstractElement:: " << label << " a été supprimé" << endl;
-//    pspa_->getDataManager()->getCollection()->eraseElement(label);
-    pspa_->updateSelections();
-  }
-  //delete message_;
-}

Interface_Web/trunk/pspaWT/src/GWt_abstractElement.cc

@@ +1 @@
+
+#include <iostream>
+#include <string>
 
 #include "GWt_abstractElement.h"
-#include "GWt_LigneFaisceau.h"
 #include "GWt_rfgun.h"
 #include "GWt_drift.h"
@@ -12 +14 @@
 
 #include <Wt/WText>
-#include <Wt/WSignalMapper>
 
-//GWt_abstractElement::GWt_abstractElement(PspaApplication* ps,abstractElement* elem,string image)
 GWt_abstractElement::GWt_abstractElement(PspaApplication* ps,abstractElement* elem)
 {
@@ -21 +21 @@
 
   dropped_ = new WPushButton();
+  dropped_->setObjectName("aPushButton");
   dropped_->setIcon(element_->getName().getElementImage());
   dropped_->setMaximumSize(50,50);
-  //  dropped_->clicked().connect(this,&GWt_abstractElement::clicked);
+  dropped_->clicked().connect(this,&GWt_abstractElement::clicked);
 
+  wc_ = new WContainerWidget();
+  wc_->setObjectName("aContainer");
+  wc_->addWidget(dropped_);
 
-
-   //  dropped_->doubleClicked().connect(this,&GWt_GWt_LigneFaisceau::doubleClicked(WContainerWidget*));
-  
-  wc_ = new WContainerWidget();
-  wc_->addWidget(dropped_);
-  wc_->addWidget(new WBreak());
+  WBreak *bk= new WBreak();
+  bk->setObjectName("aBreak");
+  wc_->addWidget(bk);
+  //wc_->addWidget(new WBreak());
 }
 
@@ -38 +40 @@
   string str = element_->getLabel();
   WText *item = new WText(str);
+  item->setObjectName("aText");
   wc_->addWidget(item);
 }
@@ -47 +50 @@
 }
 
-
 WPushButton* GWt_abstractElement::getButton() { 
   return dropped_;
@@ -54 +56 @@
 WContainerWidget* GWt_abstractElement::getWidget() {
   return wc_;
+}
+
+abstractElement* GWt_abstractElement::getElement() {
+  return element_;
 }