Fix addAnnotationFromHighlight() and drawAnnotationHighlight()

* addAnnotationFromHighlight() no longer creates a PIXEL shape, the viewer creates one for itself
* drawAnnotationHighlight() collects all annotation for the given viewer and redraws them according to the highlights