Changeset 248 in PSPA for Interface_Web/trunk/pspaWT/include

Timestamp:

Jan 21, 2013, 4:49:49 PM (11 years ago)

Author:

garnier

Message:

Grosse modifications pour une meilleur gestion des drag & drop (a terminer)

Location:

Interface_Web/trunk/pspaWT/include

Files:

• GWt_LigneFaisceau.h (modified) (2 diffs)
• GWt_elementLigneFaiseau.h (moved) (moved from Interface_Web/trunk/pspaWT/include/GWt_dropZoneLigneFaiseau.h) (3 diffs)
• pspa.css (modified) (2 diffs)

Interface_Web/trunk/pspaWT/include/GWt_LigneFaisceau.h

@@ -25 +25 @@
 class GWt_LigneFaisceau : public WContainerWidget
 {
-  WHBoxLayout* hbox_;
+  WHBoxLayout* ligneFaisceauLayout_;
   PspaApplication* pspa_;
   Compteur *nObjets_;
@@ -33 +33 @@
   GWt_LigneFaisceau() {;}
   GWt_LigneFaisceau(PspaApplication*);
+  void addElement(typedElement eType);
 
   ~GWt_LigneFaisceau() {

Interface_Web/trunk/pspaWT/include/GWt_elementLigneFaiseau.h

@@ -1 @@
-#ifndef GWT_DROPZONELIGNEFAISEAU_SEEN
-#define GWT_DROPZONELIGNEFAISEAU_SEEN
+#ifndef GWT_ELEMENTLIGNEFAISEAU_SEEN
+#define GWT_ELEMENTLIGNEFAISEAU_SEEN
 
 #include "GWt_dialog.h"
@@ -6 +6 @@
 #include "abstractElement.h"
 #include "GWt_abstractElement.h"
+#include "GWt_dropZoneLigneFaisceau.h"
 
 #include <Wt/WContainerWidget>
@@ -12 +13 @@
 
 
-class GWt_dropZoneLigneFaiseau : public WContainerWidget
+class GWt_elementLigneFaiseau : public WContainerWidget
 {
  public : 
   /**
      dropZone element
-     @param pspa : application name
-     @param linkImage : true/false if the drop zone have to display the link image
-     @param showInsertMessage : true/false if it has to display the insertMessage at first step
+     a drop zone is the basic element for a widget in the ligne faisceau drop zone area
+     it should be like this :
+
+     +----------+--------+---------+
+     |   (--->) |  ELEM  | (-----) |
+     +----------+--------+---------+
+     |             NAME            |
+     +----------+--------+---------+
+     ELEM : Element representation, draggable object
+     (----) and (---->) : Droppable zone, contain arrows or line if this element is connected to another
+     NAME : editable element name
+
+    At first time, the ELEM element is replace by a message.
+
+    @param pspa : application name
+    @param linkImage : true/false if the drop zone have to display the link image
+    @param showInsertMessage : true/false if it has to display the insertMessage at first step
    */
 
-  GWt_dropZoneLigneFaiseau(PspaApplication* pspa,bool linkImage = true,bool showInsertMessage = false);
-  ~GWt_dropZoneLigneFaiseau();
-  void addElement(WContainerWidget* elem);
+  GWt_elementLigneFaiseau();
+  GWt_elementLigneFaiseau(abstractElement*);
+
+  ~GWt_elementLigneFaiseau();
+  void addElement(GWt_abstractElement* elem);
+
+  inline WText* getElementName() {
+    return elementName_;
+  }
+
+  inline WText* getElementIcon() {
+    return elementName_;
+  }
 
  private:
-  void mouseOver(const WMouseEvent &e );
-  void mouseOut(const WMouseEvent &e );
-  void mouseUp(const WMouseEvent &e );
-  void mouseDown(const WMouseEvent &e );
-  void mouseIsDragged(const WMouseEvent &e );
-  void dropEvent(WDropEvent evt);
 
   void onClick(GWt_abstractElement*);
   void removeDone(GWt_abstractElement*); 
   std::string getElementNumberInBeamLine(nomdElements el);
-  void removeOtherDropZone(GWt_dropZoneLigneFaiseau*);
-
+  void removeOtherDropZone(GWt_elementLigneFaiseau*);
+  void initialize_ligneFaisceau(abstractElement*);
   PspaApplication* pspa_;
   GWt_dialog* messageDropZone_;
-  WText* insertMessage_;
-  WWidget* linkImage_;
+  WText* firstTimeInsertMessage_;
 
-  WContainerWidget* abstractElement_;
+  GWt_dropZoneLigneFaisceau* arrowImage_;
+  WContainerWidget* dragElementZone_;
+  GWt_dropZoneLigneFaisceau* lineImage_;
+  WText* elementName_;
+
+  GWt_abstractElement* abstractElement_;
 };
 #endif

Interface_Web/trunk/pspaWT/include/pspa.css

@@ -1 +1 @@
 body {
     padding-top: 30px
-    }
+}
+
 body {
     background: url("../icons/fond.jpg") repeat fixed left top / 100% auto #FFFFFF;
-}
-
-toolbar {
-    background: url("../icons/fond_toolbar.png") repeat fixed left top / 100% 100% #FFFFFF;
 }
 
@@ -13 +10 @@
    background-repeat: no;
 }
+
+.elementLigneFaiseau_line {
+  background-image : url("../icons/line.gif");
+  background-repeat : repeat-x;
+}
+
+.elementLigneFaiseau_arrow {
+  background-image : url("../icons/arrow.gif");
+  background-repeat : no-repeat;
+  float: right;
+}
+
+.saveButton {
+  background-image : url("../icons/save.png");
+  background-repeat : no-repeat;
+  background-size : 100% 100%;
+}
+
+.restoreButton {
+  background-image : url("../icons/restore.png");
+  background-repeat : no-repeat;
+  background-size : 100% 100%;
+}
+
+.loadNewButton {
+  background-image : url("../icons/open.png");
+  background-repeat : no-repeat;
+  background-size : 100% 100%;
+}
+
+.histoButton {
+  background-image : url("../icons/histo.png");
+  background-repeat : no-repeat;
+  background-size : 100% 100%;
+}