update getcolor function

This commit is contained in:
wyq 2022-09-12 23:01:15 +08:00
parent 00b9c0db94
commit 94aaceb4da
4 changed files with 14 additions and 18 deletions

4
.idea/encodings.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
<file url="file://$PROJECT_DIR$" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/meteoinfo-chart/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/meteoinfo-chart/src/main/resources" charset="UTF-8" />
@ -34,7 +34,5 @@
<file url="file://$PROJECT_DIR$/meteoinfo-table/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/meteoinfo-ui/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/meteoinfo-ui/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>

View File

@ -1,34 +1,32 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\io\awx">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart\subplot"/>
<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"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\pie"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart\axis"/>
<Path OpenPath="D:\Working\MIScript\Jython\mis\others">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\savefig"/>
<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"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\awx"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\linalg"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\polar"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\wind"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\dataframe"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\ascii"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\others"/>
</Path>
<File>
<OpenedFiles>
<OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\mainGUI.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\subplot_3d_cylinder_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\io\awx\awx_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\io\awx\awx_fy4a_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\others\moon_cake.py"/>
</OpenedFiles>
<RecentFiles>
<RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\mainGUI.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\subplot_3d_cylinder_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\io\awx\awx_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\io\awx\awx_fy4a_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\others\moon_cake.py"/>
</RecentFiles>
</File>
<Font>

View File

@ -120,7 +120,7 @@ def getcolor(style, alpha=None):
c = None
print('Not a valid color: {}'.format(style))
return c
elif isinstance(style, (tuple, list)):
elif isinstance(style, (NDArray, tuple, list)):
if len(style) == 3:
c = Color(style[0], style[1], style[2])
else: