Changeset 1569 for trunk/src/objects
- Timestamp:
- Sep 16, 2009, 2:22:36 PM (15 years ago)
- Location:
- trunk/src/objects
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/objects/RpCurve.cc
r1568 r1569 29 29 { 30 30 this->name(""); 31 this->path(" ");31 this->path("run"); 32 32 this->label(""); 33 33 this->desc(""); … … 40 40 { 41 41 this->name(name); 42 this->path(" ");42 this->path("run"); 43 43 this->label(""); 44 44 this->desc(""); … … 52 52 { 53 53 this->name(name); 54 this->path(" ");54 this->path("run"); 55 55 this->label(label); 56 56 this->desc(desc); … … 312 312 path(pathObj.parent()); 313 313 name(Rp_ParserXmlNodeId(p,node)); 314 label(Rp_ParserXmlGet(p,"about.label")); 315 desc(Rp_ParserXmlGet(p,"about.description")); 316 317 Array1D *xaxis = axis("xaxis","","","","",NULL,0); 318 xaxis->label(Rp_ParserXmlGet(p,"xaxis.label")); 319 xaxis->desc(Rp_ParserXmlGet(p,"xaxis.description")); 320 xaxis->units(Rp_ParserXmlGet(p,"xaxis.units")); 321 xaxis->scale(Rp_ParserXmlGet(p,"xaxis.scale")); 322 323 Array1D *yaxis = axis("yaxis","","","","",NULL,0); 324 yaxis->label(Rp_ParserXmlGet(p,"yaxis.label")); 325 yaxis->desc(Rp_ParserXmlGet(p,"yaxis.description")); 326 yaxis->units(Rp_ParserXmlGet(p,"yaxis.units")); 327 yaxis->scale(Rp_ParserXmlGet(p,"yaxis.scale")); 328 329 const char *values = Rp_ParserXmlGet(p,"component.xy"); 314 315 pathObj.clear(); 316 pathObj.add("about"); 317 pathObj.add("label"); 318 label(Rp_ParserXmlGet(p,pathObj.path())); 319 320 pathObj.del(); 321 pathObj.add("description"); 322 desc(Rp_ParserXmlGet(p,pathObj.path())); 323 324 325 Array1D *xaxis = axis(Curve::x,"","","","",NULL,0); 326 pathObj.del(); 327 pathObj.del(); 328 pathObj.add(Curve::x); 329 pathObj.add("label"); 330 xaxis->label(Rp_ParserXmlGet(p,pathObj.path())); 331 pathObj.del(); 332 pathObj.add("description"); 333 xaxis->desc(Rp_ParserXmlGet(p,pathObj.path())); 334 pathObj.del(); 335 pathObj.add("units"); 336 xaxis->units(Rp_ParserXmlGet(p,pathObj.path())); 337 pathObj.del(); 338 pathObj.add("scale"); 339 xaxis->scale(Rp_ParserXmlGet(p,pathObj.path())); 340 341 Array1D *yaxis = axis(Curve::y,"","","","",NULL,0); 342 pathObj.del(); 343 pathObj.del(); 344 pathObj.add(Curve::y); 345 pathObj.add("label"); 346 yaxis->label(Rp_ParserXmlGet(p,pathObj.path())); 347 pathObj.del(); 348 pathObj.add("description"); 349 yaxis->desc(Rp_ParserXmlGet(p,pathObj.path())); 350 pathObj.del(); 351 pathObj.add("units"); 352 yaxis->units(Rp_ParserXmlGet(p,pathObj.path())); 353 pathObj.del(); 354 pathObj.add("scale"); 355 yaxis->scale(Rp_ParserXmlGet(p,pathObj.path())); 356 357 pathObj.del(); 358 pathObj.del(); 359 pathObj.add("component"); 360 pathObj.add("xy"); 361 const char *values = Rp_ParserXmlGet(p,pathObj.path()); 330 362 331 363 double x,y; … … 460 492 tmpBuf.appendf("\n"); 461 493 } 462 p.add("component.xy"); 494 p.add("component"); 495 p.add("xy"); 463 496 Rp_ParserXmlPutF(parser,p.path(),"%s",tmpBuf.bytes()); 464 497 -
trunk/src/objects/RpNumber.cc
r1568 r1569 28 28 // FIXME: empty names should be autoname'd 29 29 this->name(""); 30 this->path(" ");30 this->path("run"); 31 31 this->label(""); 32 32 this->desc(""); … … 48 48 49 49 this->name(name); 50 this->path(" ");50 this->path("run"); 51 51 this->label(""); 52 52 this->desc(""); … … 74 74 75 75 this->name(name); 76 this->path(" ");76 this->path("run"); 77 77 this->label(label); 78 78 this->desc(desc); … … 301 301 302 302 /**********************************************************************/ 303 // METHOD: configure( Rp_ParserXml *p)303 // METHOD: configure(ClientData c) 304 304 /// construct a number object from the provided tree 305 305 /** … … 308 308 309 309 void 310 Number::configure(size_t as, void *p)310 Number::configure(size_t as, ClientData c) 311 311 { 312 312 if (as == RPCONFIG_XML) { 313 __configureFromXml( (const char *)p);313 __configureFromXml(c); 314 314 } else if (as == RPCONFIG_TREE) { 315 __configureFromTree( (Rp_ParserXml *)p);315 __configureFromTree(c); 316 316 } 317 317 } … … 325 325 326 326 void 327 Number::__configureFromXml(const char *xmltext) 328 { 327 Number::__configureFromXml(ClientData c) 328 { 329 const char *xmltext = (const char *)c; 329 330 if (xmltext == NULL) { 330 331 // FIXME: setup error … … 340 341 341 342 void 342 Number::__configureFromTree(Rp_ParserXml *p) 343 { 343 Number::__configureFromTree(ClientData c) 344 { 345 Rp_ParserXml *p = (Rp_ParserXml *)c; 344 346 if (p == NULL) { 345 347 // FIXME: setup error … … 353 355 path(pathObj.parent()); 354 356 name(Rp_ParserXmlNodeId(p,node)); 355 label(Rp_ParserXmlGet(p,"about.label")); 356 desc(Rp_ParserXmlGet(p,"about.description")); 357 358 pathObj.clear(); 359 pathObj.add("about"); 360 pathObj.add("label"); 361 label(Rp_ParserXmlGet(p,pathObj.path())); 362 pathObj.type("description"); 363 desc(Rp_ParserXmlGet(p,pathObj.path())); 357 364 units(Rp_ParserXmlGet(p,"units")); 358 365 minFromStr(Rp_ParserXmlGet(p,"min")); … … 418 425 } 419 426 427 ClientDataXml *d = (ClientDataXml *)c; 420 428 Rp_ParserXml *parser = Rp_ParserXmlCreate(); 421 429 __dumpToTree(parser); 422 const char *xmltext = Rp_ParserXmlXml(parser);423 _tmpBuf.appendf("%s",xmltext);430 _tmpBuf.appendf("%s",Rp_ParserXmlXml(parser)); 431 d->retStr = _tmpBuf.bytes(); 424 432 Rp_ParserXmlDestroy(&parser); 425 433 } -
trunk/src/objects/RpNumber.h
r1566 r1569 58 58 59 59 60 void configure(size_t as, ClientData p); 61 void dump(size_t as, ClientData p); 62 // const char* xml(size_t indent, size_t tabstop); 60 void configure(size_t as, ClientData c); 61 void dump(size_t as, ClientData c); 63 62 64 63 const int is() const; … … 85 84 }; 86 85 87 void __configureFromXml( const char *p);88 void __configureFromTree( Rp_ParserXml *p);86 void __configureFromXml(ClientData c); 87 void __configureFromTree(ClientData c); 89 88 void __dumpToXml(ClientData c); 90 89 void __dumpToTree(ClientData c); -
trunk/src/objects/RpObject.cc
r1566 r1569 312 312 313 313 void 314 Object::configure(size_t as, void *p)315 { 316 return; 317 } 318 319 void 320 Object::dump(size_t as, void *p)314 Object::configure(size_t as, ClientData c) 315 { 316 return; 317 } 318 319 void 320 Object::dump(size_t as, ClientData c) 321 321 { 322 322 return; -
trunk/src/objects/RpObject.h
r1566 r1569 78 78 79 79 // configure the object properties based on Rappture1.1 xml text 80 virtual void configure(size_t as, void *p);81 virtual void dump(size_t as, void *p);80 virtual void configure(size_t as, ClientData c); 81 virtual void dump(size_t as, ClientData c); 82 82 83 83 virtual const int is() const; … … 98 98 /// close out the object, freeing its memory 99 99 void __clear(); 100 101 100 }; 102 101 -
trunk/src/objects/RpPath.cc
r1566 r1569 409 409 } 410 410 411 Path& 412 Path::clear () 413 { 414 __pathFree(); 415 __pathInit(); 416 return *this; 417 } 418 411 419 size_t 412 420 Path::count () -
trunk/src/objects/RpPath.h
r1560 r1569 54 54 Path& next(); 55 55 Path& last(); 56 Path& clear(); 56 57 size_t count(); 57 58 -
trunk/src/objects/RpPlot.cc
r1568 r1569 34 34 { 35 35 // this->path(autopath()); 36 this->path(""); 36 this->name(""); 37 this->path("run"); 37 38 this->label(""); 38 39 this->desc(""); … … 91 92 } 92 93 93 // Path cpath;94 // cpath.id(name);95 // c->path(cpath.path());96 94 c->name(name); 97 95 … … 252 250 253 251 /**********************************************************************/ 254 // METHOD: xml() 255 /// Return the xml of this object 256 /** 257 * returns the xml of this object 258 */ 259 260 const char * 261 Plot::xml(size_t indent, size_t tabstop) 262 { 252 // METHOD: configure(Rp_ParserXml *c) 253 /// construct a number object from the provided tree 254 /** 255 * construct a number object from the provided tree 256 */ 257 258 void 259 Plot::configure(size_t as, ClientData c) 260 { 261 if (as == RPCONFIG_XML) { 262 __configureFromXml(c); 263 } else if (as == RPCONFIG_TREE) { 264 __configureFromTree(c); 265 } 266 } 267 268 /**********************************************************************/ 269 // METHOD: configureFromXml(const char *xmltext) 270 /// configure the object based on Rappture1.1 xmltext 271 /** 272 * Configure the object based on the provided xml 273 */ 274 275 void 276 Plot::__configureFromXml(ClientData c) 277 { 278 const char *xmltext = (const char *) c; 279 if (xmltext == NULL) { 280 // FIXME: setup error 281 return; 282 } 283 284 Rp_ParserXml *p = Rp_ParserXmlCreate(); 285 Rp_ParserXmlParse(p, xmltext); 286 configure(RPCONFIG_TREE, p); 287 288 return; 289 } 290 291 // FIXME: this is an incomplete definition of how to 292 // configure a plot object from a tree because there 293 // currently is no xml description for plot objects 294 void 295 Plot::__configureFromTree(ClientData c) 296 { 297 Rp_ParserXml *p = (Rp_ParserXml *)c; 298 if (p == NULL) { 299 // FIXME: setup error 300 return; 301 } 302 303 Rp_TreeNode node = Rp_ParserXmlElement(p,NULL); 304 305 Rappture::Path pathObj(Rp_ParserXmlNodePath(p,node)); 306 307 path(pathObj.parent()); 308 name(Rp_ParserXmlNodeId(p,node)); 309 310 return; 311 } 312 313 /**********************************************************************/ 314 // METHOD: dump(size_t as, void *p) 315 /// construct a number object from the provided tree 316 /** 317 * construct a number object from the provided tree 318 */ 319 320 void 321 Plot::dump(size_t as, ClientData c) 322 { 323 if (as == RPCONFIG_XML) { 324 __dumpToXml(c); 325 } else if (as == RPCONFIG_TREE) { 326 __dumpToTree(c); 327 } 328 } 329 330 /**********************************************************************/ 331 // METHOD: dumpToXml(ClientData c) 332 /// configure the object based on Rappture1.1 xmltext 333 /** 334 * Configure the object based on the provided xml 335 */ 336 337 void 338 Plot::__dumpToXml(ClientData c) 339 { 340 if (c == NULL) { 341 // FIXME: setup error 342 return; 343 } 344 345 ClientDataXml *d = (ClientDataXml *) c; 346 Rp_ParserXml *parser = Rp_ParserXmlCreate(); 347 __dumpToTree(parser); 348 _tmpBuf.appendf("%s",Rp_ParserXmlXml(parser)); 349 d->retStr = _tmpBuf.bytes(); 350 Rp_ParserXmlDestroy(&parser); 351 } 352 353 /**********************************************************************/ 354 // METHOD: dumpToTree(ClientData p) 355 /// dump the object to a Rappture1.1 based tree 356 /** 357 * Dump the object to a Rappture1.1 based tree 358 */ 359 360 void 361 Plot::__dumpToTree(ClientData c) 362 { 363 if (c == NULL) { 364 // FIXME: setup error 365 return; 366 } 367 368 Rp_ParserXml *parser = (Rp_ParserXml *)c; 369 370 Path p; 371 372 p.parent(path()); 373 p.last(); 263 374 264 375 Rp_ChainLink *l = NULL; 265 266 _tmpBuf.clear();267 268 Rp_ParserXml *parser = Rp_ParserXmlCreate();269 376 270 377 l = Rp_ChainFirstLink(_curveList); … … 279 386 // FIXME: check fields to see if the user specified value 280 387 // plot defined curve, use plot's labels in curve's xml 388 c->group(label()); 389 c->label(label()); 390 c->desc(desc()); 391 392 281 393 const char *xlabel = propstr("xlabel"); 282 394 const char *xdesc = propstr("xdesc"); … … 303 415 cyaxis->scale(yscale); 304 416 } 417 305 418 } 306 419 … … 308 421 l = Rp_ChainNextLink(l); 309 422 } 310 _tmpBuf.appendf("%s",Rp_ParserXmlXml(parser));311 Rp_ParserXmlDestroy(&parser);312 313 // remove trailing newline314 //_tmpBuf.remove(1);315 // append terminating null character316 //_tmpBuf.append("\0",1);317 318 return _tmpBuf.bytes();319 423 } 320 424 -
trunk/src/objects/RpPlot.h
r1560 r1569 42 42 Curve *getNthCurve(size_t n) const; 43 43 44 const char *xml(size_t indent, size_t tabstop); 44 void configure(size_t as, ClientData p); 45 void dump(size_t as, ClientData p); 46 45 47 const int is() const; 46 48 47 49 private: 48 50 49 // hash or linked list of preset values51 // hash or linked list of curves 50 52 Rp_Chain *_curveList; 51 53 … … 60 62 Rp_ChainLink *__searchCurveList(const char *name) const; 61 63 static int __curveCopyFxn(void **to, void *from); 64 65 void __configureFromXml(ClientData c); 66 void __configureFromTree(ClientData c); 67 void __dumpToXml(ClientData c); 68 void __dumpToTree(ClientData c); 62 69 }; 63 70
Note: See TracChangeset
for help on using the changeset viewer.