Images for Oridion Capnostream20, a generic computer image for a
simulator, and an image of the Hospira Symbiq.
trying to cut down dependencies
This commit is a catch-up.  Biggest piece is a refactoring of
WaveformPanel and GLWaveformPanel.