From 27ee5d2b5fe2842d928eaf95989da494cb19c3ce Mon Sep 17 00:00:00 2001 From: William Joye Date: Mon, 7 Aug 2017 16:40:51 -0400 Subject: ruler format spec --- tksao/frame/frmarkerxml.C | 5 ++++- tksao/frame/ruler.C | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tksao/frame/frmarkerxml.C b/tksao/frame/frmarkerxml.C index 26c9f59..cf80c33 100644 --- a/tksao/frame/frmarkerxml.C +++ b/tksao/frame/frmarkerxml.C @@ -695,9 +695,12 @@ void Base::xmlParseTR(char** cols, int* id, char** unit, char** ref, Coord::CoordSystem dsys; Coord::DistFormat ddist; coord.strToDistSystem(param2, wcsSystem_, &dsys, &ddist); + const char* def3 = ""; + if (!param3) + param3 = (char*)def3; createRulerCmd(xmlPoint(ptr, xv, yv, vsys, vsky, vformat, 0), xmlPoint(ptr, xv, yv, vsys, vsky, vformat, 1), - rsys, rsky, dsys, ddist, "", + rsys, rsky, dsys, ddist, param3, color, dash, width, font, text, props, comment, taglist, cblist); } diff --git a/tksao/frame/ruler.C b/tksao/frame/ruler.C index b82ea8f..aa50e08 100644 --- a/tksao/frame/ruler.C +++ b/tksao/frame/ruler.C @@ -556,6 +556,7 @@ void Ruler::listXML(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, XMLRowPoint(ptr,sys,sky,format,vv,2); XMLRow(XMLPARAM,(char*)(sysstr.str().c_str())); XMLRow(XMLPARAM2,(char*)(diststr.str().c_str())); + XMLRow(XMLPARAM3,(char*)distSpec); XMLRowProps(ptr,sys); XMLRowEnd(str); -- cgit v0.12