Mercurial > dive4elements > river

changeset 3440:fed6685692d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove line style attributes from FixingReferenceEvents flys-artifacts/trunk@5103 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Christian Lins <christian.lins@intevation.de>
date Mon, 23 Jul 2012 11:52:21 +0000
parents cb11919cccf9
children bfbd478bd607
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/default-themes.xml flys-artifacts/doc/conf/second-themes.xml flys-artifacts/doc/conf/themes.xml
diffstat 4 files changed, 33 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Mon Jul 23 10:11:15 2012 +0000
+++ b/flys-artifacts/ChangeLog	Mon Jul 23 11:52:21 2012 +0000
@@ -1,3 +1,10 @@
+2012-07-23	Christian Lins	<christian.lins@intevation.de>
+
+	* doc/conf/themes.xml,
+	  doc/conf/second-themes.xml,
+	  doc/conf/default-themes.xml:
+	  Remove line style attributes from FixingReferenceEvents theme.
+
 2012-07-23	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/model/Calculation4.java
--- a/flys-artifacts/doc/conf/default-themes.xml	Mon Jul 23 10:11:15 2012 +0000
+++ b/flys-artifacts/doc/conf/default-themes.xml	Mon Jul 23 11:52:21 2012 +0000
@@ -49,7 +49,7 @@
         </inherits>
         <fields>
             <field name="bandwidth" type="double" display="Bandbreite"
-                default="0"/> 
+                default="0"/>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="204, 204, 204" />
         </fields>
@@ -750,7 +750,7 @@
         <inherits>
             <inherit from="LongitudinalSectionPoints" />
         </inherits>
-        <!--fields> <field name="linecolor" type="Color" display="Linienfarbe" 
+        <!--fields> <field name="linecolor" type="Color" display="Linienfarbe"
             default="0, 0, 0"/> </fields -->
     </theme>
 
@@ -1132,7 +1132,7 @@
             <field name="linecolor" type="Color" default="227, 27, 162" />
         </fields>
     </theme>
-    
+
     <theme name="FixingDerivedCurve">
         <inherits>
             <inherit from="HiddenColorLines" />
@@ -1222,11 +1222,19 @@
         </fields>
     </theme>
 
-    <theme name="FixingReferenceEventsWQ">
+    <theme name="FixingReferenceEvents">
         <inherits>
             <inherit from="ColorPoints" />
         </inherits>
         <fields>
+            <field name="showlines" type="boolean" default="false"
+                hidden="true" />
+            <field name="showlinelabel" type="boolean" default="false"
+                hidden="true" />
+            <field name="linetype" type="Dash" display="Linienart"
+                default="10" hidden="true" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="1" hidden="true" />
             <field name="pointsize" type="int" display="Punktdicke"
                 default="3" />
             <field name="pointcolor" type="Color" display="Punktfarbe"
@@ -1299,7 +1307,6 @@
         </fields>
     </theme>
 
-
     <theme name="FixingDeltaWtAnalysis">
         <inherits>
             <inherit from="ColorPoints" />
@@ -1316,20 +1323,6 @@
         </fields>
     </theme>
 
-    <theme name="FixingDeltaWtReference">
-        <inherits>
-            <inherit from="ColorPoints" />
-        </inherits>
-        <fields>
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="h" />
-            <field name="showlines" type="boolean" default="false" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 80, 160" />
-        </fields>
-    </theme>
     <theme name="FixingLSAverage0">
         <inherits>
             <inherit from="HiddenColorLines" />
--- a/flys-artifacts/doc/conf/second-themes.xml	Mon Jul 23 10:11:15 2012 +0000
+++ b/flys-artifacts/doc/conf/second-themes.xml	Mon Jul 23 11:52:21 2012 +0000
@@ -748,7 +748,7 @@
         <inherits>
             <inherit from="LongitudinalSectionPoints" />
         </inherits>
-        <!--fields> <field name="linecolor" type="Color" display="Linienfarbe" 
+        <!--fields> <field name="linecolor" type="Color" display="Linienfarbe"
             default="0, 0, 0"/> </fields -->
     </theme>
 
@@ -1213,20 +1213,25 @@
         </fields>
     </theme>
 
-    <theme name="FixingReferenceEventsWQ">
+    <theme name="FixingReferenceEvents">
         <inherits>
             <inherit from="ColorPoints" />
         </inherits>
         <fields>
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="h" />
-            <field name="showlines" type="boolean" default="false" />
+            <field name="showlines" type="boolean" default="false"
+                hidden="true" />
+            <field name="showlinelabel" type="boolean" default="false"
+                hidden="true" />
+            <field name="linetype" type="Dash" display="Linienart"
+                default="10" hidden="true" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="1" hidden="true" />
             <field name="pointsize" type="int" display="Punktdicke"
                 default="3" />
             <field name="pointcolor" type="Color" display="Punktfarbe"
                 default="0, 80, 160" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
         </fields>
     </theme>
 
@@ -1310,21 +1315,6 @@
         </fields>
     </theme>
 
-    <theme name="FixingDeltaWtReference">
-        <inherits>
-            <inherit from="ColorPoints" />
-        </inherits>
-        <fields>
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="h" />
-            <field name="showlines" type="boolean" default="false" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 80, 160" />
-        </fields>
-    </theme>
-
     <theme name="FixingLSAverage0">
         <inherits>
             <inherit from="HiddenColorLines" />
--- a/flys-artifacts/doc/conf/themes.xml	Mon Jul 23 10:11:15 2012 +0000
+++ b/flys-artifacts/doc/conf/themes.xml	Mon Jul 23 11:52:21 2012 +0000
@@ -162,14 +162,14 @@
         <mapping from="fix_analysis_events_wq" to="FixingAnalysisEventsWQ"/>
         <mapping from="fix_outlier" to="FixingOutlier"/>
         <mapping from="fix_wq_curve" to="FixingWQCurve"/>
-        <mapping from="fix_reference_events_wq" to="FixingReferenceEventsWQ"/>
+        <mapping from="fix_reference_events_wq" to="FixingReferenceEvents"/>
         <mapping from="fix_sector_average_dwt_0" to="FixingDeltaWtAverage0"/>
         <mapping from="fix_sector_average_dwt_1" to="FixingDeltaWtAverage1"/>
         <mapping from="fix_sector_average_dwt_2" to="FixingDeltaWtAverage2"/>
         <mapping from="fix_sector_average_dwt_3" to="FixingDeltaWtAverage3"/>
         <mapping from="fix_analysis_events_dwt" to="FixingDeltaWtAnalysis"/>
         <mapping from="fix_analysis_periods_dwt" to="FixingDeltaWtAnalysisPeriods"/>
-        <mapping from="fix_reference_events_dwt" to="FixingDeltaWtReference"/>
+        <mapping from="fix_reference_events_dwt" to="FixingReferenceEvents"/>
         <mapping from="fix_sector_average_ls_deviation_0" to="FixingSectorDeviationLS0"/>
         <mapping from="fix_sector_average_ls_deviation_1" to="FixingSectorDeviationLS1"/>
         <mapping from="fix_sector_average_ls_deviation_2" to="FixingSectorDeviationLS2"/>
http://dive4elements.wald.intevation.org