Changeset 375 in PSPA for Interface_Web/trunk
- Timestamp:
- Mar 7, 2013, 1:15:29 AM (12 years ago)
- Location:
- Interface_Web/trunk/pspaWT
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/Doxyfile
r239 r375 123 123 # operators of the base classes will not be shown. 124 124 125 INLINE_INHERITED_MEMB = NO125 INLINE_INHERITED_MEMB = YES 126 126 127 127 # If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -
Interface_Web/trunk/pspaWT/History
r372 r375 7 7 8 8 6 Mars : Laurent Garnier 9 - pspa.css : Ajout de style pour les futurs graphiques 9 - pspa.css : 10 o Ajout de style pour les futurs graphiques 11 o Ajout de .softwareElementLigneFaisceauName 10 12 - GWt_pspaApplication : Ajout des paramètres width et height à la méthode chartPlot2vec() 11 13 afin de pouvoir la changer facilement. AJout également d'un paramètre "makeIcon" pour faire … … 14 16 GWt_soleno, GWt_fit, GWt_rfgun 15 17 GWt_cell : bug fix #18 18 - abstractSoftware, softwareTransport, softwareParmela, softwareGenerator, softwareTest : 19 Ajout d'une méthode getName() 20 - GWt_elementLigneFaisceau.cc,GWt_ligneFaisceau.cc : Ajout du nom du soft en bas à droite 21 - PspaApplication : 22 o Affichage du nom du cas test dans le titre de la fenetre 23 o Suppression de l'erreur lors du clic sur cancel dans le selecteur de fichiers 16 24 17 25 5 Mars : Laurent Garnier -
Interface_Web/trunk/pspaWT/htdocs/pspa.css
r370 r375 165 165 transition: all 0.05s ease-in-out 0s; 166 166 } 167 168 .softwareElementLigneFaisceauName { 169 text-align: right; 170 font-family: futura,arial,sans-serif; 171 font-weight: bold; 172 font-size:11px; 173 color: #000000; 174 } 175 167 176 *|*:-moz-any-link:not(svg|a) { 168 177 text-decoration: underline; -
Interface_Web/trunk/pspaWT/sources/controler/include/abstractSoftware.h
r347 r375 42 42 virtual string getColor() = 0; 43 43 44 /** Name of this software 45 */ 46 virtual string getName() = 0; 47 44 48 }; 45 49 #endif -
Interface_Web/trunk/pspaWT/sources/controler/include/softwareGenerator.h
r359 r375 35 35 return "#a3c0ed"; 36 36 } 37 38 inline string getName() { 39 return "generator"; 40 } 37 41 }; 38 42 -
Interface_Web/trunk/pspaWT/sources/controler/include/softwareParmela.h
r359 r375 37 37 } 38 38 39 inline string getName() { 40 return "parmela"; 41 } 39 42 40 43 }; -
Interface_Web/trunk/pspaWT/sources/controler/include/softwareTest.h
r359 r375 34 34 return "#ecc38e"; 35 35 } 36 37 inline string getName() { 38 return "test"; 39 } 40 36 41 }; 37 42 #endif -
Interface_Web/trunk/pspaWT/sources/controler/include/softwareTransport.h
r359 r375 26 26 return "#c0ea8e"; 27 27 } 28 29 inline string getName() { 30 return "transport"; 31 } 32 28 33 }; 29 34 #endif -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_elementLigneFaisceau.h
r365 r375 37 37 ~GWt_elementLigneFaisceau(); 38 38 void addElement(GWt_abstractElement* elem); 39 void setBGColor(const WColor);40 39 41 40 inline WText* getElementName() { … … 48 47 49 48 void setElementLabel(std::string label); 49 void update(); 50 50 51 51 inline GWt_dropZoneLigneFaisceau* getDropZoneLeft() { … … 60 60 return GWt_abstractElement_; 61 61 } 62 inline void setSoftwareName(std::string name) { 63 softwareName_ =new WText(name); 64 } 62 65 63 66 private: … … 68 71 void mouseWentOut(); 69 72 void mouseWentOver(); 70 73 void setBGColor(const WColor); 71 74 GWt_dialog* messageDropZone_; 72 75 WText* firstTimeInsertMessage_; … … 80 83 WText* actionParameters_; 81 84 WText* actionTrash_; 85 WText* softwareName_; 82 86 }; 83 87 #endif -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_pspaApplication.h
r370 r375 56 56 57 57 WContainerWidget* toto_; 58 58 WString applicationDefaultTitle_; 59 59 60 GWt_softwarePanel* executeWidget_; 60 61 WFileUpload* uploadFileSelectorWidget_; -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementLigneFaisceau.cc
r369 r375 179 179 vLayoutElementContainer->addWidget(actions); 180 180 181 // add software name 182 softwareName_ = new WText(""); 183 softwareName_->setStyleClass("softwareElementLigneFaisceauName"); 184 vLayoutElementContainer->addWidget(softwareName_); 185 181 186 gridLayout->addWidget (elementContainer_,0,1); 182 187 183 188 gridLayout->setColumnStretch (0,1); 184 189 gridLayout->setColumnStretch (2,1); … … 199 204 { 200 205 } 206 207 void GWt_elementLigneFaisceau::update() { 208 if (getGWt_AbstractElement()->getAbstractElement()) { 209 if (getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()) { 210 setBGColor(WColor(getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()->getColor())); 211 softwareName_->setText(getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()->getName()); 212 } 213 } 214 } 215 201 216 202 217 void GWt_elementLigneFaisceau::setBGColor(const WColor c) { -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_ligneFaisceau.cc
r361 r375 266 266 if (GWt_elementLigneFaisceau* elem = dynamic_cast <GWt_elementLigneFaisceau*> (ligneFaisceauLayout_->itemAt(a)->widget ())) { 267 267 if (index == i) { 268 if (elem->getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()) { 269 elem->setBGColor(WColor(elem->getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()->getColor())); 270 } 268 elem->update(); 271 269 } 272 270 index ++; -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc
r371 r375 46 46 47 47 PspaApplication::PspaApplication(const WEnvironment& env) : WApplication(env) 48 ,applicationDefaultTitle_("portail PSPA") 48 49 { 49 50 … … 51 52 nameOfCase_ = "pspa"; // default 52 53 53 setTitle( "portail PSPA"); // application title54 setTitle(applicationDefaultTitle_); // application title 54 55 if (!wApp->environment().javaScript()) { 55 56 new WText("<i>This examples requires that javascript support is enabled.</i>",root()); … … 374 375 string fileName = fs->exec(); 375 376 nameOfCase_ = fileName; 376 377 if (fileName == "") { 378 return; 379 } 380 377 381 removePathFromConfigName(nameOfCase_ ); 378 382 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); 389 393 restoreWarning.exec(); 394 } else { 395 // Change the window title 396 unsigned long found = fileName.find_last_of("/"); 397 setTitle(applicationDefaultTitle_+" : "+fileName.substr(found+1)); 390 398 } 391 399
Note: See TracChangeset
for help on using the changeset viewer.