Implemented point, circle and rectangle in PlotFigure