Changeset 287 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/src

Timestamp:

Jan 28, 2013, 3:21:51 PM (11 years ago)

Author:

garnier

Message:

ajout de tooltip et nettoyage de code

Location:

Interface_Web/trunk/pspaWT/sources/userInterface/src

Files:

• GWt_beam.cc (modified) (1 diff)
• GWt_bend.cc (modified) (1 diff)
• GWt_cell.cc (modified) (1 diff)
• GWt_drift.cc (modified) (1 diff)
• GWt_dropZoneLigneFaisceau.cc (modified) (2 diffs)
• GWt_elementLigneFaisceau.cc (modified) (2 diffs)
• GWt_fit.cc (modified) (1 diff)
• GWt_ligneFaisceau.cc (modified) (3 diffs)
• GWt_pspaApplication.cc (modified) (1 diff)
• GWt_rfgun.cc (modified) (1 diff)
• GWt_soleno.cc (modified) (1 diff)

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

@@ -79 +79 @@
     return image_;
 }
+
+
+WString GWt_beam::print(){
+    return WString(abstractElement_->print());
+}

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

@@ -83 +83 @@
     return image_;
 }
+
+
+WString GWt_bend::print(){
+    return WString(abstractElement_->print());
+}

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

@@ -107 +107 @@
     return image_;
 }
+
+
+WString GWt_cell::print(){
+    return WString(abstractElement_->print());
+}

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

@@ -54 +54 @@
     return image_;
 }
+
+
+WString GWt_drift::print(){
+    return WString(abstractElement_->print());
+}

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

@@ -10 +10 @@
 
 
-#define PSPA_DEBUG 1
+//#define PSPA_DEBUG 1
 
 GWt_dropZoneLigneFaisceau::GWt_dropZoneLigneFaisceau()
@@ -123 +123 @@
     typedElement eType = e.getElementType();
     ligneFaisceau->addElement(eType, this);
-    
-    
-    /*
-     nomdElements e(evt.mimeType());
-     typedElement eType = e.getElementType();
-     
-     // update source if necessary
-     cout<<"dynamic_cast SOURCE------" << evt.source() << endl;
-     if (dynamic_cast <GWt_dropZoneLigneFaisceau*> (evt.source())) {
-     cout<<"OKIKKKIIII" << dynamic_cast <GWt_dropZoneLigneFaisceau*> (evt.source()) << endl;
-     removeOtherDropZone(dynamic_cast <GWt_dropZoneLigneFaisceau*> (evt.source()));
-     }
-     
-     if(eType == inconnu) {
-     cout << "GWt_LigneFaisceau::element type " << eType << " inconnu " << endl;
-     return;
-     }
-     
-     if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
-     GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
-     console->addConsoleMessage(e.getElementName());
-     }
-     
-     abstractElement* ptr = pspa_->getDataManager()->addElement(eType);
-     
-     ptr->setLabel(getElementNumberInBeamLine(e));
-     
-     GWt_abstractElement* insertedAbstractElement = GWt_abstractElement::ajoute(ptr);
-     cout << " je vais ajouter l'element  " << ptr->getNomdElement().getElementName() << " de type " << ptr->getNomdElement().getElementType() << "ID "<< insertedAbstractElement << endl;
-     
-     if(insertedAbstractElement == NULL) return;
-     insertedAbstractElement->setLabelWidget();
-     
-     WSignalMapper<GWt_abstractElement *> *mapper= new WSignalMapper<GWt_abstractElement *>(this);
-     mapper->mapped().connect(this,&GWt_dropZoneLigneFaisceau::onClick);
-     mapper->mapConnect(insertedAbstractElement->getImage()->doubleClicked(),insertedAbstractElement);
-     
-     //////////////////////////////////////////////////////////////////
-     
-     // add the dropped widget
-     printf("add the dropped widget\n");
-     
-     // add drop zone before and after
-     if (static_cast <WContainerWidget*> (parent())) {
-     WContainerWidget* wc = static_cast <WContainerWidget*> (parent());
-     
-     cout<<"add the dropped parent %d"<< wc << " COUNT:"<< count () <<"<---------------"<< endl;
-     // do not insert new element if some element is already present
-     
-     WBoxLayout* layout = ((WBoxLayout*)(wc->layout()));
-     bool replaceElement = false;
-     
-     if (abstractElement_) {
-     replaceElement = true;
-     }
-     
-     // insert one before
-     if (!replaceElement) {
-     // 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_dropZoneLigneFaisceau(pspa_,false));
-     
-     } else {
-     layout->insertWidget (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this))), new GWt_dropZoneLigneFaisceau(pspa_,true));
-     }
-     }
-     // FIXME Replace
-     
-     // complete widget
-     clear();
-     arrowImage_ = NULL;
-     abstractElement_ = insertedAbstractElement->getWidget();
-     addWidget(abstractElement_);
-     // change strech (useful if it was the last one)
-     layout->setStretchFactor(this,0);
-     
-     // change background
-     decorationStyle().setBackgroundColor (WColor("white"));
-     
-     // remove border
-     decorationStyle().setBorder (WBorder (WBorder::None));
-     
-     
-     // insert after
-     // 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 () <<"<---------------ID:"<< abstractElement_ << endl;
-     if (!replaceElement) {
-     if (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this)))+1 == wc->count()) {
-     layout->insertWidget (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this)))+1, new GWt_dropZoneLigneFaisceau(pspa_,false),1);
-     } else {
-     layout->insertWidget (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (this)))+1, new GWt_dropZoneLigneFaisceau(pspa_));
-     }
-     }
-     */
-    
-    /*
-     * Set the image to be draggable, showing the other image (dragImage)
-     * to be used as the widget that is visually dragged.
-     */
-    /*
-     WImage *dragImage = new WImage(e.getImageFromType(eType).c_str(),this);
-     
-     //    setDraggable(evt.mimeType(),dragImage,true);//,insertedAbstractElement->getButton(),true);
-     abstractElement_->setDraggable(evt.mimeType(),dragImage,true, this);
-     
-     
-     cout<<"add the dropped parent %d"<< wc << " COUNT:"<< wc->count () <<"<---------------"<< endl;
-     }
-     
-     
-     
-     //insertedAbstractElement->getWidget()->decorationStyle().setBackgroundColor (WColor("blue"));
-     pspa_->updateSelections();
-     
-     */
 }
 

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

@@ -125 +125 @@
             dragElementZone_->setMaximumSize(32,32);
             dragElementZone_->setMinimumSize(32,32);
+            dragElementZone_->setToolTip(abstractElement_->print());
         }
     }
@@ -175 +176 @@
 
 
-
-void GWt_elementLigneFaisceau::removeOtherDropZone(GWt_elementLigneFaisceau* other)
-{
-    // 3 cases :
-    // - first element : remove elem + link after
-    // - last element : remove elem + link before
-    // - middle element : remove elem + link after/before
-    
-    WContainerWidget* wc = static_cast <WContainerWidget*> (parent());
-    WBoxLayout* layout = ((WBoxLayout*)(wc->layout()));
-    
-#ifdef PSPA_DEBUG
-    if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
-        GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
-        console->addConsoleMessage("GWt_elementLigneFaisceau::mouseOut");
-        console->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
-            if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
-                GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
-                console->addConsoleMessage(" remove first link ");
-            }
-#endif
-        }
-        
-        // last and middle
-    } else if (layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (other))) == layout->count()-2) {
-        if (layout->itemAt (layout->count()-3)) {
-            layout->removeItem (layout->itemAt(layout->count()-3));
-#ifdef PSPA_DEBUG
-            if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
-                GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
-                console->addConsoleMessage(" remove first link ");
-            }
-#endif
-        }
-    }
-    
-    // remove the drop zone
-    if (layout->findWidgetItem (other)) {
-        layout->removeItem (layout->itemAt(layout->indexOf((WLayoutItem*)(layout->findWidgetItem (other)))));
-#ifdef PSPA_DEBUG
-        if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
-            GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
-            console->addConsoleMessage(" remove drop zone ");
-        }
-#endif
-        }
-    
-    
-        // FIXME ne pas passer par un label mais par un abstrastElement
-        //  pspa_->getDataManager()->getCollection()->eraseElement(label);
-    //  pspa_->updateSelections();
-}
 
 

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

@@ -82 +82 @@
     return image_;
 }
+
+
+WString GWt_fit::print(){
+    return WString(abstractElement_->print());
+}

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

@@ -65 +65 @@
     {
         abstractElement* ptr = pspa_->getDataManager()->getCollection()->getElementPointerFromIndex(k);
-                GWt_abstractElement* gw = GWt_abstractElement::ajoute(ptr);
-         if(gw == NULL) {
-/*
- GWt_dialog warningDialog("PSPA : restore configuration", " Element type "+ptr->getNomdElement().getElementName()+" not reconized", GWt_dialog::Error,true,true);
-             warningDialog.exec();
-*/
-         }
-         gw->setLabelWidget();
-         
+        
         nObjets_[ptr->getNomdElement().getElementType()].incr();
         
         ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaisceau(ptr),1);
         
-        
-        /*      if (k < ((unsigned)nbElem-1)) {
-         ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaiseau());
-         } else {
-         ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaiseau());
-         }
-         */
     }
     manageLineFaisceauLayout();
@@ -95 +80 @@
     
     cout << " Entree addElement element " << nomdElements::getLabelFromType(eType) << endl;
+    
+    int nElements= nomdElements ::getNumberOfElements();
+    nObjets_= new Compteur[nElements];
     
     // 2 cases :
@@ -137 +125 @@
         //  ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaiseau(ptr),0);
         if (index != -1) {
+            nObjets_[ptr->getNomdElement().getElementType()].incr();
             ligneFaisceauLayout_->insertWidget(index,new GWt_elementLigneFaisceau(ptr),1);
         }

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

@@ -212 +212 @@
     cout << "createDragImage" << dragImage<<endl;
     result->setDraggable(mimeType,dragImage,true);
-    
 }
 

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

@@ -76 +76 @@
     return image_;
 }
+
+
+WString GWt_rfgun::print(){
+    return WString(abstractElement_->print());
+}

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

@@ -64 +64 @@
     return image_;
 }
+
+
+WString GWt_soleno::print(){
+    return WString(abstractElement_->print());
+}