diff --git a/include/openmc/plot.h b/include/openmc/plot.h index 2898df3636..aef7e613bb 100644 --- a/include/openmc/plot.h +++ b/include/openmc/plot.h @@ -80,18 +80,11 @@ enum class PlotColorBy { class CPlot { public: - int id_; //!< Plot ID - PlotType type_; //!< Plot type (Slice/Voxel) - PlotColorBy color_by_; //!< Plot coloring (cell/material) Position origin_; //!< Plot origin in geometry Position width_; //!< Plot width in geometry PlotBasis basis_; //!< Plot basis (XY/XZ/YZ) std::array pixels_; //!< Plot size in pixels - int meshlines_width_; //!< Width of lines added to the plot int level_; //!< Plot universe level - int index_meshlines_mesh_; //!< Index of the mesh to draw on the plot - RGBColor meshlines_color_; //!< Color of meshlines on the plot - RGBColor not_found_; //!< Plot background color }; @@ -119,6 +112,13 @@ private: // Members public: + int id_; //!< Plot ID + PlotType type_; //!< Plot type (Slice/Voxel) + PlotColorBy color_by_; //!< Plot coloring (cell/material) + int meshlines_width_; //!< Width of lines added to the plot + int index_meshlines_mesh_; //!< Index of the mesh to draw on the plot + RGBColor meshlines_color_; //!< Color of meshlines on the plot + RGBColor not_found_; //!< Plot background color std::vector colors_; //!< Plot colors std::string path_plot_; //!< Plot output filename }; diff --git a/openmc/capi/plot.py b/openmc/capi/plot.py index e1d67d7046..ce527130dc 100644 --- a/openmc/capi/plot.py +++ b/openmc/capi/plot.py @@ -22,18 +22,11 @@ _RGBColor._fields_ = [('red', c_ushort), class _Plot(Structure): pass -_Plot._fields_ = [('id_', c_int), - ('type_', c_int), - ('color_by_', c_int), - ('origin_', _Position), +_Plot._fields_ = [('origin_', _Position), ('width_', _Position), ('basis_', c_int), ('pixels_', c_int*3), - ('meshlines_width_', c_int), - ('level_', c_int), - ('index_meshlines_mesh_', c_int), - ('meshlines_color_', _RGBColor), - ('not_found_', _RGBColor)] + ('level_', c_int)] _dll.openmc_id_map.argtypes= [POINTER(_Plot),]