Added clipped drawing to fix DAWNSCI-429 (does not solve any fill
problem)