Changeset 197 in PSPA

Timestamp:

Dec 17, 2012, 5:21:22 PM (12 years ago)

Author:

garnier

Message:

insertion, correction et ameliorations

Location:

Interface_Web/branches/insertionsElements

Files:

• include/GWt_dropZoneLigneFaiseau.h (modified) (1 diff)
• src/GWt_LigneFaisceau.cc (modified) (2 diffs)
• src/GWt_dropZoneLigneFaiseau.cc (modified) (6 diffs)

Interface_Web/branches/insertionsElements/include/GWt_dropZoneLigneFaiseau.h

@@ -18 +18 @@
   GWt_dropZoneLigneFaiseau(PspaApplication*,bool linkImage = true);
   ~GWt_dropZoneLigneFaiseau();
-
+  void addElement(WContainerWidget* elem);
 
  private:

Interface_Web/branches/insertionsElements/src/GWt_LigneFaisceau.cc

@@ -56 +56 @@
   int nbElem = pspa_->getDataManager()->beamLineSize();
   unsigned int k;
+
+  // add first dropZone
+  hbox_->addWidget(new GWt_dropZoneLigneFaiseau(pspa_,false));
+
   for(k = 0; k < (unsigned)nbElem; k++) 
     {     
@@ -66 +70 @@
       gw->updateLabelWidget();
       nObjets_[ptr->getName().getElementType()].incr();
-      hbox_->addWidget(gw->getWidget());
-      // FIXME
-      //       WSignalMapper<GWt_abstractElement *> *mapper= new WSignalMapper<GWt_abstractElement *>(this);
-      //       mapper->mapped().connect(this,&GWt_LigneFaisceau::onClick);
-      //       mapper->mapConnect(gw->getButton()->doubleClicked(),gw);
+      GWt_dropZoneLigneFaiseau* dropZone = new GWt_dropZoneLigneFaiseau(pspa_);
+      dropZone->addElement(gw->getWidget());
+      hbox_->addWidget(dropZone);
+
+      if (k < ((unsigned)nbElem-1)) {
+        hbox_->addWidget(new GWt_dropZoneLigneFaiseau(pspa_));
+      } else {
+        hbox_->addWidget(new GWt_dropZoneLigneFaiseau(pspa_,false));
+      }
     } 
 

Interface_Web/branches/insertionsElements/src/GWt_dropZoneLigneFaiseau.cc

@@ -2 +2 @@
 
 #include "GWt_dropZoneLigneFaiseau.h"
+#include "nomdElements.h"
 
 #include <Wt/WCssDecorationStyle>
@@ -124 +125 @@
 
   pspa_->addConsoleMessage(e.getElementName());
+
   abstractElement* ptr = pspa_->getDataManager()->addElement(eType);
-  // FIXME
-  //  ptr->setLabel(createLabel(e,nObjets_[eType].incr()));
+
   ptr->setLabel(getElementNumberInBeamLine(e));
 
@@ -187 +188 @@
     abstractElement_ = gw->getWidget();
     addWidget(abstractElement_);
-    // change strech (useful if it was the last one
+    // change strech (useful if it was the last one)
     layout->setStretchFactor(this,0);           
 
@@ -267 +268 @@
 
 
-std::string GWt_dropZoneLigneFaiseau::getElementNumberInBeamLine(nomdElements el){
+void GWt_dropZoneLigneFaiseau::addElement(WContainerWidget* elem){
+  clear();
+  abstractElement_ = elem;
+  addWidget(abstractElement_);
+
+  insertMessage_ = NULL;
+  linkImage_ = NULL;
+}
+
+std::string GWt_dropZoneLigneFaiseau::getElementNumberInBeamLine(nomdElements elem){
   string str = "";
   
@@ -274 +284 @@
     for (int a=0; a<wc->count(); a++) {
       if (static_cast <GWt_abstractElement*> (wc->widget (a))) {
-        pspa_->addConsoleMessage("type trouvé");
+        GWt_abstractElement* ab = static_cast <GWt_abstractElement*> (wc->widget (a));
+        /*
+        printf("1--->%d\n",ab->getElement());
+        printf("2--->%d\n",ab->getElement()->getLenghtOfElement());
+        printf("3--->%d\n",ab->getElement()->getName().getElementType());
+        printf("4--->%d\n",elem.getElementType());
+
+        if (static_cast <GWt_abstractElement*> (wc->widget (a))->getElement()->getName().getElementType() == elem.getElementType()) {
+          pspa_->addConsoleMessage("type trouvé");
+        } else {
+          pspa_->addConsoleMessage("type trouvé NOT ");
+        }
+        */
+
       }
     }
@@ -285 +308 @@
     
     if(n < 10) {
-      str= el.getElementLabel()+"0"+number;
+      str= elem.getElementLabel()+"0"+number;
     } else {
-    str= el.getElementLabel()+" "+number;
+    str= elem.getElementLabel()+" "+number;
     }
   }
 
   return str;
-
-}
+}