[Dive4elements-commits] [PATCH 2 of 2] merge

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1361370796 -3600
# Node ID b1cf8ad5e7a828b4e70e3c93db77d94df2b13f55
# Parent  a911d8f912166c51730366aec5deede1e41e1f94
# Parent  3b974a24a8e1a61203dd9e4f81ff9cb23d4a7d7a
merge

diff -r a911d8f91216 -r b1cf8ad5e7a8 flys-artifacts/doc/conf/artifacts/fixanalysis.xml
--- a/flys-artifacts/doc/conf/artifacts/fixanalysis.xml	Wed Feb 20 15:30:53 2013 +0100
+++ b/flys-artifacts/doc/conf/artifacts/fixanalysis.xml	Wed Feb 20 15:33:16 2013 +0100
@@ -304,6 +304,11 @@
                     <facet name="hyk"                        description="hyks"/>
                   </facets>
                 </outputmode>
+                <outputmode name="fix_wq_curve_at_export" description="output.fix_wq_curve_at_export" mime-type="text/plain" type="export">
+                    <facets>
+                        <facet name="at" description="facet.fix_wq_curve_export.at"/>
+                    </facets>
+                </outputmode>
                 <outputmode name="fix_waterlevel_export" description="output.fix_waterlevel_export" mine-type="text/plain" type="export">
                     <facets>
                         <facet name="csv" description="facet.waterlevel_export.csv" />
diff -r a911d8f91216 -r b1cf8ad5e7a8 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java	Wed Feb 20 15:30:53 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java	Wed Feb 20 15:33:16 2013 +0100
@@ -130,6 +130,9 @@
                 new DataFacet(PDF, "PDF data", ComputeType.ADVANCE, hash, id));
         }
 
+        facets.add(
+            new DataFacet(AT, "AT data", ComputeType.ADVANCE, hash, id));
+
         facets.add(new FixWQCurveFacet(
             0, Resources.getMsg(meta, I18N_WQ_CURVE, I18N_WQ_CURVE)));
 
diff -r a911d8f91216 -r b1cf8ad5e7a8 flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixATExport.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixATExport.java	Wed Feb 20 15:30:53 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixATExport.java	Wed Feb 20 15:33:16 2013 +0100
@@ -15,6 +15,7 @@
 import de.intevation.flys.artifacts.model.Parameters;
 
 import de.intevation.flys.artifacts.model.fixings.FixAnalysisResult;
+import de.intevation.flys.artifacts.model.fixings.FixResult;
 
 import de.intevation.flys.exports.AbstractExporter;
 
@@ -46,8 +47,8 @@
         if (data instanceof CalculationResult) {
             CalculationResult cr = (CalculationResult)data;
             Object resData = cr.getData();
-            if (resData instanceof FixAnalysisResult) {
-                this.parameters = ((FixAnalysisResult)resData).getParameters();
+            if (resData instanceof FixResult) {
+                this.parameters = ((FixResult)resData).getParameters();
             }
         }
         else {
diff -r a911d8f91216 -r b1cf8ad5e7a8 flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java	Wed Feb 20 15:30:53 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java	Wed Feb 20 15:33:16 2013 +0100
@@ -113,6 +113,7 @@
                 baseUrl + MSG.downloadCSV(),
                 moduleUrl + "export" +
                    "?uuid=" + chartTab.getCollection().identifier() +
+                   "&name=" + chartTab.getMode().getName() +
                    "&mode=" + chartTab.getMode().getName() + "_at_export" +
                    "&type=at" +
                    "&server=" + config.getServerUrl() +