WSL/SLF GitLab Repository

Commit b891a2e7 authored by Mathias Bavay's avatar Mathias Bavay
Browse files

Merge branch 'master' of models.slf.ch:inishell-ng

parents bea4a99c 9292ed57
......@@ -85,6 +85,7 @@ https://models.slf.ch/p/alpine3d
<reference name="GRID2D_IN"/>
<reference name="DEMPLUGINS"/>
<reference name="LANDUSEPLUGINS"/>
<reference name="GLACIERS_IN"/>
<reference name="POI"/>
</frame>
......
......@@ -839,7 +839,7 @@ INIshell include file for MeteoIO filters
<parametergroup name="PROC_RHWATERTOICE">
<option caption="Relative humidity over water correction" value="RHWATERTOICE" type="string" color="#459a4a">
<reference name="ID_RESTRICT"/>
<help>&lt;a href=&quot;https://models.slf.ch/docserver/meteoio/doc/html/classmio_1_1ProcRHWaterToIce.html&quot;&gt;Relative humidity over water or ice&lt;/a&gt;. This corrects relative humidity over water for the full temperature range to relative humidity over ice when the air temperature is below the triple point and over water otherwise. For example useful for weather stations that report relative humidity with respect to water for the full temperature range.</help>
<help>&lt;a href=&quot;https://models.slf.ch/docserver/meteoio/html/classmio_1_1ProcRHWaterToIce.html&quot;&gt;Relative humidity over water or ice&lt;/a&gt;. This corrects relative humidity over water for the full temperature range to relative humidity over ice when the air temperature is below the triple point and over water otherwise. For example useful for weather stations that report relative humidity with respect to water for the full temperature range.</help>
</option>
</parametergroup>
......@@ -850,7 +850,7 @@ INIshell include file for MeteoIO filters
<help>Target EPSG code for transformation (default: COORDPARAM from the [Input] section)</help>
</parameter>
<reference name="ID_RESTRICT"/>
<help>&lt;a href=&quot;https://models.slf.ch/docserver/meteoio/doc/html/classmio_1_1ProcTransformWindVector.html&quot;&gt;Project wind direction, and/or wind speed components, from WGS84 to a PROJ4 supported coordinate system&lt;/a&gt;, defined by an EPSG code (requires PROJ4). It assumes the wind direction and/or the U and V wind speed components are defined in WGS84 (i.e, north/south is parallel to longitude, and east/west is parallel to latitude). After transformation to a PROJ4 supported coordinate system defined by an EPSG code, the wind direction is defined such that north/south is parallel to northing, and east/west is parallel to easting.</help>
<help>&lt;a href=&quot;https://models.slf.ch/docserver/meteoio/html/classmio_1_1ProcTransformWindVector.html&quot;&gt;Project wind direction, and/or wind speed components, from WGS84 to a PROJ4 supported coordinate system&lt;/a&gt;, defined by an EPSG code (requires PROJ4). It assumes the wind direction and/or the U and V wind speed components are defined in WGS84 (i.e, north/south is parallel to longitude, and east/west is parallel to latitude). After transformation to a PROJ4 supported coordinate system defined by an EPSG code, the wind direction is defined such that north/south is parallel to northing, and east/west is parallel to easting.</help>
</option>
</parametergroup>
......
......@@ -70,6 +70,24 @@ INIshell include file for gridded input / output plugin definitions
<help>Plugin for land cover data </help>
</parameter>
</parametergroup>
<!-- Alternative panel: GLACIERS_IN -->
<parametergroup name="GLACIERS_IN">
<parameter key="GLACIER_FROM_GRID" type="alternative">
<option value="TRUE">
<parameter key="GLACIER" label="Select GLACIER plugin:" type="alternative" default="ARC" optional="false">
<option value="ARC" type="text">
<parameter key="GLACIERFILE" type="file" mode="input" optional="false">
<help>Grid providing the glacier height</help>
</parameter>
</option>
<help>Plugin for glacier height data </help>
</parameter>
</option>
<option value="FALSE"/>
<help>Provide glacier height from a separate grid</help>
</parameter>
</parametergroup>
<!-- Alternative panel: POI -->
<parametergroup name="POI">
......
......@@ -587,6 +587,11 @@ Please include meteoio_parametergroups before use!
<reference name="METEOGRIDS"/>
<help>remap the names as found in the NetCDF file to MeteoIO's &lt;a href=https://models.slf.ch/docserver/meteoio/html/classmio_1_1MeteoGrids.html#a2063b187182804ab133b154b65ae592c"&gt;MeteoGrids::parameters&lt;/a&gt;</help>
</parameter>
<parameter key="NC_KEEP_FILES_OPEN" type="alternative">
<option value="TRUE"/>
<option value="FALSE"/>
<help>keep files open for efficient access? Beware, there is a max number of simultaneously opened files (default: true)</help>
</parameter>
<parameter key="NC_DEBUG" type="alternative">
<option value="TRUE"/>
<option value="FALSE"/>
......
......@@ -131,6 +131,11 @@ Please include meteoio_parametergroups before use!
<option value="FALSE"/>
<help>fill ACDD metadata fields</help>
</parameter>
<parameter key="NC_KEEP_FILES_OPEN" type="alternative">
<option value="TRUE"/>
<option value="FALSE"/>
<help>keep files open for efficient access? Beware, simulateous writing to a file in the case of parallelized processing could lead to data corruption (default: false)</help>
</parameter>
</parametergroup>
<!-- PSQL -->
......
......@@ -44,7 +44,7 @@ CONFIG(debug) { #in release, we try everything
QMAKE_CXXFLAGS += -Wall -lto
}
VERSION = "2.0.3"
VERSION = "2.0.4"
VERSION_PE_HEADER = "2.0"
DEFINES += APP_VERSION_STR=\\\"$$VERSION\\\"
QMAKE_TARGET_COMPANY = "WSL Institute for Snow and Avalanche Research"
......@@ -55,11 +55,15 @@ RESOURCES = resources/inishell.qrc
RC_ICONS = resources/icons/inishell_192.ico #for Windows
ICON = resources/icons/inishell_192.icns #for Mac OS when not set in the program yet (launching)
#package the applications' XML files into Mac's dmg file
##package the applications' XML files into Mac's dmg file
applicationsXML.files = $$PWD/inishell-apps
applicationsXML.path = Contents/
QMAKE_BUNDLE_DATA += applicationsXML
##package meteoio_timeseries into Mac's dmg file
#meteoio.files = $$PWD/../meteoio/bin/meteoio_timeseries $$PWD/../meteoio/lib/libmeteoio.dylib
#meteoio.path = Contents/MacOS
SOURCES += \
src/gui/AboutWindow.cc \
src/gui/ApplicationsView.cc \
......
......@@ -117,7 +117,9 @@ QString getExtraPath(const QString& appname)
return extra_path;
#endif
#if defined Q_OS_MAC
const QString extra_path( ":" +home+"/bin:" + home+"/usr/bin:" + home+"/src/"+appname+"/bin:" + desktop+"/"+appname+"/bin:" + "/Applications/"+appname+".app/Contents/bin:" + own_path);
QString Appname( appname );
Appname[0] = Appname[0].toUpper();
const QString extra_path( ":" +home+"/bin:" + home+"/usr/bin:" + home+"/src/"+appname+"/bin:" + desktop+"/"+appname+"/bin:" + "/Applications/"+appname+".app/Contents/bin:" + "/Applications/"+Appname+".app/Contents/bin:" + "/Applications/"+appname+"/bin:" + "/Applications/"+Appname+"/bin:" + own_path);
return extra_path;
#endif
#if !defined Q_OS_WIN && !defined Q_OS_MAC
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment