archive-gh-me/MeteoInfo
1
0
Fork 0
mirror of https://github.com/meteoinfo/MeteoInfo.git synced 2025-12-08 20:36:05 +00:00
Code Issues Projects Releases Wiki Activity

bugfix for createColor function

Browse Source
This commit is contained in:
wyq 2023-11-10 22:22:45 +08:00
parent 3767feb785
commit 5627ec2a36
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/GraphicFactory.java
View File

@ -685,6 +685,7 @@ public class GraphicFactory {
} }
m = mIter.getDoubleNext(); m = mIter.getDoubleNext();
cb = ls.findLegendBreak(m); cb = ls.findLegendBreak(m);
System.out.println(cb.getColor().getAlpha());
if (Double.isNaN(y) || Double.isNaN(x)) { if (Double.isNaN(y) || Double.isNaN(x)) {
if (points.isEmpty()) { if (points.isEmpty()) {
continue; continue;

9
meteoinfo-common/src/main/java/org/meteoinfo/common/colors/ColorUtil.java
View File

@ -483,19 +483,22 @@ public class ColorUtil {
* @return Color * @return Color
*/ */
public static Color createColor(Color sColor, Color eColor, float p) { public static Color createColor(Color sColor, Color eColor, float p) {
int sR, sG, sB, eR, eG, eB, r, g, b; int sR, sG, sB, sA, eR, eG, eB, eA, r, g, b, a;
sR = sColor.getRed(); sR = sColor.getRed();
sG = sColor.getGreen(); sG = sColor.getGreen();
sB = sColor.getBlue(); sB = sColor.getBlue();
sA = sColor.getAlpha();
eR = eColor.getRed(); eR = eColor.getRed();
eG = eColor.getGreen(); eG = eColor.getGreen();
eB = eColor.getBlue(); eB = eColor.getBlue();
eA = eColor.getAlpha();
r = (int) (sR + (eR - sR) * p); r = (int) (sR + (eR - sR) * p);
g = (int) (sG + (eG - sG) * p); g = (int) (sG + (eG - sG) * p);
b = (int) (sB + (eB - sB) * p); b = (int) (sB + (eB - sB) * p);
a = (int) (sA + (eA - sA) * p);
return new Color(r, g, b); return new Color(r, g, b, a);
} }
/** /**

18
meteoinfo-lab/milconfig.xml
View File

@ -1,32 +1,30 @@
<?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\common_math\interpolate"> <Path OpenPath="D:\Working\MIScript\Jython\mis\traj">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart\axis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\radar"/>
<RecentFolder Folder="D:\Temp\test\test"/> <RecentFolder Folder="D:\Temp\test\test"/>
<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\jogl\volume"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\volume"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\scatter"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\scatter"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\scatter"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\scatter"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\map"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\map"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\map\topology"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\map\topology"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math"/>
<RecentFolder Folder="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"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\traj"/>
</Path> </Path>
<File> <File>
<OpenedFiles> <OpenedFiles>
<OpenedFile File="D:\Working\MIScript\Jython\mis\io\radar\radar_cma_base_grid_3d.py"/> <OpenedFile File="D:\Working\MIScript\Jython\mis\io\radar\radar_cma_base_grid_3d.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\common_math\interpolate\interp2d_4.py"/> <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot\plot3_multi_color_alpha.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\common_math\interpolate\interp2d_nearest_scatter.py"/>
</OpenedFiles> </OpenedFiles>
<RecentFiles> <RecentFiles>
<RecentFile File="D:\Working\MIScript\Jython\mis\io\radar\radar_cma_base_grid_3d.py"/> <RecentFile File="D:\Working\MIScript\Jython\mis\io\radar\radar_cma_base_grid_3d.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\common_math\interpolate\interp2d_4.py"/> <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot\plot3_multi_color_alpha.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\common_math\interpolate\interp2d_nearest_scatter.py"/>
</RecentFiles> </RecentFiles>
</File> </File>
<Font> <Font>
@ -34,5 +32,5 @@
</Font> </Font>
<LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/> <LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/>
<Figure DoubleBuffering="true"/> <Figure DoubleBuffering="true"/>
<Startup MainFormLocation="-7,0" MainFormSize="1373,812"/> <Startup MainFormLocation="-7,-7" MainFormSize="1293,685"/>
</MeteoInfo> </MeteoInfo>

BIN
meteoinfo-lab/pylib/mipylib/plotlib/plotutil$py.class
View File

Binary file not shown.

3
meteoinfo-lab/pylib/mipylib/plotlib/plotutil.py
View File

@ -11,7 +11,8 @@ import datetime
from org.meteoinfo.geometry.legend import LineStyles, HatchStyle, ColorBreak, PointBreak, PolylineBreak, \ from org.meteoinfo.geometry.legend import LineStyles, HatchStyle, ColorBreak, PointBreak, PolylineBreak, \
PolygonBreak, ArrowBreak, ArrowLineBreak, ArrowPolygonBreak, StreamlineBreak, \ PolygonBreak, ArrowBreak, ArrowLineBreak, ArrowPolygonBreak, StreamlineBreak, \
PointStyle, MarkerType, LegendScheme PointStyle, MarkerType, LegendScheme
from org.meteoinfo.geo.legend import LegendManage #from org.meteoinfo.geo.legend import LegendManage
from org.meteoinfo.geometry.legend import LegendManage
from org.meteoinfo.common.colors import ColorUtil, ColorMap from org.meteoinfo.common.colors import ColorUtil, ColorMap
from org.meteoinfo.geometry.shape import ShapeTypes from org.meteoinfo.geometry.shape import ShapeTypes
from org.meteoinfo.chart import ChartText from org.meteoinfo.chart import ChartText