bugfix for GLPlot reshape function

This commit is contained in:
wyq 2022-08-30 23:10:12 +08:00
parent 05610158f2
commit 9891d65699
6 changed files with 29 additions and 25 deletions

View File

@ -4263,8 +4263,8 @@ public class GLPlot extends Plot {
} }
final float h = (float) width / (float) height; final float h = (float) width / (float) height;
//gl.glViewport(0, 0, width, height); gl.glViewport((int) positionArea.getX(), (int) (height - this.height - positionArea.getY()),
gl.glViewport((int) positionArea.getX(), (int) positionArea.getY(), this.width, this.height); this.width, this.height);
gl.glMatrixMode(GL2.GL_PROJECTION); gl.glMatrixMode(GL2.GL_PROJECTION);
gl.glLoadIdentity(); gl.glLoadIdentity();

View File

@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile"> <MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf"> <Path OpenPath="D:\Working\MIScript\Jython\mis\common_math\interpolate">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\interpolate"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\bar"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\contour"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\imshow"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\isosurface"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\particles"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\volume"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\contour"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\geoshow"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\geoshow"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\3d_earth"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\3d_earth"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\gui"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\stats"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart\subplot"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\bar"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\interpolate"/>
</Path> </Path>
<File> <File>
<OpenedFiles> <OpenedFiles>
<OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\mainGUI.py"/> <OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\mainGUI.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\isosurface\fimplicit3_gyroid.py"/> <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\subplot_3d_cylinder_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\subplot_3d_cylinder.py"/> <OpenedFile File="D:\Working\MIScript\Jython\mis\chart\subplot\subplot_4plots.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf\surf_flower_2.py"/> <OpenedFile File="D:\Working\MIScript\Jython\mis\common_math\interpolate\griddata_kriging_lcc.py"/>
</OpenedFiles> </OpenedFiles>
<RecentFiles> <RecentFiles>
<RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\mainGUI.py"/> <RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\mainGUI.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\isosurface\fimplicit3_gyroid.py"/> <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\subplot_3d_cylinder_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\subplot_3d_cylinder.py"/> <RecentFile File="D:\Working\MIScript\Jython\mis\chart\subplot\subplot_4plots.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf\surf_flower_2.py"/> <RecentFile File="D:\Working\MIScript\Jython\mis\common_math\interpolate\griddata_kriging_lcc.py"/>
</RecentFiles> </RecentFiles>
</File> </File>
<Font> <Font>

View File

@ -29,8 +29,7 @@ import mipylib.migl as migl
__all__ = [ __all__ = [
'addfile','addfiles','addfile_arl','addfile_ascii_grid','addfile_awx','addfile_geotiff', 'addfile','addfiles','addfile_arl','addfile_ascii_grid','addfile_awx','addfile_geotiff',
'addfile_grads','addfile_hyconc','addfile_hytraj','addfile_hypart','addfile_lonlat', 'addfile_grads','addfile_hyconc','addfile_hytraj','addfile_hypart','addfile_lonlat',
'addfile_micaps', 'addfile_micaps','addfile_mm5','addfile_nc','addfile_grib','addfile_surfer','add_bufr_lookup',
'addfile_mm5','addfile_nc','addfile_grib','addfile_surfer','add_bufr_lookup',
'addtimedim','joinncfile','asciiread','asciiwrite','bincreate','binread','binwrite', 'addtimedim','joinncfile','asciiread','asciiwrite','bincreate','binread','binwrite',
'numasciicol','numasciirow','readtable','convert2nc','grads2nc','ncwrite' 'numasciicol','numasciirow','readtable','convert2nc','grads2nc','ncwrite'
] ]

View File

@ -987,10 +987,15 @@ class Axes3DGL(Axes3D):
:returns: Legend :returns: Legend
""" """
if len(args) <= 2: if len(args) <= 2:
x = args[0].dimvalue(1)
y = args[0].dimvalue(0)
x, y = np.meshgrid(x, y)
z = args[0] z = args[0]
if isinstance(z, DimArray):
x = args[0].dimvalue(1)
y = args[0].dimvalue(0)
else:
ny, nx = z.shape
x = np.arange(nx)
y = np.arange(ny)
x, y = np.meshgrid(x, y)
args = args[1:] args = args[1:]
else: else:
x = args[0] x = args[0]