Changeset 47 in PSPA for Interface_Web/trunk/pspaWT

Timestamp:

Oct 30, 2012, 3:46:54 PM (12 years ago)

Author:

garnier

Message:

ajout de ComboBox en dessous des icones

File:

• Interface_Web/trunk/pspaWT/src/LigneFaisceau.cc (modified) (6 diffs)

Interface_Web/trunk/pspaWT/src/LigneFaisceau.cc

@@ -6 +6 @@
 #include <iostream>
 #include "nomdElements.h"
+
+#include <Wt/WComboBox>
+#include <Wt/WVBoxLayout>
 
 LigneFaisceau::LigneFaisceau(PspaApplication* ps):
@@ -51 +54 @@
     //  beamLayout_->addWidget(droppedElement_.back());
 
+
+  WPushButton* dropped = NULL;
+
   if ( strstr(evt.mimeType().c_str() , "drift") ) 
     {
@@ -57 +63 @@
       GWt_drift* gdrift = new GWt_drift(pspa_,newDrift, evt.mimeType());
 
-      WPushButton* dropped = gdrift->getButton();
+      dropped = gdrift->getButton();
       //      WDialog* driftDialog = gdrift->getDialog();
-      beamLayout_->addWidget(dropped);
     }
   else
@@ -69 +74 @@
           GWt_initialBeam* gwInitialBeam = new GWt_initialBeam(pspa_,newInitialBeam, evt.mimeType());
 
-          WPushButton* dropped = gwInitialBeam->getButton();
-          beamLayout_->addWidget(dropped);
+          dropped = gwInitialBeam->getButton();
         }
       else
@@ -79 +83 @@
               abstractElement* newCell = pspa_->getDataManager()->addCell();
               GWt_cell* gwCell = new GWt_cell(pspa_,newCell, evt.mimeType());
-              WPushButton* dropped = gwCell->getButton();
-              beamLayout_->addWidget(dropped);
+              dropped = gwCell->getButton();
             }
           else
@@ -88 +91 @@
         }
     }
+  WVBoxLayout* tempVBox = new WVBoxLayout();
+
+  if (!dropped) {
+    dropped = new WPushButton();
+    dropped->setIcon(evt.mimeType());
+    dropped->setMaximumSize(50,50);
+  }
+
+  WComboBox *selectionBox = new WComboBox();
+  selectionBox->addItem("Parmela");
+  selectionBox->addItem("Transport");
+  selectionBox->addItem("Autre");
+  
+  selectionBox->setCurrentIndex(1); // Parmela
+  //  selectionBox->activated().connect(this, &MyWidget::comboChanged);
+
+  tempVBox->addWidget(dropped);
+  tempVBox->addWidget(selectionBox);
+
+  WContainerWidget* tempWidget = new WContainerWidget();
+  tempWidget->setLayout(tempVBox);
+  beamLayout_->addWidget(tempWidget);
 }