Changeset 223 in PSPA

Timestamp:

Dec 21, 2012, 4:21:50 PM (12 years ago)

Author:

garnier

Message:

Modifications sur les elements draggables

Location:

Interface_Web/trunk/pspaWT

Files:

• History (modified) (1 diff)
• cmt/requirements (modified) (1 diff)
• icons/background.png (added)
• include/GWt_draggableImage.h (added)
• src/GWt_LigneFaisceau.cc (modified) (1 diff)
• src/GWt_draggableImage.cc (added)
• src/GWt_dropZoneLigneFaiseau.cc (modified) (12 diffs)
• src/GWt_pspaApplication.cc (modified) (4 diffs)

Interface_Web/trunk/pspaWT/History

@@ -7 +7 @@
 
 
+21 December 2012  Laurent Garnier
+- Pas mal de modification coté physique par Guy et François
+- Par rapport à la dernière revision :
+  o GWt_LigneFaiseau : Ajout d'une imag de fond  plutot que orange.
+  o Ajout d'une nouvelle classe GWt_draggableImage (tout est dit)
+  o Suppression des bordures pointillées dans les éléments
+
 17 Octobre 2012  Laurent Garnier
 - Affichage d'un Dialog lors du clic sur le bouton Drift

Interface_Web/trunk/pspaWT/cmt/requirements

@@ -17 +17 @@
 
 
-macro lib_PSPSLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD " Linux-x86_64  " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DHAS_IMAGEMAGIC"
+macro lib_PSPSLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD  -DHAS_IMAGEMAGIC -DPSPA_DEBUG" Linux-x86_64  " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DHAS_IMAGEMAGIC"
 #macro PSPSLib_shlibflags   " ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts} -F/System/Library/Frameworks "
 
 #macro PSPSLib_linkopts     " -L${PSPAWTROOT}/$(Platform_bin) -lPSPSLib "
 
-application pspaWT bareParticle.cc particleBeam.cc GWt_cell.cc GWt_rfgun.cc GWt_soleno.cc GWt_bend.cc GWt_beam.cc GWt_globalParameters.cc GWt_drift.cc GWt_abstractElement.cc dataManager.cc elementsCollection.cc elementDrift.cc elementCell.cc elementRfgun.cc elementSoleno.cc elementBend.cc elementBeam.cc globalParameters.cc abstractElement.cc GWt_LigneFaisceau.cc GWt_pspaApplication.cc GWt_dropZoneLigneFaiseau.cc GWt_dialog.cc nomdElements.cc nomDeLogiciel.cc transportMoments.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags}"'
+application pspaWT bareParticle.cc particleBeam.cc GWt_cell.cc GWt_rfgun.cc GWt_soleno.cc GWt_bend.cc GWt_beam.cc GWt_globalParameters.cc GWt_drift.cc GWt_abstractElement.cc dataManager.cc elementsCollection.cc elementDrift.cc elementCell.cc elementRfgun.cc elementSoleno.cc elementBend.cc elementBeam.cc globalParameters.cc abstractElement.cc GWt_LigneFaisceau.cc GWt_pspaApplication.cc GWt_dropZoneLigneFaiseau.cc GWt_draggableImage.cc GWt_dialog.cc nomdElements.cc nomDeLogiciel.cc transportMoments.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags}"'
 
 macro DrawWt_linkopts " ${PSPSLib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"

Interface_Web/trunk/pspaWT/src/GWt_LigneFaisceau.cc

@@ -24 +24 @@
 
   hbox_ = new WHBoxLayout();
-  //  decorationStyle().setBackgroundColor (WColor("orange")); 
+  //  decorationStyle().setBackgroundColor (WColor(245,245,245)); 
+  decorationStyle().setBackgroundImage (WApplication::appRoot()+"../icons/background.png");
   setLayout(hbox_);
 

Interface_Web/trunk/pspaWT/src/GWt_dropZoneLigneFaiseau.cc

@@ -18 +18 @@
     abstractElement_(NULL)
 {
-  //  decorationStyle().setBackgroundColor (WColor("yellow"));
   resize(5,5);
   cout<<"new GWt_dropZoneLigneFaiseau : "<< this << endl;
@@ -24 +23 @@
   // connect mouse events
 
-  setMouseOverDelay(500);       
+  //  setMouseOverDelay(100);   
   mouseWentOver().connect(this, &GWt_dropZoneLigneFaiseau::mouseOver);
   mouseWentUp().connect(this, &GWt_dropZoneLigneFaiseau::mouseUp);
@@ -59 +58 @@
 void GWt_dropZoneLigneFaiseau::mouseOver(const WMouseEvent& e)
 {
+  decorationStyle().setCursor(OpenHandCursor);
   // Add text
   if (insertMessage_) {
@@ -64 +64 @@
       insertMessage_->show();
       resize(insertMessage_->width(),insertMessage_->height());
+    } else {
+      decorationStyle().setCursor(OpenHandCursor);
     }
   }
@@ -70 +72 @@
   }
 
-  decorationStyle().setBorder (WBorder (WBorder::Dashed, WBorder::Medium,WColor(blue)));
-
-  pspa_->addConsoleMessage("mouse Over");
-  cout << " GWt_dropZoneLigneFaiseau::mouseOver" << endl;
+
+#ifdef PSPA_DEBUG
+  pspa_->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOver");
+#endif
 }
 
@@ -84 +86 @@
       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_) {
@@ -94 +93 @@
     linkImage_->show();
   }
+  decorationStyle().setCursor(ArrowCursor); 
+
+#ifdef PSPA_DEBUG
   pspa_->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut");
+#endif
 }
 
 void GWt_dropZoneLigneFaiseau::mouseIsDragged(const WMouseEvent& e)
 {
+#ifdef PSPA_DEBUG
   pspa_->addConsoleMessage(" GWt_dropZoneLigneFaiseau::mouseDragged");
+#endif
 }
 
 void GWt_dropZoneLigneFaiseau::mouseUp(const WMouseEvent& e)
 {
+#ifdef PSPA_DEBUG
   pspa_->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut up");
+#endif
 }
 
 void GWt_dropZoneLigneFaiseau::mouseDown(const WMouseEvent& e)
 {
+#ifdef PSPA_DEBUG
   pspa_->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseDown up");
+#endif
 }
 
 void GWt_dropZoneLigneFaiseau::dropEvent(WDropEvent evt)
 {
+#ifdef PSPA_DEBUG
   pspa_->addConsoleMessage(" GWt_dropZoneLigneFaiseau::dropEvent");
+#endif
 
   nomdElements e(evt.mimeType());
@@ -200 +211 @@
     layout->setStretchFactor(this,0);           
 
+    // change background
+    decorationStyle().setBackgroundColor (WColor("white"));
+
+    // remove border
+    decorationStyle().setBorder (WBorder (WBorder::None));
+
 
     // insert after
@@ -225 +242 @@
   }
 
-  // update border 
-  decorationStyle().setBorder (WBorder (WBorder::Solid, WBorder::Thin,WColor(200,200,200)));
 
 
@@ -292 +307 @@
   WBoxLayout* layout = ((WBoxLayout*)(wc->layout()));
   
+#ifdef PSPA_DEBUG
   pspa_->addConsoleMessage("remove from drag Zone");
   cout << "remove from drag Zone id" << layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (other))) << " count:" << layout->count()<< endl;
-
+#endif
   // first element
   if (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (other))) == 1) {
     if (layout->itemAt (2)) {
       layout->removeItem (layout->itemAt(2));
+#ifdef PSPA_DEBUG
   pspa_->addConsoleMessage("remove first link");
+#endif
     }
     
@@ -306 +324 @@
     if (layout->itemAt (layout->count()-3)) {
       layout->removeItem (layout->itemAt(layout->count()-3));
+#ifdef PSPA_DEBUG
   pspa_->addConsoleMessage("remove last link");
+#endif
     }
   }
@@ -313 +333 @@
   if (layout->findWidgetItem (other)) {
     layout->removeItem (layout->itemAt(layout->indexOf((WLayoutItem*)(layout->findWidgetItem (other)))));
+#ifdef PSPA_DEBUG
     pspa_->addConsoleMessage("remove drop zone");
+#endif
   }
 

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -7 +7 @@
 #include "GWt_globalParameters.h"
 #include "GWt_dialog.h"
+#include "GWt_draggableImage.h"
 #include "particleBeam.h"
 #include "bareParticle.h"
@@ -49 +50 @@
   
   WContainerWidget *w = root();
-  w->setStyleClass("PSPA");
+  useStyleSheet (WApplication::appRoot()+"../include/pspa.css");        
   dtmanage_ = new dataManager();
 
@@ -143 +144 @@
 void PspaApplication::createDragImage(const char *url,const char *smallurl,const char *mimeType,WContainerWidget *p,WString name)
 {
-  WImage *result = new WImage(url,p);
+  GWt_draggableImage *result = new GWt_draggableImage(url,p);
   WImage *dragImage = new WImage(smallurl,p);
 
@@ -152 +153 @@
   cout << "createDragImage" << dragImage<<endl;
   result->setDraggable(mimeType,dragImage,true);
+
 }