Changeset 375 in PSPA

Timestamp:

Mar 7, 2013, 1:15:29 AM (11 years ago)

Author:

garnier

Message:

Affichage du nom du cas test dans le titre de la fenetre + see History

Location:

Interface_Web/trunk/pspaWT

Files:

• Doxyfile (modified) (1 diff)
• History (modified) (2 diffs)
• htdocs/pspa.css (modified) (1 diff)
• sources/controler/include/abstractSoftware.h (modified) (1 diff)
• sources/controler/include/softwareGenerator.h (modified) (1 diff)
• sources/controler/include/softwareParmela.h (modified) (1 diff)
• sources/controler/include/softwareTest.h (modified) (1 diff)
• sources/controler/include/softwareTransport.h (modified) (1 diff)
• sources/userInterface/include/GWt_elementLigneFaisceau.h (modified) (5 diffs)
• sources/userInterface/include/GWt_pspaApplication.h (modified) (1 diff)
• sources/userInterface/src/GWt_elementLigneFaisceau.cc (modified) (2 diffs)
• sources/userInterface/src/GWt_ligneFaisceau.cc (modified) (1 diff)
• sources/userInterface/src/GWt_pspaApplication.cc (modified) (4 diffs)

Interface_Web/trunk/pspaWT/Doxyfile

@@ -123 +123 @@
 # operators of the base classes will not be shown.
 
-INLINE_INHERITED_MEMB  = NO
+INLINE_INHERITED_MEMB  = YES
 
 # If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 

Interface_Web/trunk/pspaWT/History

@@ -7 +7 @@
 
 6 Mars : Laurent Garnier
-- pspa.css : Ajout de style pour les futurs graphiques
+- pspa.css :
+ o Ajout de style pour les futurs graphiques
+ o Ajout de .softwareElementLigneFaisceauName
 - GWt_pspaApplication : Ajout des paramètres width et height à la méthode chartPlot2vec() 
   afin de pouvoir la changer facilement. AJout également d'un paramètre "makeIcon" pour faire
@@ -14 +16 @@
   GWt_soleno, GWt_fit, GWt_rfgun
   GWt_cell : bug fix #18
+- abstractSoftware, softwareTransport, softwareParmela, softwareGenerator, softwareTest :
+  Ajout d'une méthode getName()
+- GWt_elementLigneFaisceau.cc,GWt_ligneFaisceau.cc : Ajout du nom du soft en bas à droite 
+- PspaApplication :
+ o Affichage du nom du cas test dans le titre de la fenetre
+ o Suppression de l'erreur lors du clic sur cancel dans le selecteur de fichiers
 
 5 Mars : Laurent Garnier

Interface_Web/trunk/pspaWT/htdocs/pspa.css

@@ -165 +165 @@
     transition: all 0.05s ease-in-out 0s;
 }
+
+.softwareElementLigneFaisceauName {
+    text-align: right;
+    font-family: futura,arial,sans-serif;
+    font-weight: bold;
+        font-size:11px;
+    color: #000000;
+}
+
 *|*:-moz-any-link:not(svg|a) {
     text-decoration: underline;

Interface_Web/trunk/pspaWT/sources/controler/include/abstractSoftware.h

@@ -42 +42 @@
     virtual string getColor() = 0;
 
+    /** Name of this software
+     */
+    virtual string getName() = 0;
+
 };
 #endif

Interface_Web/trunk/pspaWT/sources/controler/include/softwareGenerator.h

@@ -35 +35 @@
         return "#a3c0ed";
     }
+
+    inline string getName() {
+        return "generator";
+    }
 };
 

Interface_Web/trunk/pspaWT/sources/controler/include/softwareParmela.h

@@ -37 +37 @@
     }
 
+    inline string getName() {
+        return "parmela";
+    }
 
 };

Interface_Web/trunk/pspaWT/sources/controler/include/softwareTest.h

@@ -34 +34 @@
       return "#ecc38e";
   }
+    
+  inline string getName() {
+        return "test";
+    }
+
 };
 #endif

Interface_Web/trunk/pspaWT/sources/controler/include/softwareTransport.h

@@ -26 +26 @@
         return "#c0ea8e";
     }
+    
+    inline string getName() {
+        return "transport";
+    }
+
 };
 #endif

Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_elementLigneFaisceau.h

@@ -37 +37 @@
     ~GWt_elementLigneFaisceau();
     void addElement(GWt_abstractElement* elem);
-    void setBGColor(const WColor);
     
     inline WText* getElementName() {
@@ -48 +47 @@
     
     void setElementLabel(std::string label);
+    void update();
     
     inline GWt_dropZoneLigneFaisceau* getDropZoneLeft() {
@@ -60 +60 @@
         return GWt_abstractElement_;
     }
+    inline void setSoftwareName(std::string name) {
+        softwareName_ =new WText(name);
+    }
 
 private:
@@ -68 +71 @@
     void mouseWentOut();
     void mouseWentOver();
-
+    void setBGColor(const WColor);
     GWt_dialog* messageDropZone_;
     WText* firstTimeInsertMessage_;
@@ -80 +83 @@
     WText* actionParameters_;
     WText* actionTrash_;
+    WText* softwareName_;
 };
 #endif

Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_pspaApplication.h

@@ -56 +56 @@
 
   WContainerWidget* toto_;
-
+  WString applicationDefaultTitle_;
+    
   GWt_softwarePanel* executeWidget_;
   WFileUpload* uploadFileSelectorWidget_;

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

@@ -179 +179 @@
     vLayoutElementContainer->addWidget(actions);
     
+    // add software name
+    softwareName_ = new WText("");
+    softwareName_->setStyleClass("softwareElementLigneFaisceauName");
+    vLayoutElementContainer->addWidget(softwareName_);
+    
     gridLayout->addWidget       (elementContainer_,0,1);
-    
+
     gridLayout->setColumnStretch (0,1);
     gridLayout->setColumnStretch (2,1);
@@ -199 +204 @@
 {
 }
+
+void GWt_elementLigneFaisceau::update() {
+    if (getGWt_AbstractElement()->getAbstractElement()) {
+        if (getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()) {
+            setBGColor(WColor(getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()->getColor()));
+            softwareName_->setText(getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()->getName());
+        }
+    }
+}
+
 
 void GWt_elementLigneFaisceau::setBGColor(const WColor c) {

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

@@ -266 +266 @@
         if (GWt_elementLigneFaisceau* elem = dynamic_cast <GWt_elementLigneFaisceau*> (ligneFaisceauLayout_->itemAt(a)->widget ())) {
             if (index == i) {
-                if (elem->getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()) {
-                    elem->setBGColor(WColor(elem->getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()->getColor()));
-                }
+                elem->update();
             }
             index ++;

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

@@ -46 +46 @@
 
 PspaApplication::PspaApplication(const WEnvironment& env) : WApplication(env)
+,applicationDefaultTitle_("portail PSPA")
 {
     
@@ -51 +52 @@
     nameOfCase_ = "pspa"; // default
     
-    setTitle("portail PSPA");                               // application title
+    setTitle(applicationDefaultTitle_);                               // application title
     if (!wApp->environment().javaScript()) {
         new WText("<i>This examples requires that javascript support is enabled.</i>",root());
@@ -374 +375 @@
     string fileName = fs->exec();
      nameOfCase_ = fileName;
-   
+    if (fileName == "") {
+        return;
+    }
+    
     removePathFromConfigName(nameOfCase_ );
     cout << " nom sans path " << nameOfCase_ << endl;
@@ -388 +392 @@
         GWt_dialog restoreWarning(" element restoring", "failure in restoring elements from file : " + fileName , GWt_dialog::Error, false,true);
         restoreWarning.exec();
+    } else {
+        // Change the window title
+        unsigned long found = fileName.find_last_of("/");
+        setTitle(applicationDefaultTitle_+" : "+fileName.substr(found+1));
     }