comparison src/graphics.cc @ 6509:84f2d0253aea

[project @ 2007-04-09 19:12:10 by jwe]
author jwe
date Mon, 09 Apr 2007 19:12:10 +0000
parents 5bec61ae1576
children 7a65c1a09ec3
comparison
equal deleted inserted replaced
6508:184ab67c3bc1 6509:84f2d0253aea
2402 xudata (Matrix ()), 2402 xudata (Matrix ()),
2403 color (), 2403 color (),
2404 linestyle ("-"), 2404 linestyle ("-"),
2405 linewidth (0.5), 2405 linewidth (0.5),
2406 marker ("none"), 2406 marker ("none"),
2407 markeredgecolor ("auto"),
2408 markerfacecolor ("none"),
2407 markersize (1), 2409 markersize (1),
2408 keylabel ("") { } 2410 keylabel ("") { }
2409 2411
2410 ~line_properties (void) { } 2412 ~line_properties (void) { }
2411 2413
2442 linestyle = val; 2444 linestyle = val;
2443 else if (name.compare ("linewidth")) 2445 else if (name.compare ("linewidth"))
2444 linewidth = val; 2446 linewidth = val;
2445 else if (name.compare ("marker")) 2447 else if (name.compare ("marker"))
2446 marker = val; 2448 marker = val;
2449 else if (name.compare ("markeredgecolor"))
2450 markeredgecolor = val;
2451 else if (name.compare ("markerfacecolor"))
2452 markerfacecolor = val;
2447 else if (name.compare ("markersize")) 2453 else if (name.compare ("markersize"))
2448 markersize = val; 2454 markersize = val;
2449 else if (name.compare ("keylabel")) 2455 else if (name.compare ("keylabel"))
2450 keylabel = val; 2456 keylabel = val;
2451 else 2457 else
2475 m.assign ("xudata", xudata); 2481 m.assign ("xudata", xudata);
2476 m.assign ("color", color); 2482 m.assign ("color", color);
2477 m.assign ("linestyle", linestyle); 2483 m.assign ("linestyle", linestyle);
2478 m.assign ("linewidth", linewidth); 2484 m.assign ("linewidth", linewidth);
2479 m.assign ("marker", marker); 2485 m.assign ("marker", marker);
2486 m.assign ("markeredgecolor", markeredgecolor);
2487 m.assign ("markerface", markerfacecolor);
2480 m.assign ("markersize", markersize); 2488 m.assign ("markersize", markersize);
2481 m.assign ("keylabel", keylabel); 2489 m.assign ("keylabel", keylabel);
2482 2490
2483 return m; 2491 return m;
2484 } 2492 }
2515 retval = linestyle; 2523 retval = linestyle;
2516 else if (name.compare ("linewidth")) 2524 else if (name.compare ("linewidth"))
2517 retval = linewidth; 2525 retval = linewidth;
2518 else if (name.compare ("marker")) 2526 else if (name.compare ("marker"))
2519 retval = marker; 2527 retval = marker;
2528 else if (name.compare ("markeredgecolor"))
2529 retval = markeredgecolor;
2530 else if (name.compare ("markerfacecolor"))
2531 retval = markerfacecolor;
2520 else if (name.compare ("markersize")) 2532 else if (name.compare ("markersize"))
2521 retval = markersize; 2533 retval = markersize;
2522 else if (name.compare ("keylabel")) 2534 else if (name.compare ("keylabel"))
2523 retval = keylabel; 2535 retval = keylabel;
2524 else 2536 else
2542 m["xudata"] = Matrix (); 2554 m["xudata"] = Matrix ();
2543 m["color"] = color_property (); 2555 m["color"] = color_property ();
2544 m["linestyle"] = "-"; 2556 m["linestyle"] = "-";
2545 m["linewidth"] = 0.5; 2557 m["linewidth"] = 0.5;
2546 m["marker"] = "none"; 2558 m["marker"] = "none";
2559 m["markeredgecolor"] = "auto";
2560 m["markerfacecolor"] = "none";
2547 m["markersize"] = 1; 2561 m["markersize"] = 1;
2548 m["keylabel"] = ""; 2562 m["keylabel"] = "";
2549 2563
2550 return m; 2564 return m;
2551 } 2565 }
2560 octave_value xudata; 2574 octave_value xudata;
2561 color_property color; 2575 color_property color;
2562 octave_value linestyle; 2576 octave_value linestyle;
2563 octave_value linewidth; 2577 octave_value linewidth;
2564 octave_value marker; 2578 octave_value marker;
2579 octave_value markeredgecolor;
2580 octave_value markerfacecolor;
2565 octave_value markersize; 2581 octave_value markersize;
2566 octave_value keylabel; 2582 octave_value keylabel;
2567 2583
2568 static std::string go_name; 2584 static std::string go_name;
2569 }; 2585 };