Changeset 273 in PSPA

Timestamp:

Jan 24, 2013, 6:03:44 PM (12 years ago)

Author:

garnier

Message:

Insertion dans la drop box ok

Location:

Interface_Web/trunk/pspaWT

Files:

• History (modified) (1 diff)
• sources/userInterface/include/GWt_dropZoneLigneFaisceau.h (modified) (1 diff)
• sources/userInterface/include/GWt_elementLigneFaisceau.h (modified) (2 diffs)
• sources/userInterface/include/GWt_ligneFaisceau.h (modified) (2 diffs)
• sources/userInterface/src/GWt_dropZoneLigneFaisceau.cc (modified) (5 diffs)
• sources/userInterface/src/GWt_elementLigneFaisceau.cc (modified) (6 diffs)
• sources/userInterface/src/GWt_ligneFaisceau.cc (modified) (3 diffs)

Interface_Web/trunk/pspaWT/History

@@ -9 +9 @@
 - Ameliorations sur la drop zone
 - re-identation du code dans la partie graphique
+- Insertion dans la drop box ok
 
 23 Janvier 2012  Laurent Garnier

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

@@ -17 +17 @@
     
 private:
+    void initialise();
     void mouseOver(const WMouseEvent &e );
     void mouseOut(const WMouseEvent &e );

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

@@ -48 +48 @@
     void setElementName(std::string label);
     
+    inline GWt_dropZoneLigneFaisceau* getDropZoneLeft() {
+        return dropZoneLeft_;
+    }
+
+    inline GWt_dropZoneLigneFaisceau* getDropZoneRight() {
+        return dropZoneRight_;
+    }
+
 private:
     
@@ -58 +66 @@
     WText* firstTimeInsertMessage_;
     
-    GWt_dropZoneLigneFaisceau* arrowImage_;
+    GWt_dropZoneLigneFaisceau* dropZoneLeft_;
     WContainerWidget* dragElementZone_;
-    GWt_dropZoneLigneFaisceau* lineImage_;
+    GWt_dropZoneLigneFaisceau* dropZoneRight_;
     WText* elementName_;
     

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

@@ -7 +7 @@
 #include "GWt_pspaApplication.h"
 #include "GWt_abstractElement.h"
+#include "GWt_dropZoneLigneFaisceau.h"
 
 #include <Wt/WApplication>
@@ -33 +34 @@
     GWt_LigneFaisceau() {;}
     GWt_LigneFaisceau(PspaApplication*);
-    void addElement(typedElement eType);
+    
+    /**
+     
+     Add an element at a position inside the beam line.
+     @param eType : type of element
+     @param dropContainer : origin of the drop event
+     -
+     Special case, when first element is created, we add a drop zone at the end and beginning of the drop zone
+     and we center everything
+     */
+    void addElement(typedElement eType, GWt_dropZoneLigneFaisceau* dropContainer);
     
     ~GWt_LigneFaisceau() {

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

@@ -14 +14 @@
 GWt_dropZoneLigneFaisceau::GWt_dropZoneLigneFaisceau()
 : WContainerWidget(){
+    initialise();
+}
+
+
+GWt_dropZoneLigneFaisceau::~GWt_dropZoneLigneFaisceau()
+{
+}
+
+
+void GWt_dropZoneLigneFaisceau::initialise()
+{
     
     // connect mouse events
@@ -23 +34 @@
     mouseDragged().connect(this, &GWt_dropZoneLigneFaisceau::mouseIsDragged);
     
-    decorationStyle().setBorder (WBorder (WBorder::Dotted));
+//    decorationStyle().setBorder (WBorder (WBorder::Dotted));
     
     // accept drops
@@ -37 +48 @@
 
 
-GWt_dropZoneLigneFaisceau::~GWt_dropZoneLigneFaisceau()
-{
-}
-
-
 void GWt_dropZoneLigneFaisceau::mouseOver(const WMouseEvent& e)
 {
@@ -115 +121 @@
     nomdElements e(evt.mimeType());
     typedElement eType = e.getElementType();
-    
-    ligneFaisceau->addElement(eType);
+    ligneFaisceau->addElement(eType, this);
     
     
@@ -228 +233 @@
      
      
-     //insertedAbstractElement->getWidget()->decorationStyle().setBackgroundColor (WColor("blue")); 
+     //insertedAbstractElement->getWidget()->decorationStyle().setBackgroundColor (WColor("blue"));
      pspa_->updateSelections();
      
-     */  
-}
-
-
+     */
+}
+
+

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

@@ -29 +29 @@
 : WContainerWidget(),
 firstTimeInsertMessage_(NULL),
-arrowImage_(NULL),
-lineImage_(NULL),
+dropZoneLeft_(NULL),
+dropZoneRight_(NULL),
 abstractElement_(NULL)
 {
@@ -43 +43 @@
 : WContainerWidget(),
 firstTimeInsertMessage_(NULL),
-arrowImage_(NULL),
-lineImage_(NULL),
+dropZoneLeft_(NULL),
+dropZoneRight_(NULL),
 abstractElement_(NULL),
 elementName_(NULL)
@@ -72 +72 @@
     
     // add first line :  initialize arrow and link images
-    arrowImage_ = new GWt_dropZoneLigneFaisceau();
+    dropZoneLeft_ = new GWt_dropZoneLigneFaisceau();
     dragElementZone_ = new WContainerWidget();
-    lineImage_ = new GWt_dropZoneLigneFaisceau();
+    dropZoneRight_ = new GWt_dropZoneLigneFaisceau();
     
     // change object name in order to manage css :
-    arrowImage_->setStyleClass("elementLigneFaiseau_line");
-    lineImage_->setStyleClass("elementLigneFaiseau_line");
-    lineImage_->resize(10,30);
+    dropZoneLeft_->setStyleClass("elementLigneFaiseau_line");
+    dropZoneRight_->setStyleClass("elementLigneFaiseau_line");
+    dropZoneRight_->resize(10,30);
     
     
@@ -87 +87 @@
     
     arrow->setStyleClass("elementLigneFaiseau_arrow");
-    arrowImage_->addWidget(arrow);
-    
-    gridLayout->addWidget       (arrowImage_,0,0);
+    dropZoneLeft_->addWidget(arrow);
+    
+    gridLayout->addWidget       (dropZoneLeft_,0,0);
     gridLayout->addWidget       (dragElementZone_,0,1);
-    gridLayout->addWidget       (lineImage_,0,2);
+    gridLayout->addWidget       (dropZoneRight_,0,2);
     
     // add the image if present
@@ -135 +135 @@
     }
     
-    gridLayout->addWidget       (elementName_,1,0,1,3);
+    gridLayout->addWidget       (elementName_,1,0,1,3,Wt::AlignCenter |Wt::AlignMiddle);
     
     
@@ -250 +250 @@
     
     firstTimeInsertMessage_ = NULL;
-    arrowImage_ = NULL;
+    dropZoneLeft_ = NULL;
 }
 

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

@@ -35 +35 @@
     setObjectName("ligneFaisceau");
     
+    
     // add the first drop zone
     decorationStyle().setBorder (WBorder (WBorder::Dotted));
@@ -42 +43 @@
     
     fit->addWidget(new WText("Drag elements here...."),1,Wt::AlignCenter |Wt::AlignMiddle);
-    
-    
-    
-    //        GWt_dropZoneLigneFaisceau* allDropZone= new GWt_dropZoneLigneFaisceau();
     ligneFaisceauLayout_->addWidget(allDropZone,1);
-    //  addElement(inconnu);
-    
-    // add a last element to push everything
-    //    ligneFaisceauLayout_->addWidget(new WText("") , 1,Wt::AlignMiddle);
-    
-    
-    // add a strech element at the end
-    //  ligneFaisceauLayout_->addStretch(1);
 }
 
@@ -105 +94 @@
 
 
-void GWt_LigneFaisceau::addElement(typedElement eType){
-  cout << " Entree addElement element " << nomdElements::getLabelFromType(eType) << endl;
-    // if it is the first element
-    if (eType == inconnu) {
-        ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaisceau());
+void GWt_LigneFaisceau::addElement(typedElement eType, GWt_dropZoneLigneFaisceau* dropContainer ){
+    
+    cout << " Entree addElement element " << nomdElements::getLabelFromType(eType) << endl;
+    
+    // 2 cases :
+    // -dropContainer is an element of the ligneFaisceauLayout_
+    // -dropContainer is an element of the GWt_elementLigneFaisceau_
+    
+    if(eType == inconnu) {
+        cout << "GWt_LigneFaisceau::element type " << eType << " inconnu " << endl;
+        return;
+    }
+    abstractElement* ptr = pspa_->getDataManager()->addElement(eType);
+    // first time we insert an element :
+    GWt_elementLigneFaisceau* firstElemIsElement = dynamic_cast <GWt_elementLigneFaisceau*> (ligneFaisceauLayout_->itemAt(0)->widget());
+    if ((ligneFaisceauLayout_->count() == 1) && (!firstElemIsElement)) {
+        int index = indexOf (dropContainer);
+        if (index != -1) { // found
+            // remove global drop zone
+            ligneFaisceauLayout_->clear();
+            // add first element
+            ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaisceau(ptr),1);
+            // remove arrow from begin and end
+            
+        } else { // error
+            return;
+        }
     } else {
-        abstractElement* ptr = pspa_->getDataManager()->addElement(eType);
-        
-        if(eType == inconnu) {
-            cout << "GWt_LigneFaisceau::element type " << eType << " inconnu " << endl;
-            return;
+        int index = -1;
+        for (int a=0; a< ligneFaisceauLayout_->count(); a++) {
+            GWt_elementLigneFaisceau* elem = static_cast <GWt_elementLigneFaisceau*> (ligneFaisceauLayout_->itemAt(a)->widget ());
+            if (elem) {
+                if (elem->getDropZoneLeft() == dropContainer) {
+                    index = a;
+                }
+                if (elem->getDropZoneRight() == dropContainer) {
+                    index = a+1;
+                }
+                //                printf("ELEM : %s ‰d\n",elem->getElementName()->text().toUTF8 ().c_str() , a);
+            } else {
+                printf("NOT an elem %d\n",a);
+            }
+            
         }
         
         
         //  ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaiseau(ptr),0);
-        ligneFaisceauLayout_->insertWidget(ligneFaisceauLayout_->count()-1,new GWt_elementLigneFaisceau(ptr),0);
+        if (index != -1) {
+            ligneFaisceauLayout_->insertWidget(index,new GWt_elementLigneFaisceau(ptr),1);
+        }
     }
 }