Changeset 195 in PSPA for Interface_Web/branches/insertionsElements

Timestamp:

Dec 17, 2012, 3:22:03 PM (12 years ago)

Author:

garnier

Message:

insertion, correction et ameliorations

Location:

Interface_Web/branches/insertionsElements

Files:

• include/GWt_LigneFaisceau.h (modified) (2 diffs)
• include/GWt_dropZoneLigneFaiseau.h (modified) (3 diffs)
• src/GWt_LigneFaisceau.cc (modified) (2 diffs)
• src/GWt_abstractElement.cc (modified) (1 diff)
• src/GWt_dropZoneLigneFaiseau.cc (modified) (10 diffs)
• src/GWt_pspaApplication.cc (modified) (1 diff)

Interface_Web/branches/insertionsElements/include/GWt_LigneFaisceau.h

@@ -12 +12 @@
 #include <Wt/WHBoxLayout>
 #include <Wt/WContainerWidget>
-#include <Wt/WImage>
 
 using namespace Wt;
@@ -29 +28 @@
   PspaApplication* pspa_;
   Compteur *nObjets_;
-
-  string createLabel(nomdElements el,int n);
 
  public :

Interface_Web/branches/insertionsElements/include/GWt_dropZoneLigneFaiseau.h

@@ -2 +2 @@
 #define GWT_DROPZONELIGNEFAISEAU_SEEN
 
-#include "GWt_LigneFaisceau.h"
+#include "GWt_dialog.h"
+#include "GWt_pspaApplication.h"
+#include "abstractElement.h"
+#include "GWt_abstractElement.h"
+
 #include <Wt/WContainerWidget>
-#include "GWt_dialog.h"
 
 using namespace Wt;
@@ -13 +16 @@
  public : 
 
-  GWt_dropZoneLigneFaiseau(PspaApplication*);
+  GWt_dropZoneLigneFaiseau(PspaApplication*,bool linkImage = true);
   ~GWt_dropZoneLigneFaiseau();
+
 
  private:
@@ -26 +30 @@
   void onClick(GWt_abstractElement*);
   void removeDone(GWt_abstractElement*); 
+  std::string getElementNumberInBeamLine(nomdElements el);
 
   PspaApplication* pspa_;
-  GWt_LigneFaisceau* ligneFaiseau_;
   GWt_dialog* messageDropZone_;
   WText* insertMessage_;
-  WWidget* HR_;
+  WWidget* linkImage_;
 
   WContainerWidget* abstractElement_;

Interface_Web/branches/insertionsElements/src/GWt_LigneFaisceau.cc

@@ -35 +35 @@
 
   // add the first drop zone
-  hbox_->addWidget(new GWt_dropZoneLigneFaiseau(pspa_));
+  hbox_->addWidget(new GWt_dropZoneLigneFaiseau(pspa_,false));
 
   // add a strech element at the end
@@ -41 +41 @@
 }
  
-string GWt_LigneFaisceau::createLabel(nomdElements el,int n)
-{
-  cout<<"GWt_LigneFaisceau::createLabel()"<<endl;
-
-   string str;
-  if(n < 10) {
-    str= el.getElementLabel()+"0"+mixedTools::intToString(n);
-  } else {
-    str= el.getElementLabel()+mixedTools::intToString(n);
-  }
-  return str;
-}
-
 
     

Interface_Web/branches/insertionsElements/src/GWt_abstractElement.cc

@@ -24 +24 @@
   dropped_->setObjectName("aPushButton");
   dropped_->setIcon(element_->getName().getElementImage());
-  dropped_->setMaximumSize(45,37);
+  dropped_->setMaximumSize(50,37);
   dropped_->clicked().connect(this,&GWt_abstractElement::clicked);
 

Interface_Web/branches/insertionsElements/src/GWt_dropZoneLigneFaiseau.cc

@@ -6 +6 @@
 #include <Wt/WSignalMapper>
 #include <Wt/WText>
-
-GWt_dropZoneLigneFaiseau::GWt_dropZoneLigneFaiseau(PspaApplication* ps)
+#include <Wt/WImage>
+#include <Wt/WHBoxLayout>
+
+
+GWt_dropZoneLigneFaiseau::GWt_dropZoneLigneFaiseau(PspaApplication* ps,bool linkImageOk)
   : WContainerWidget(),
     pspa_(ps),
+    insertMessage_(NULL),
+    linkImage_(NULL),
     abstractElement_(NULL)
 {
@@ -24 +29 @@
   mouseDragged().connect(this, &GWt_dropZoneLigneFaiseau::mouseIsDragged);
 
-  insertMessage_ = new WText("Insert an element...");
-  HR_ = new WImage("icons/link.jpg");
-  HR_->setMargin(4, Top | Bottom);            // add margin vertically
-
+  insertMessage_ = new WText("Drag an element here");
   addWidget(insertMessage_);
-  addWidget(HR_);
+  if (linkImageOk) {
+    linkImage_ = new WImage("icons/link.jpg");
+    linkImage_->setMargin(4, Top | Bottom);            // add margin vertically
+    addWidget(linkImage_);
+  }
+
   insertMessage_->hide();
 
@@ -57 +64 @@
     }
   }
-  if (HR_) {
-    HR_->hide();
+  if (linkImage_) {
+    linkImage_->hide();
   }
 
@@ -70 +77 @@
 {
   if (!abstractElement_) {
-    resize(5,5);
+    if (linkImage_) {
+      resize(linkImage_->width(),linkImage_->height());
+    } else {
+      resize(10,10);
+    }
   }
   if (insertMessage_) {
     insertMessage_->hide();
   }
-  if (HR_) {
-    HR_->show();
-  }
-  decorationStyle().setBorder (WBorder (WBorder::None));
+  if (linkImage_) {
+    linkImage_->show();
+  }
+  decorationStyle().setBorder (WBorder (WBorder::Dashed, WBorder::Medium,WColor(255,255,255,255)));
   pspa_->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut");
 }
@@ -116 +127 @@
   // FIXME
   //  ptr->setLabel(createLabel(e,nObjets_[eType].incr()));
+  ptr->setLabel(getElementNumberInBeamLine(e));
 
   cout << " je vais ajouter l'element  " << ptr->getName().getElementName() << " de type " << ptr->getName().getElementType() << endl;
@@ -151 +163 @@
     // do not insert new element if some element is already present
 
-    // insert one before
     WBoxLayout* layout = ((WBoxLayout*)(wc->layout()));
     bool replaceElement = false;
@@ -159 +170 @@
     }
 
+    // insert one before
     if (!replaceElement) {
-      layout->insertWidget (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this))), new GWt_dropZoneLigneFaiseau(pspa_));
+      // if it the first element of the beam line
+      if (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this))) == 0) {
+        layout->insertWidget (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this))), new GWt_dropZoneLigneFaiseau(pspa_,false));
+      
+      } else {
+        layout->insertWidget (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this))), new GWt_dropZoneLigneFaiseau(pspa_,true));
+      }
     }
 
@@ -166 +184 @@
     clear();
     insertMessage_ = NULL;
-    HR_ = NULL;
+    linkImage_ = NULL;
     abstractElement_ = gw->getWidget();
     addWidget(abstractElement_);
@@ -174 +192 @@
 
     // insert after
-    // if it is the last, add a strech factor
+    // 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;
     if (!replaceElement) {
       if (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this)))+1 == wc->count()) {
-        layout->insertWidget (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this)))+1, new GWt_dropZoneLigneFaiseau(pspa_),1);
+        layout->insertWidget (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this)))+1, new GWt_dropZoneLigneFaiseau(pspa_,false),1);
       } else {
         layout->insertWidget (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this)))+1, new GWt_dropZoneLigneFaiseau(pspa_));
@@ -247 +265 @@
 }
 
+
+
+std::string GWt_dropZoneLigneFaiseau::getElementNumberInBeamLine(nomdElements el){
+  string str = "";
+  
+  if (static_cast <WContainerWidget*> (parent())) {
+    WContainerWidget* wc = static_cast <WContainerWidget*> (parent());
+    for (int a=0; a<wc->count(); a++) {
+      if (static_cast <GWt_abstractElement*> (wc->widget (a))) {
+        pspa_->addConsoleMessage("type trouvé");
+      }
+    }
+    
+    int n = 999999;
+    
+    std::stringstream stream;
+    stream << n ;
+    std::string number(stream.str());
+    
+    if(n < 10) {
+      str= el.getElementLabel()+"0"+number;
+    } else {
+    str= el.getElementLabel()+" "+number;
+    }
+  }
+
+  return str;
+
+}

Interface_Web/branches/insertionsElements/src/GWt_pspaApplication.cc

@@ -82 +82 @@
   
   console_ = new WContainerWidget();
-  console_->decorationStyle().setBackgroundColor (WColor("gray")); 
+  console_->decorationStyle().setBackgroundColor (WColor("lightgray")); 
   console_->setMaximumSize(600,200);
   layout->addWidget(console_, 3, 1);