diff --git a/solventmapcreator/solvationcalculation/fgipmaker.py b/solventmapcreator/solvationcalculation/fgipmaker.py index a2404d9b344d60ed4acde8835783945608b70bb1..b93213de8d6aefd6db5874dd900731f018a67615 100644 --- a/solventmapcreator/solvationcalculation/fgipmaker.py +++ b/solventmapcreator/solvationcalculation/fgipmaker.py @@ -23,11 +23,8 @@ def create_fgip_from_map(map_filename): """ svg_figure = create_svgfigure() map_plot = get_svg_plot(map_filename) - map_plot.moveto(0.0,150.0, scale=1.1) - molecules_plot = get_molecules() - + map_plot.moveto(0.0,95.0,scale=1.25) append_svg_plots(svg_figure, map_plot) - append_svg_plots(svg_figure, molecules_plot) output_filename = create_output_filename(map_filename) save_svg_figure(svg_figure, output_filename) @@ -46,11 +43,6 @@ def append_svg_plots(svg_figure, svg_plot): """ svg_figure.append(svg_plot) -def get_molecules(): - """This gets the molecules. - """ - return get_svg_plot(FGIP_MOLECULES_FILENAME) - def get_svg_plot(svg_filename): """This gets the plot elements. """ @@ -58,7 +50,7 @@ def get_svg_plot(svg_filename): return figure.getroot() def create_svgfigure(): - """This creates SVG figure with default size. + """This creates SVG figure using the molecules as a base. """ - return svgt.SVGFigure(width="725.05334pt", height="676.02484pt") + return svgt.fromfile(FGIP_MOLECULES_FILENAME)