To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit 394d3c15 authored by holukas's avatar holukas
Browse files

v0.16.0 update size reduction

parent 358bc3b0
......@@ -2,35 +2,20 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a2e058ad-c1ec-4f32-9d8e-8a6077d0b5e9" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/main/python/help/abbreviations.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/python/modboxes/Extensions/ECQualityControl/OffSeasonUptakeCorr.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/Modifications/Subset.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/base/filetypes/AmpCSV_1T.filetype" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/base/filetypes/EFDC_UPLOAD_30MIN.filetype" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/build/settings/base.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/build/settings/base.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/gui/gui.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/gui/gui.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/gui/tabs.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/gui/tabs.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/gui/top_menu.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/gui/top_menu.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/inout/DataFunctions.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/inout/DataFunctions.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/inout/ExampleFiles.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/inout/ExampleFiles.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/inout/VarGroups.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/inout/VarGroups.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/Extensions/ECQualityControl/ECQualityControl.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/Extensions/ECQualityControl/ECQualityControl.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/default/Analyses/ClassFinder.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/Analyses/ClassFinder.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/default/Analyses/_uStarDetection.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/Analyses/_uStarDetection.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/default/CreateVariable/CombineColumns.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/CreateVariable/CombineColumns.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/default/CreateVariable/DefineSeasons.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/CreateVariable/DefineSeasons.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/default/CreateVariable/TimeSince.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/CreateVariable/TimeSince.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/default/Export/ExportDataset.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/Export/ExportDataset.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/default/Modifications/ConvertUnits.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/Modifications/ConvertUnits.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/default/Modifications/RenameVar.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/Modifications/RenameVar.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/default/Modifications/SetToMissing.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/Modifications/SetToMissing.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/default/OutlierDetection/AbsoluteLimit.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/OutlierDetection/AbsoluteLimit.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/default/Plots/Overview.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/Plots/Overview.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/python/modboxes/default/Plots/WindSectors.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/python/modboxes/default/Plots/WindSectors.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/css/gui_light.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/base/css/gui_light.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/filetypes/FLUXNET_FULLSET_30MIN.filetype" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/base/filetypes/FLUXNET_FULLSET_30MIN.filetype" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/example_files/1997_eddypro_CH-DAV_full_output_2016-07-27T205757_adv.csv" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/example_files/AmpCSV_fromFLUXNET_30MIN_CH-DAV_1997.csv" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/example_files/Dataset_AMP-20201002-091726_Original-30T.amp.csv" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/example_files/Dataset_AMP-20201007-144533_Original-30T.amp.csv" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/example_files/Dataset_AMP-20201007-221912_Original-30T.amp.csv" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/example_files/Dataset_AMP-20201012-154524_Original-30T.amp.csv" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/example_files/REDDYPROC_30MIN_CH-DAV_1997.csv" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/example_files/SMEAR_II_smeardata_19960101120000.csv" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/example_files/_Dataset_AMP-20201028-085716_Original-1T.amp.csv" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/example_files/__LONG__Example_FLUXNET_FULLSET_30MIN.csv" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/base/example_files/__SHORT__CH-DAV_2019_Dataset_AMP-20200915-191704_Original-30T.amp.csv" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -894,7 +879,8 @@
<workItem from="1607382154278" duration="1047000" />
<workItem from="1607510753102" duration="1195000" />
<workItem from="1607607251600" duration="2143000" />
<workItem from="1608566790863" duration="628000" />
<workItem from="1608566790863" duration="744000" />
<workItem from="1608567692183" duration="65000" />
</task>
<option name="localTasksCounter" value="2" />
<servers />
......@@ -1171,7 +1157,7 @@
<SUITE FILE_PATH="coverage/Amp$main.coverage" NAME="main Coverage Results" MODIFIED="1601301456747" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/main/python" />
<SUITE FILE_PATH="coverage/Amp_dist_test$main.coverage" NAME="main Coverage Results" MODIFIED="1570096148212" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/main/python" />
<SUITE FILE_PATH="coverage/Amp$start.coverage" NAME="start Coverage Results" MODIFIED="1601370383096" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src" />
<SUITE FILE_PATH="coverage/Amp$start__1_.coverage" NAME="start (1) Coverage Results" MODIFIED="1608567413930" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/main/python" />
<SUITE FILE_PATH="coverage/Amp$start__1_.coverage" NAME="start (1) Coverage Results" MODIFIED="1608567742239" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/main/python" />
<SUITE FILE_PATH="coverage/Amp$GUI.coverage" NAME="GUI Coverage Results" MODIFIED="1572346512398" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/main/python/gui" />
</component>
</project>
\ No newline at end of file
......@@ -12,7 +12,7 @@ def load(file, ctx):
if file == 'AmpCSV_30T':
settings_dict = SelectFileTypeSettings.read_settings_from_file(filepath=ctx.filetype_AmpCSV_30T)
initial_data = ctx.file_AmpCSV_30T
if file == 'AmpCSV_1T':
elif file == 'AmpCSV_1T':
settings_dict = SelectFileTypeSettings.read_settings_from_file(filepath=ctx.filetype_AmpCSV_1T)
initial_data = ctx.file_AmpCSV_1T
elif file == 'SMEAR_II_30MIN':
......
......@@ -92,8 +92,8 @@ class Amp(qw.QMainWindow, Ui_MainWindow, gui_building_blocks.SelectFileTypeSetti
# Load example file when script starts
# self.initial_data, self.settings_dict = example_files.load(file='SMEAR_II_30MIN', ctx=self.ctx)
# self.initial_data, self.settings_dict = example_files.load(file='EDDYPRO_FULL_OUTPUT_30MIN', ctx=self.ctx)
# self.initial_data, self.settings_dict = example_files.load(file='AmpCSV_30T', ctx=self.ctx)
self.initial_data, self.settings_dict = example_files.load(file='AmpCSV_1T', ctx=self.ctx)
self.initial_data, self.settings_dict = example_files.load(file='AmpCSV_30T', ctx=self.ctx)
# self.initial_data, self.settings_dict = example_files.load(file='AmpCSV_1T', ctx=self.ctx)
# self.initial_data, self.settings_dict = example_files.load(file='REDDYPROC_30MIN', ctx=self.ctx)
# self.initial_data, self.settings_dict = example_files.load(file='Custom_AmpCSV_30T_with_secs', ctx=self.ctx)
# self.initial_data, self.settings_dict = example_files.load(file='ETH_METEOSCREENING_30MIN', ctx=self.ctx)
......@@ -1357,12 +1357,7 @@ class AppContext(ApplicationContext): # 1. Subclass ApplicationContext
def file_AmpCSV_30T(self):
# return self.get_resource('example_files/AmpCSV_fromFLUXNET_30MIN_CH-DAV_1997.csv')
return self.get_resource(
# 'example_files/Dataset_AMP-20201002-091726_Original-30T.amp.csv') # Returns absolute path
# 'example_files/Dataset_AMP-20201007-144533_Original-30T.amp.csv') # Returns absolute path
# 'example_files/Dataset_AMP-20201012-154524_Original-30T.amp.csv') # Returns absolute path
'example_files/TOA5_Dataset_AMP-20201028-085716_Original-10S.amp - Kopie.csv') # Returns absolute path
# 'example_files/__SHORT__CH-DAV_2019_Dataset_AMP-20200915-191704_Original-30T.amp.csv') # Returns absolute path
# 'example_files/Example_AmpCSV_CH-AWS_2018-2019_SEASONS_30T.amp.csv') # Returns absolute path
'example_files/Example_AmpCSV_CH-AWS-2018_SHORTER_SEASONS_30T.amp.csv') # Returns absolute path
@cached_property
def file_AmpCSV_1T(self):
......
Markdown is supported
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