]> jspc29.x-matter.uni-frankfurt.de Git - mvd_epics.git/commitdiff
jspc29 / mvd_epics.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 22fca49)
CSS: Some style updates and corrected options
authorOle Artz <ole.artz@t-online.de>
Thu, 30 Nov 2017 10:24:03 +0000 (11:24 +0100)
committerOle Artz <ole.artz@t-online.de>
Thu, 30 Nov 2017 10:24:03 +0000 (11:24 +0100)
css/MVD/Low_Voltage.opi patch | blob | history
css/MVD/MVD_HUBER.opi patch | blob | history
css/MVD/Pt100_Temperatures.plt patch | blob | history
css/PRESTO_DASHBOARD/Emergency_button.opi patch | blob | history
css/PRESTO_DASHBOARD/Tabbed_Dashboard.opi patch | blob | history

diff --git a/css/MVD/Low_Voltage.opi b/css/MVD/Low_Voltage.opi
index 19f81cf5ca4c18aceeccd601e8f0e29e08fd5b28..80fb24c2fb47624dc40ea050fcb9612ce82d3962 100644 (file)
--- a/css/MVD/Low_Voltage.opi
+++ b/css/MVD/Low_Voltage.opi
@@ -207,7 +207,7 @@ $(pv_value)</tooltip>
     <level_hihi>90.0</level_hihi>
     <level_lo>20.0</level_lo>
     <level_lolo>10.0</level_lolo>
-    <limits_from_pv>true</limits_from_pv>
+    <limits_from_pv>false</limits_from_pv>
     <log_scale>false</log_scale>
     <major_tick_step_hint>50</major_tick_step_hint>
     <maximum>100.0</maximum>
@@ -426,7 +426,7 @@ $(pv_value)</tooltip>
     <level_hihi>90.0</level_hihi>
     <level_lo>20.0</level_lo>
     <level_lolo>10.0</level_lolo>
-    <limits_from_pv>true</limits_from_pv>
+    <limits_from_pv>false</limits_from_pv>
     <log_scale>false</log_scale>
     <major_tick_step_hint>50</major_tick_step_hint>
     <maximum>100.0</maximum>
@@ -505,7 +505,7 @@ $(pv_value)</tooltip>
     <level_hihi>90.0</level_hihi>
     <level_lo>20.0</level_lo>
     <level_lolo>10.0</level_lolo>
-    <limits_from_pv>true</limits_from_pv>
+    <limits_from_pv>false</limits_from_pv>
     <log_scale>false</log_scale>
     <major_tick_step_hint>50</major_tick_step_hint>
     <maximum>100.0</maximum>
@@ -683,7 +683,7 @@ $(pv_value)</tooltip>
     <level_hihi>90.0</level_hihi>
     <level_lo>20.0</level_lo>
     <level_lolo>10.0</level_lolo>
-    <limits_from_pv>true</limits_from_pv>
+    <limits_from_pv>false</limits_from_pv>
     <log_scale>false</log_scale>
     <major_tick_step_hint>50</major_tick_step_hint>
     <maximum>100.0</maximum>
@@ -762,7 +762,7 @@ $(pv_value)</tooltip>
     <level_hihi>90.0</level_hihi>
     <level_lo>20.0</level_lo>
     <level_lolo>10.0</level_lolo>
-    <limits_from_pv>true</limits_from_pv>
+    <limits_from_pv>false</limits_from_pv>
     <log_scale>false</log_scale>
     <major_tick_step_hint>50</major_tick_step_hint>
     <maximum>100.0</maximum>
diff --git a/css/MVD/MVD_HUBER.opi b/css/MVD/MVD_HUBER.opi
index d527cd9ca5a66eb099f5315d7dbbe71c497fa4c2..ea6e65727cfc0187e884bbb31aa50cdb391a69d4 100644 (file)
--- a/css/MVD/MVD_HUBER.opi
+++ b/css/MVD/MVD_HUBER.opi
@@ -15,7 +15,7 @@
     <color red="192" green="192" blue="192" />
   </foreground_color>
   <grid_space>6</grid_space>
-  <height>430</height>
+  <height>780</height>
   <macros>
     <include_parent_macros>true</include_parent_macros>
   </macros>
@@ -28,7 +28,7 @@
   <show_ruler>true</show_ruler>
   <snap_to_geometry>true</snap_to_geometry>
   <widget_type>Display</widget_type>
-  <width>690</width>
+  <width>900</width>
   <wuid>2da4dada:138bb0b2666:-7ff6</wuid>
   <x>-1</x>
   <y>-1</y>
@@ -1344,7 +1344,7 @@ $(pv_value)</tooltip>
     <width>271</width>
     <wuid>1ad8f1fb:15ba9fccb4a:-7e3a</wuid>
     <x>6</x>
-    <y>588</y>
+    <y>486</y>
     <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
       <actions hook="false" hook_all="false" />
       <alarm_pulsing>false</alarm_pulsing>
@@ -1845,7 +1845,7 @@ $(pv_value)</tooltip>
     <width>271</width>
     <wuid>1ad8f1fb:15ba9fccb4a:-7d4f</wuid>
     <x>294</x>
-    <y>588</y>
+    <y>486</y>
     <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
       <actions hook="false" hook_all="false" />
       <auto_size>false</auto_size>
@@ -2622,7 +2622,7 @@ $(pv_value)</tooltip>
     <width>271</width>
     <wuid>1ad8f1fb:15ba9fccb4a:-7c8a</wuid>
     <x>588</x>
-    <y>588</y>
+    <y>486</y>
     <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
       <actions hook="false" hook_all="false" />
       <auto_size>false</auto_size>
diff --git a/css/MVD/Pt100_Temperatures.plt b/css/MVD/Pt100_Temperatures.plt
index 924b904b3d1cbc3499f74c0adcd82695ab078f46..bb92162770b5b0da80f8aa05be0274e91e50afa5 100644 (file)
--- a/css/MVD/Pt100_Temperatures.plt
+++ b/css/MVD/Pt100_Temperatures.plt
@@ -8,9 +8,9 @@
     <scroll>false</scroll>
     <update_period>3.0</update_period>
     <scroll_step>5</scroll_step>
-    <start>2017/04/13 13:57:10.410</start>
-    <end>2017/04/13 16:26:06.078</end>
-    <archive_rescale>STAGGER</archive_rescale>
+    <start>2017-11-22 16:35:00.995</start>
+    <end>2017-11-29 00:43:14.640</end>
+    <archive_rescale>NONE</archive_rescale>
     <background>
         <red>255</red>
         <green>255</green>
@@ -32,8 +32,8 @@
                 <green>0</green>
                 <blue>0</blue>
             </color>
-            <min>24.81052971576228</min>
-            <max>28.440529715762274</max>
+            <min>22.110212345068874</min>
+            <max>24.57983513564602</max>
             <grid>false</grid>
             <autoscale>false</autoscale>
             <log_scale>false</log_scale>
@@ -60,6 +60,11 @@
             <period>0.0</period>
             <ring_size>5000</ring_size>
             <request>OPTIMIZED</request>
+            <archive>
+                <name>jspc57_def</name>
+                <url>jdbc:postgresql://jspc57:5432/archive</url>
+                <key>1</key>
+            </archive>
         </pv>
         <pv>
             <display_name>CBM:MVD:PT100:VAC:07</display_name>
@@ -79,6 +84,11 @@
             <period>0.0</period>
             <ring_size>5000</ring_size>
             <request>OPTIMIZED</request>
+            <archive>
+                <name>jspc57_def</name>
+                <url>jdbc:postgresql://jspc57:5432/archive</url>
+                <key>1</key>
+            </archive>
         </pv>
     </pvlist>
 </databrowser>
\ No newline at end of file
diff --git a/css/PRESTO_DASHBOARD/Emergency_button.opi b/css/PRESTO_DASHBOARD/Emergency_button.opi
index e1ef132ed8011a57e075a0887d6be3bb7d75dd5e..e0adfcb43d33431cbf83f50f4db56cab97656b23 100644 (file)
--- a/css/PRESTO_DASHBOARD/Emergency_button.opi
+++ b/css/PRESTO_DASHBOARD/Emergency_button.opi
@@ -135,7 +135,7 @@ $(pv_value)</tooltip>
     <y>18</y>
   </widget>
   <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
-    <actions hook="false" hook_all="false">
+    <actions hook="false" hook_all="true">
       <action type="WRITE_PV">
         <pv_name>$(pv_name)</pv_name>
         <value>0</value>
diff --git a/css/PRESTO_DASHBOARD/Tabbed_Dashboard.opi b/css/PRESTO_DASHBOARD/Tabbed_Dashboard.opi
index 4c22e78338e93500e06ba03788da49c9a7ac9df3..6975ff296811737e928e126fffbaaa4d0f12c604 100644 (file)
--- a/css/PRESTO_DASHBOARD/Tabbed_Dashboard.opi
+++ b/css/PRESTO_DASHBOARD/Tabbed_Dashboard.opi
@@ -153,7 +153,7 @@
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <border_style>3</border_style>
+        <border_style>0</border_style>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
@@ -220,7 +220,7 @@
       <show_scrollbar>true</show_scrollbar>
       <tooltip></tooltip>
       <transparent>true</transparent>
-      <visible>false</visible>
+      <visible>true</visible>
       <widget_type>Grouping Container</widget_type>
       <width>659</width>
       <wuid>778007f9:15f9b2852ee:-2057</wuid>
@@ -301,7 +301,7 @@
       <show_scrollbar>true</show_scrollbar>
       <tooltip></tooltip>
       <transparent>true</transparent>
-      <visible>true</visible>
+      <visible>false</visible>
       <widget_type>Grouping Container</widget_type>
       <width>659</width>
       <wuid>71366abc:15fa0e96080:-7221</wuid>
@@ -426,7 +426,7 @@
           <show_scrollbar>true</show_scrollbar>
           <tooltip></tooltip>
           <transparent>true</transparent>
-          <visible>false</visible>
+          <visible>true</visible>
           <widget_type>Grouping Container</widget_type>
           <width>635</width>
           <wuid>71366abc:15fa0e96080:-721c</wuid>
@@ -669,7 +669,7 @@
           <show_scrollbar>true</show_scrollbar>
           <tooltip></tooltip>
           <transparent>true</transparent>
-          <visible>true</visible>
+          <visible>false</visible>
           <widget_type>Grouping Container</widget_type>
           <width>635</width>
           <wuid>71366abc:15fa0e96080:-7214</wuid>
@@ -727,8 +727,8 @@
     <border_color>
       <color red="0" green="128" blue="255" />
     </border_color>
-    <border_style>3</border_style>
-    <border_width>1</border_width>
+    <border_style>0</border_style>
+    <border_width>0</border_width>
     <enabled>true</enabled>
     <font>
       <opifont.name fontName="Noto Sans" height="10" style="0" pixels="false">Default</opifont.name>
@@ -737,7 +737,7 @@
       <color red="192" green="192" blue="192" />
     </foreground_color>
     <group_name></group_name>
-    <height>122</height>
+    <height>120</height>
     <macros>
       <include_parent_macros>true</include_parent_macros>
     </macros>
@@ -746,15 +746,15 @@
     <resize_behaviour>3</resize_behaviour>
     <rules />
     <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
+      <width_scalable>false</width_scalable>
+      <height_scalable>false</height_scalable>
       <keep_wh_ratio>false</keep_wh_ratio>
     </scale_options>
     <scripts />
     <tooltip></tooltip>
     <visible>true</visible>
     <widget_type>Linking Container</widget_type>
-    <width>353</width>
+    <width>361</width>
     <wuid>71366abc:15fa0e96080:-6101</wuid>
     <x>138</x>
     <y>768</y>
Epics in Frankfurt labs