Scale convertion also affects x vs y

Based on a sample RTP file, the X and Y collimator must be switched when
scale convertion is active.

Also refactored the scale convertion methods for a slightly cleaner
implementation.