Moved annotation painting code into DecodeTrace, and moved Annotation in pv::data...