add  shapeType=circle,shapeType=rectangle
add sample
add sample
fix bug