Changeset 199 in PSPA

Timestamp:

Dec 18, 2012, 1:27:59 PM (12 years ago)

Author:

garnier

Message:

ameliorations dans les drag and drop

Location:

Interface_Web/trunk/pspaWT

Files:

• include/GWt_dropZoneLigneFaiseau.h (modified) (1 diff)
• src/GWt_dropZoneLigneFaiseau.cc (modified) (13 diffs)
• src/GWt_pspaApplication.cc (modified) (1 diff)

Interface_Web/trunk/pspaWT/include/GWt_dropZoneLigneFaiseau.h

@@ -31 +31 @@
   void removeDone(GWt_abstractElement*); 
   std::string getElementNumberInBeamLine(nomdElements el);
+  void removeOtherDropZone(GWt_dropZoneLigneFaiseau*);
 
   PspaApplication* pspa_;

Interface_Web/trunk/pspaWT/src/GWt_dropZoneLigneFaiseau.cc

@@ -18 +18 @@
     abstractElement_(NULL)
 {
-  // decorationStyle().setBackgroundColor (WColor("yellow"));
+  //  decorationStyle().setBackgroundColor (WColor("yellow"));
   resize(5,5);
-  cout<<"new GWt_dropZoneLigneFaiseau"<< endl;
+  cout<<"new GWt_dropZoneLigneFaiseau : "<< this << endl;
 
   // connect mouse events
 
+  setMouseOverDelay(500);       
   mouseWentOver().connect(this, &GWt_dropZoneLigneFaiseau::mouseOver);
   mouseWentUp().connect(this, &GWt_dropZoneLigneFaiseau::mouseUp);
@@ -79 +80 @@
   if (!abstractElement_) {
     if (linkImage_) {
-      resize(linkImage_->width(),linkImage_->height());
+      resize(10,32); // image size
     } else {
       resize(10,10);
     }
+    decorationStyle().setBorder (WBorder (WBorder::Dashed, WBorder::Medium,WColor(255,255,255,255)));
+  } else {
+    decorationStyle().setBorder (WBorder (WBorder::Solid, WBorder::Thin,WColor(200,200,200)));
   }
   if (insertMessage_) {
@@ -90 +94 @@
     linkImage_->show();
   }
-  decorationStyle().setBorder (WBorder (WBorder::Dashed, WBorder::Medium,WColor(255,255,255,255)));
   pspa_->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut");
 }
@@ -115 +118 @@
   nomdElements e(evt.mimeType());
   typedElement eType = e.getElementType();
-  //  int cnts= pspa_->getDataManager()->beamLineSize();
-
-  //  cout<<"GWt_LigneFaisceau::dropEvent() : "<<e.getElementName()<<" ("<< cnts <<")"<< endl;  
-  
+
+  // update source if necessary
+  cout<<"dynamic_cast SOURCE------" << evt.source() << endl;
+  if (dynamic_cast <GWt_dropZoneLigneFaiseau*> (evt.source())) {
+    cout<<"OKIKKKIIII" << dynamic_cast <GWt_dropZoneLigneFaiseau*> (evt.source()) << endl;
+    removeOtherDropZone(dynamic_cast <GWt_dropZoneLigneFaiseau*> (evt.source()));
+  }
+
   if(eType == inconnu) {
     cout << "GWt_LigneFaisceau::element type " << eType << " inconnu " << endl;
@@ -130 +137 @@
   ptr->setLabel(getElementNumberInBeamLine(e));
 
-  cout << " je vais ajouter l'element  " << ptr->getName().getElementName() << " de type " << ptr->getName().getElementType() << endl;
-  GWt_abstractElement* gw = GWt_abstractElement::ajoute(pspa_,ptr);
-  if(gw == NULL) return;
-  gw->updateLabelWidget();
+  GWt_abstractElement* insertedAbstractElement = GWt_abstractElement::ajoute(pspa_,ptr);
+  cout << " je vais ajouter l'element  " << ptr->getName().getElementName() << " de type " << ptr->getName().getElementType() << "ID "<< insertedAbstractElement << endl;
+
+  if(insertedAbstractElement == NULL) return;
+  insertedAbstractElement->updateLabelWidget();
 
 //   //////////////////////////////////////////////////////////////////
@@ -139 +147 @@
 
 //   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 << "number of widgets in this container= " << insertedAbstractElement->getWidget()->count() << ": ";
+//   for(int k = 0; k < insertedAbstractElement->getWidget()->count(); k++) {
+//     WWidget *w= insertedAbstractElement->getWidget()->widget(k);
 //     cout << w->id() << ", ";
 //   }
@@ -150 +158 @@
   WSignalMapper<GWt_abstractElement *> *mapper= new WSignalMapper<GWt_abstractElement *>(this);
   mapper->mapped().connect(this,&GWt_dropZoneLigneFaiseau::onClick);
-  mapper->mapConnect(gw->getButton()->doubleClicked(),gw);
+  mapper->mapConnect(insertedAbstractElement->getButton()->doubleClicked(),insertedAbstractElement);
 
   //////////////////////////////////////////////////////////////////
@@ -181 +189 @@
       }
     }
+    // FIXME Replace
 
     // complete widget
@@ -186 +195 @@
     insertMessage_ = NULL;
     linkImage_ = NULL;
-    abstractElement_ = gw->getWidget();
+    abstractElement_ = insertedAbstractElement->getWidget();
     addWidget(abstractElement_);
     // change strech (useful if it was the last one)
@@ -194 +203 @@
     // insert after
     // if it is the last, add a strech factor and no link image
-    cout<<" nb elem:"<< layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this)))+1 << " COUNT:"<< wc->count () <<"<---------------"<< endl;
+    cout<<" nb elem:"<< layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this)))+1 << " COUNT:"<< wc->count () <<"<---------------ID:"<< abstractElement_ << endl;
     if (!replaceElement) {
       if (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this)))+1 == wc->count()) {
@@ -203 +212 @@
     }
 
+    /*
+     * Set the image to be draggable, showing the other image (dragImage)
+     * to be used as the widget that is visually dragged.
+     */
+    WImage *dragImage = new WImage(e.getImageFromType(eType).c_str(),this);
+
+    //    setDraggable(evt.mimeType(),dragImage,true);//,insertedAbstractElement->getButton(),true);
+    abstractElement_->setDraggable(evt.mimeType(),dragImage,true, this);
+
     
     cout<<"add the dropped parent %d"<< wc << " COUNT:"<< wc->count () <<"<---------------"<< endl;
   }
 
-
-  //gw->getWidget()->decorationStyle().setBackgroundColor (WColor("blue")); 
+  // update border 
+  decorationStyle().setBorder (WBorder (WBorder::Solid, WBorder::Thin,WColor(200,200,200)));
+
+
+  //insertedAbstractElement->getWidget()->decorationStyle().setBackgroundColor (WColor("blue")); 
   pspa_->updateSelections();
 
@@ -253 +274 @@
 void GWt_dropZoneLigneFaiseau::removeDone(GWt_abstractElement* gw)
 {
-  if (messageDropZone_->result() == WDialog::Accepted) {
-
-    cout <<"GWt_dropZoneLigneFaiseau:: removeDone "<< gw->getWidget()->id() << endl;
-    
-clear();
-    
-    string label= gw->getElement()->getLabel();
-    cout << "GWt_dropZoneLigneFaiseau:: " << label << " a été supprimé" << endl;
-    pspa_->getDataManager()->getCollection()->eraseElement(label);
-    pspa_->updateSelections();
-  }
+  if (messageDropZone_->result() == WDialog::Accepted) {    
+    // FIXME
+    //    removeDropZone();
+  }
+}
+
+
+
+void GWt_dropZoneLigneFaiseau::removeOtherDropZone(GWt_dropZoneLigneFaiseau* other)
+{
+  // 3 cases :
+  // - first element : remove elem + link after
+  // - last element : remove elem + link before
+  // - middle element : remove elem + link after/before
+
+  WContainerWidget* wc = static_cast <WContainerWidget*> (parent());
+  WBoxLayout* layout = ((WBoxLayout*)(wc->layout()));
+  
+  pspa_->addConsoleMessage("remove from drag Zone");
+  cout << "remove from drag Zone id" << layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (other))) << " count:" << layout->count()<< endl;
+
+  // first element
+  if (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (other))) == 1) {
+    if (layout->itemAt (2)) {
+      layout->removeItem (layout->itemAt(2));
+  pspa_->addConsoleMessage("remove first link");
+    }
+    
+    // last and middle
+  } else if (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (other))) == layout->count()-2) {
+    if (layout->itemAt (layout->count()-3)) {
+      layout->removeItem (layout->itemAt(layout->count()-3));
+  pspa_->addConsoleMessage("remove last link");
+    }
+  }
+  
+  // remove the drop zone
+  if (layout->findWidgetItem (other)) {
+    layout->removeItem (layout->itemAt(layout->indexOf((WLayoutItem*)(layout->findWidgetItem (other)))));
+    pspa_->addConsoleMessage("remove drop zone");
+  }
+
+  
+  // FIXME ne mas passer par un label mais par un abstrastElement
+  //  pspa_->getDataManager()->getCollection()->eraseElement(label);
+  pspa_->updateSelections();
 }
 
@@ -269 +325 @@
 
 void GWt_dropZoneLigneFaiseau::addElement(WContainerWidget* elem){
+
   clear();
   abstractElement_ = elem;
   addWidget(abstractElement_);
+  if (static_cast <WContainerWidget*> (parent())) {
+    WContainerWidget* wc = static_cast <WContainerWidget*> (parent());
+    WBoxLayout* layout = ((WBoxLayout*)(wc->layout()));
+    layout->setStretchFactor(this,0);           
+  }
+
 
   insertMessage_ = NULL;

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -147 +147 @@
    * to be used as the widget that is visually dragged.
    */
+  cout << "createDragImage" << dragImage<<endl;
   result->setDraggable(mimeType,dragImage,true);
 }