diff --git a/.gitignore b/.gitignore index 2163aa159d..95ef7c6bd1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1 @@ -bin/ -.metadata/ -ldm/Debug -test-bin/ -testbin/ -testBin/ -bin-test/ -*.class -*.pyo -*.o *.orig diff --git a/RadarServer/com.raytheon.rcm.server.mq/src/com/raytheon/rcm/mqsrvr/MsgServ.java b/RadarServer/com.raytheon.rcm.server.mq/src/com/raytheon/rcm/mqsrvr/MsgServ.java old mode 100755 new mode 100644 diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyA.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyA.xml new file mode 100644 index 0000000000..4c3d6ed899 --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyA.xml @@ -0,0 +1,542 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyB.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyB.xml new file mode 100644 index 0000000000..6e57d71239 --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyB.xml @@ -0,0 +1,590 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyC.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyC.xml new file mode 100644 index 0000000000..c0a0d99ab2 --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyC.xml @@ -0,0 +1,705 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyD.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyD.xml new file mode 100644 index 0000000000..26e76a4310 --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyD.xml @@ -0,0 +1,1587 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyE.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyE.xml new file mode 100644 index 0000000000..74d65b9f6f --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyE.xml @@ -0,0 +1,513 @@ + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyF.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyF.xml new file mode 100644 index 0000000000..09d284cd8a --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyF.xml @@ -0,0 +1,1160 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyH.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyH.xml new file mode 100644 index 0000000000..c41df6f892 --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyH.xml @@ -0,0 +1,1121 @@ + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyI.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyI.xml new file mode 100644 index 0000000000..b36a1a68f2 --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyI.xml @@ -0,0 +1,763 @@ + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyJ.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyJ.xml new file mode 100644 index 0000000000..fe939b7120 --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyJ.xml @@ -0,0 +1,559 @@ + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyL.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyL.xml new file mode 100644 index 0000000000..b586af6e14 --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyL.xml @@ -0,0 +1,1102 @@ + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyM.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyM.xml new file mode 100644 index 0000000000..5bcb7d0164 --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyM.xml @@ -0,0 +1,759 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyU.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyU.xml new file mode 100644 index 0000000000..c889eb0f27 --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyU.xml @@ -0,0 +1,1479 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyV.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyV.xml new file mode 100644 index 0000000000..338c6abba8 --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyV.xml @@ -0,0 +1,1002 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyW.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyW.xml new file mode 100644 index 0000000000..fdae584acd --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyW.xml @@ -0,0 +1,1296 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyX.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyX.xml new file mode 100644 index 0000000000..ff0c7f4966 --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyX.xml @@ -0,0 +1,605 @@ + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyY.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyY.xml new file mode 100644 index 0000000000..b0c9c7f21a --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyY.xml @@ -0,0 +1,961 @@ + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyYY.xml b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyYY.xml new file mode 100644 index 0000000000..4a04ec061f --- /dev/null +++ b/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyYY.xml @@ -0,0 +1,972 @@ + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisConfigDlg.java b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisConfigDlg.java index 64c1386ba9..c638fbf5e7 100644 --- a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisConfigDlg.java +++ b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisConfigDlg.java @@ -88,6 +88,10 @@ import com.raytheon.uf.viz.alertviz.ui.dialogs.ConfigurationFileDlg.Function; * 04 Mar 2011 7950 rferrel Allow saving to base configuration. * 04 Mar 2011 6532 rferrel Implemented restart button * 24 Mar 2011 5853 cjeanbap Check MonitorMetadata image file for null. + * 08 Sep 2012 13528 Xiaochuan Confirmation message is not necessary when + * close. Add setNewConfig and run in common + * setting group to perform the updating. + * * * * @author lvenable @@ -211,9 +215,9 @@ public class AlertVisConfigDlg extends Dialog implements /** Configuration list dialog */ private ConfigurationFileDlg configurationDialog; - + private boolean fetchLog; - + /** * Label default configuration. */ @@ -426,7 +430,8 @@ public class AlertVisConfigDlg extends Dialog implements showPriorityChk.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - saveNeeded(true); + setNewConfig(); + saveNeeded(true); } }); @@ -435,7 +440,9 @@ public class AlertVisConfigDlg extends Dialog implements showSourceKeyChk.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - saveNeeded(true); + setNewConfig(); + saveNeeded(true); + } }); @@ -444,7 +451,9 @@ public class AlertVisConfigDlg extends Dialog implements showCategoryChk.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - saveNeeded(true); + setNewConfig(); + saveNeeded(true); + } }); @@ -462,7 +471,9 @@ public class AlertVisConfigDlg extends Dialog implements expandPopupChk.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - saveNeeded(true); + setNewConfig(); + saveNeeded(true); + } }); @@ -483,7 +494,9 @@ public class AlertVisConfigDlg extends Dialog implements msgLengthSpnr.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - saveNeeded(true); + setNewConfig(); + saveNeeded(true); + } }); @@ -504,7 +517,9 @@ public class AlertVisConfigDlg extends Dialog implements blinkDurSpnr.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - saveNeeded(true); + setNewConfig(); + saveNeeded(true); + } }); @@ -525,7 +540,10 @@ public class AlertVisConfigDlg extends Dialog implements audioDurSpnr.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - saveNeeded(true); + setNewConfig(); + saveNeeded(true); + + } }); @@ -618,7 +636,7 @@ public class AlertVisConfigDlg extends Dialog implements sourcesList.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent event) { - handleSourceSelection(); + handleSourceSelection(); } }); @@ -806,7 +824,7 @@ public class AlertVisConfigDlg extends Dialog implements for (int i = 0; i < 6; i++) { priorityControls.add(new PriorityControls(shell, prioritiesComp, i, - this)); + this, this)); } // ---------------------------------------------- @@ -856,7 +874,7 @@ public class AlertVisConfigDlg extends Dialog implements textLbl.setLayoutData(gd); for (int i = 0; i < 6; i++) { - priorityControls.get(i).createTextCheckbox(); + priorityControls.get(i).createTextCheckbox(); } addSeparator(prioritiesComp); @@ -870,7 +888,8 @@ public class AlertVisConfigDlg extends Dialog implements blinkLbl.setLayoutData(gd); for (int i = 0; i < 6; i++) { - priorityControls.get(i).createBlinkCheckbox(); + priorityControls.get(i).createBlinkCheckbox(); + } addSeparator(prioritiesComp); @@ -943,7 +962,6 @@ public class AlertVisConfigDlg extends Dialog implements for (int i = 0; i < 6; i++) { priorityControls.get(i).createFgBgControls(); } - handleSourceSelection(); } @@ -1018,14 +1036,8 @@ public class AlertVisConfigDlg extends Dialog implements closeBtn.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent event) { - if (save.isEnabled()) { - if (ConfigurationFileDlg.confirmCloseWithUnsavedChanges( - shell, configContext.toString())) { - close(); - } - } else { - close(); - } + close(); + } }); @@ -1247,7 +1259,7 @@ public class AlertVisConfigDlg extends Dialog implements uci = selectedSource.getConfigurationItem(); for (Priority pri : Priority.values()) { - amd = uci.lookup(pri); + amd = uci.lookup(pri); priorityControls.get(pri.ordinal()).setAlertMetadata(amd); } } @@ -1264,9 +1276,8 @@ public class AlertVisConfigDlg extends Dialog implements } else { selectedItem = sourcesList.getItem(index); } - + sourcesList.removeAll(); - java.util.List keys = new ArrayList(sourceMap.keySet()); Collections.sort(keys); @@ -1278,11 +1289,11 @@ public class AlertVisConfigDlg extends Dialog implements } if (selectedItem != null) { - sourcesList.select(sourcesList.indexOf(selectedItem)); +// sourcesList.select(sourcesList.indexOf(selectedItem)); + sourcesList.select(index); } else { sourcesList.select(0); } - handleSourceSelection(); } @@ -1325,6 +1336,14 @@ public class AlertVisConfigDlg extends Dialog implements } } + /** + * + */ + public void setNewConfig() { + updateGlobalConfiguration(); + ConfigurationManager.getInstance().setNewConfiguration(configContext, configData); + + } /** * Get the source key associated with the selected source in the source list * control. @@ -1429,9 +1448,9 @@ public class AlertVisConfigDlg extends Dialog implements @Override public void configurationChanged() { - configData = ConfigurationManager.getInstance() - .getCurrentConfiguration(); - configContext = ConfigurationManager.getInstance().getCurrentContext(); + configData = ConfigurationManager.getInstance() + .getCurrentConfiguration(); + configContext = ConfigurationManager.getInstance().getCurrentContext(); sourceMap = configData.getSources(); layoutControls.reloadConfig(configData); diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/PriorityControls.java b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/PriorityControls.java index 7a848ddeb1..78969ae5c8 100644 --- a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/PriorityControls.java +++ b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/PriorityControls.java @@ -60,6 +60,8 @@ import com.raytheon.uf.viz.alertviz.config.AlertMetadata; * 14 Dec 2010 5149 cjeanbap Added Python Action functionality. * 03 Mar 2011 8059 rferrel Fix tooltip for audioChk * 24 Mar 2011 5853 cjeanbap Check AlertMetadata for Null. + * 08 Sep 2012 13528 Xiaochuan Run setNewConfig to update priorities + * setting. * * * @author lvenable @@ -168,6 +170,8 @@ public class PriorityControls { private Shell parentShell; private Button actionChk; + + private AlertVisConfigDlg configDialog; /** * Button used to change the audio file. @@ -191,11 +195,12 @@ public class PriorityControls { * Priority number. */ public PriorityControls(Shell parentShell, Composite parentComp, - int priority, INeedsSaveListener needsSaveListener) { + int priority, INeedsSaveListener needsSaveListener, AlertVisConfigDlg configDialog ) { this.parentComp = parentComp; this.priority = priority; this.parentShell = parentShell; - + this.configDialog = configDialog; + createPriorityColor(); this.controlFont = new Font(parentComp.getDisplay(), "Monospace", 10, @@ -241,8 +246,9 @@ public class PriorityControls { textChk.setLayoutData(gd); textChk.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { - needsSaveListener.saveNeeded(true); updateBlinkButton(); + configDialog.setNewConfig(); + needsSaveListener.saveNeeded(true); } }); } @@ -259,8 +265,9 @@ public class PriorityControls { blinkChk.setLayoutData(gd); blinkChk.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { + alertMetadata.setBlink(blinkChk.getSelection()); + configDialog.setNewConfig(); needsSaveListener.saveNeeded(true); - alertMetadata.setBlink(blinkChk.getSelection()); } }); } @@ -276,8 +283,9 @@ public class PriorityControls { popupChk.setLayoutData(gd); popupChk.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { - needsSaveListener.saveNeeded(true); alertMetadata.setPopup(popupChk.getSelection()); + configDialog.setNewConfig(); + needsSaveListener.saveNeeded(true); } }); } @@ -301,9 +309,10 @@ public class PriorityControls { audioChk.setToolTipText(""); audioChk.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { - updateAudioChangeButton(); - needsSaveListener.saveNeeded(true); + updateAudioChangeButton(); alertMetadata.setAudioEnabled(audioChk.getSelection()); + configDialog.setNewConfig(); + needsSaveListener.saveNeeded(true); } }); @@ -313,6 +322,7 @@ public class PriorityControls { changeAudioBtn.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { selectAudioFile(); + configDialog.setNewConfig(); } }); @@ -336,8 +346,9 @@ public class PriorityControls { actionChk.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { updateActionChangeButton(); - needsSaveListener.saveNeeded(true); alertMetadata.setPythonEnabled(actionChk.getSelection()); + configDialog.setNewConfig(); + needsSaveListener.saveNeeded(true); } }); @@ -347,6 +358,7 @@ public class PriorityControls { changeActionBtn.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { selectActionFile(); + configDialog.setNewConfig(); } }); @@ -364,8 +376,9 @@ public class PriorityControls { logChk.setLayoutData(gd); logChk.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { - needsSaveListener.saveNeeded(true); alertMetadata.setLog(logChk.getSelection()); + configDialog.setNewConfig(); + needsSaveListener.saveNeeded(true); } }); @@ -403,7 +416,8 @@ public class PriorityControls { changeTextColorBtn.setToolTipText("Change foreground/background color"); changeTextColorBtn.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { - showColorDialog(); + showColorDialog(); + configDialog.setNewConfig(); } }); diff --git a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/ConfigurationManager.java b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/ConfigurationManager.java index 25438277a7..0b2e880502 100644 --- a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/ConfigurationManager.java +++ b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/ConfigurationManager.java @@ -61,6 +61,9 @@ import com.raytheon.uf.viz.alertviz.config.Source; * Apr 7, 2010 mschenke Initial creation * Mar 16, 2011 6531 rferrel Start up loads host dependent * configuration file. + * Aug 28 2012 13528 Xiaochuan Using setNewConfiguration() to + * re-set configuration data and + * run notifyListeners(). * * * @@ -199,20 +202,20 @@ public class ConfigurationManager { Configuration custom = getCustomConfiguration(); if (custom != null) { - if (baseConfiguration == null) { - statusHandler.error("The base configuration " - + DEFAULT_BASE_CONFIG.getLocalizationFileName() - + " was not loaded. Check your configuration."); - } else { - /* - * merge custom over base then overlay the current config on - * that result. preserve locking from the base - * configuration. - */ - Configuration baseCustom = baseConfiguration.mergeUnder( - custom, true); - currentConfig = baseCustom.overlayWith(currentConfig, true); - } + if (baseConfiguration == null) { + statusHandler.error("The base configuration " + + DEFAULT_BASE_CONFIG.getLocalizationFileName() + + " was not loaded. Check your configuration."); + } + else { + /* + * merge custom over base then overlay the current config on + * that result. preserve locking from the base configuration. + */ + Configuration baseCustom = baseConfiguration.mergeUnder(custom, + true); + currentConfig = baseCustom.overlayWith(currentConfig, true); + } } configurationMap.put(current, currentConfig); } else if (DEFAULT_BASE_CONFIG.equals(current) == false) { @@ -229,15 +232,26 @@ public class ConfigurationManager { */ public boolean saveCurrentConfiguration(ConfigContext context, Configuration toSave) { - if (saveToFile(context, toSave)) { - configurationMap.put(context, toSave); - current = context; - notifyListeners(); - return true; + + if (saveToFile(context, toSave)) { + setNewConfiguration(context, toSave); + + return true; } return false; } + /** + * @param context + * @param configData + */ + public void setNewConfiguration(ConfigContext context, + Configuration configData) { + configurationMap.put(context, configData); + current = context; + notifyListeners(); + + } /** * Delete the configuration passed in * @@ -383,7 +397,7 @@ fileName.lastIndexOf("/") + 1, // win32 private void notifyListeners() { for (IConfigurationChangedListener listener : listeners) { - listener.configurationChanged(); + listener.configurationChanged(); } } @@ -522,7 +536,7 @@ fileName.lastIndexOf("/") + 1, // win32 } public void resetCustomLocalization() { - reloadCustomConfiguration = true; + reloadCustomConfiguration = true; } public static boolean isDefaultConfig(ConfigContext context) { diff --git a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DLegendResource.java b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DLegendResource.java index 6ccb735ba9..378410ea64 100644 --- a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DLegendResource.java +++ b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DLegendResource.java @@ -69,6 +69,8 @@ import com.raytheon.viz.ui.cmenu.SetTimeMatchBasisAction; * the number of Graphics. * Jul 8, 2010 #6146 bkowal No longer has a separate font size for legend text that is * drawn into the smaller pane. + * Sep 4, 2012 15335 kshresth Will now display lightning/wind fields + * when magnification set to 0 * * * @@ -555,7 +557,7 @@ public class D2DLegendResource extends float magnification = getCapability(MagnificationCapability.class) .getMagnification().floatValue(); if (magnification < 0.6f) { - magnification = 0.6f; + magnification = 1.0f; } else if (magnification > 1.0f) { magnification = 1 + (magnification / 4.0f); } diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagButtonHandler.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagButtonHandler.java index b0a78a302d..7a14fa1fb2 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagButtonHandler.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagButtonHandler.java @@ -37,7 +37,8 @@ import com.raytheon.viz.ui.actions.AbstractGlobalsButtonHandler; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jul 23, 2007 randerso Initial Creation. - * + * Sep 4, 2012 15335 kshresth Will now display lightning/wind + * fields when magnification set to 0 * @author randerso * */ @@ -52,6 +53,7 @@ public class MagButtonHandler extends AbstractGlobalsButtonHandler implements protected void updateGlobalValue(IWorkbenchWindow changedWindow, UIElement element, Object value) { Double mag = (Double) value; + if (mag <= 0.1) mag=0.0; element.setText("Mag: " + mag); } } diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java index f8e9f364be..4e613951fd 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java @@ -47,6 +47,8 @@ import com.raytheon.viz.ui.EditorUtil; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jul 19, 2007 randerso Initial Creation. + * Sep 4, 2012 15335 kshresth Will now display lightning/wind + * fields when magnification set to 0 * * * @@ -71,7 +73,7 @@ public class MagHandler extends AbstractHandler implements IElementUpdater { double magnification = Double.parseDouble((arg0 .getParameter("magnification"))); if (editor != null) { - + if (magnification == 0.0f) magnification=0.1; IDisplayPane[] panes = editor.getDisplayPanes(); for (IDisplayPane pane : panes) { IRenderableDisplay disp = pane.getRenderableDisplay(); diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/36SHRMi.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/36SHRMi.xml new file mode 100644 index 0000000000..0d57d67a9a --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/36SHRMi.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/50dbzZ.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/50dbzZ.xml new file mode 100644 index 0000000000..cb4ea0e783 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/50dbzZ.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/AppT.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/AppT.xml new file mode 100644 index 0000000000..6968829aa9 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/AppT.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/BRNEHIi.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/BRNEHIi.xml new file mode 100644 index 0000000000..f11e37d5c6 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/BRNEHIi.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/BdEPT06.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/BdEPT06.xml new file mode 100644 index 0000000000..d792945fff --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/BdEPT06.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CFRZRc1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CFRZRc1.xml index 8c8437732e..9d51564698 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CFRZRc1.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CFRZRc1.xml @@ -18,4 +18,4 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - \ No newline at end of file + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CICEPc1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CICEPc1.xml index c78bfbf0e2..fe449497f8 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CICEPc1.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CICEPc1.xml @@ -18,4 +18,4 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - \ No newline at end of file + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CRAINc1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CRAINc1.xml index 1058a389b9..ddf3af9055 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CRAINc1.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CRAINc1.xml @@ -18,4 +18,4 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - \ No newline at end of file + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CSNOWc1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CSNOWc1.xml index d4002c6696..6eef869733 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CSNOWc1.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CSNOWc1.xml @@ -18,4 +18,4 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - \ No newline at end of file + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CritT1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CritT1.xml new file mode 100644 index 0000000000..61b8bec853 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CritT1.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DIABi.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DIABi.xml new file mode 100644 index 0000000000..0569a00ef4 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DIABi.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DpT.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DpT.xml index 096f49da23..ff51ccef0b 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DpT.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DpT.xml @@ -19,6 +19,13 @@ further_licensing_information. --> + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DthDt.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DthDt.xml new file mode 100644 index 0000000000..b2c36839bb --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DthDt.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EHI.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EHI.xml index 58134fed2e..2d19f30caa 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EHI.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EHI.xml @@ -19,6 +19,27 @@ further_licensing_information. --> + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EHIi.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EHIi.xml new file mode 100644 index 0000000000..4393383667 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EHIi.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EPVt1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EPVt1.xml new file mode 100644 index 0000000000..1e98bc33e6 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EPVt1.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EPVt2.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EPVt2.xml new file mode 100644 index 0000000000..8a685375c5 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/EPVt2.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Fzra1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Fzra1.xml new file mode 100644 index 0000000000..ca7dda14db --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Fzra1.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Fzra2.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Fzra2.xml new file mode 100644 index 0000000000..1fdfe96612 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Fzra2.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GH.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GH.xml index 053b2ac327..015a571c8a 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GH.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GH.xml @@ -19,6 +19,57 @@ further_licensing_information. --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GHxSM.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GHxSM.xml index bc0b12508d..dd4ba5d0c0 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GHxSM.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GHxSM.xml @@ -19,10 +19,16 @@ further_licensing_information. --> + + + + + + - + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/HIdx.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/HIdx.xml index 5f3dd97811..9a1bbde137 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/HIdx.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/HIdx.xml @@ -18,4 +18,66 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/HeliD.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/HeliD.xml new file mode 100644 index 0000000000..af649f31cc --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/HeliD.xml @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/IPLayer.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/IPLayer.xml new file mode 100644 index 0000000000..411aa16b5f --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/IPLayer.xml @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Mix1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Mix1.xml new file mode 100644 index 0000000000..87b5b1d3a5 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Mix1.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Mix2.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Mix2.xml new file mode 100644 index 0000000000..aa0063dd22 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Mix2.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/OmDiff.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/OmDiff.xml new file mode 100644 index 0000000000..5b72418328 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/OmDiff.xml @@ -0,0 +1,33 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/P.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/P.xml index b28a5139bb..504cdcaa72 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/P.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/P.xml @@ -19,7 +19,47 @@ further_licensing_information. --> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PTvA.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PTvA.xml index 712f170134..85c54a2cd9 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PTvA.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PTvA.xml @@ -19,6 +19,13 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PVV.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PVV.xml index 43b1dc64e3..fac0ec5f87 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PVV.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PVV.xml @@ -19,6 +19,18 @@ further_licensing_information. --> + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PW.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PW.xml index f61145d43f..d3c89b9e86 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PW.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PW.xml @@ -19,6 +19,9 @@ further_licensing_information. --> + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PoT.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PoT.xml index 99a53fac25..924d14dd87 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PoT.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PoT.xml @@ -19,6 +19,16 @@ further_licensing_information. --> + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH.xml index b23ae63649..6e82f13d44 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH.xml @@ -19,6 +19,25 @@ further_licensing_information. --> + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH_001_bin.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH_001_bin.xml new file mode 100644 index 0000000000..0befb37faf --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH_001_bin.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH_001_perts.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH_001_perts.xml new file mode 100644 index 0000000000..55d45ac3cc --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH_001_perts.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH_002_bin.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH_002_bin.xml new file mode 100644 index 0000000000..56cf14896f --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH_002_bin.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH_002_perts.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH_002_perts.xml new file mode 100644 index 0000000000..3f55f47edd --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RH_002_perts.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RMprop2.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RMprop2.xml new file mode 100644 index 0000000000..55ed7d91b6 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/RMprop2.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Rain1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Rain1.xml new file mode 100644 index 0000000000..902d66b11b --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Rain1.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Rain2.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Rain2.xml new file mode 100644 index 0000000000..b13ead5b29 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Rain2.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Rain3.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Rain3.xml new file mode 100644 index 0000000000..40e4ae48cf --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Rain3.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Ro.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Ro.xml new file mode 100644 index 0000000000..a3e852aadd --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Ro.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SHx.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SHx.xml index 56d4e1fe87..375424530f 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SHx.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SHx.xml @@ -19,7 +19,13 @@ further_licensing_information. --> - + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SRMm.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SRMm.xml new file mode 100644 index 0000000000..d7243010ab --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SRMm.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SRMmM.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SRMmM.xml new file mode 100644 index 0000000000..34a8bc1b67 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SRMmM.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Snow1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Snow1.xml new file mode 100644 index 0000000000..92b92768c4 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Snow1.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Snow2.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Snow2.xml new file mode 100644 index 0000000000..130481edbf --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Snow2.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Snow3.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Snow3.xml new file mode 100644 index 0000000000..c0cfc1fe6a --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Snow3.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SnowT.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SnowT.xml new file mode 100644 index 0000000000..84cb98c159 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SnowT.xml @@ -0,0 +1,32 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/StrTP.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/StrTP.xml new file mode 100644 index 0000000000..37e999fb2f --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/StrTP.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SuCP.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SuCP.xml new file mode 100644 index 0000000000..b12b92a6f0 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SuCP.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T.xml index b181101caa..2ca7b78207 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T.xml @@ -19,7 +19,40 @@ further_licensing_information. --> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TORi.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TORi.xml new file mode 100644 index 0000000000..2eb4860f4f --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TORi.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TORi2.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TORi2.xml new file mode 100644 index 0000000000..ba12a83bdf --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TORi2.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP12hr.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP12hr.xml index 34d7a6cc10..63b4bd6627 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP12hr.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP12hr.xml @@ -19,6 +19,9 @@ further_licensing_information. --> + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP24hr.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP24hr.xml index 043a293a69..51bca9eeeb 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP24hr.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP24hr.xml @@ -19,6 +19,9 @@ further_licensing_information. --> + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP24hr_avg.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP24hr_avg.xml new file mode 100644 index 0000000000..329180b7fa --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP24hr_avg.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP24hr_perts.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP24hr_perts.xml new file mode 100644 index 0000000000..0b1ce1d2ab --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP24hr_perts.xml @@ -0,0 +1,30 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP3hr.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP3hr.xml index 7f54ce20a9..d6abf43768 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP3hr.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP3hr.xml @@ -19,6 +19,9 @@ further_licensing_information. --> + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr.xml index 1b563d4548..454959cbb7 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr.xml @@ -19,7 +19,10 @@ further_licensing_information. --> - + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr_avg.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr_avg.xml new file mode 100644 index 0000000000..a9986f6b53 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr_avg.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr_perts.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr_perts.xml new file mode 100644 index 0000000000..3fcbbd8e46 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr_perts.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr_std.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr_std.xml new file mode 100644 index 0000000000..ffdc71dc20 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr_std.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TShrMi.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TShrMi.xml new file mode 100644 index 0000000000..3e8620a6eb --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TShrMi.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T_001_bin.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T_001_bin.xml new file mode 100644 index 0000000000..b457d50286 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T_001_bin.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T_001_perts.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T_001_perts.xml new file mode 100644 index 0000000000..bff92f9776 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T_001_perts.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Thom5.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Thom5.xml new file mode 100644 index 0000000000..a791af21c1 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Thom5.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Thom5a.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Thom5a.xml new file mode 100644 index 0000000000..f7ca8b4409 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Thom5a.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Thom6.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Thom6.xml new file mode 100644 index 0000000000..8a3e36ba69 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Thom6.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Tmax.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Tmax.xml new file mode 100644 index 0000000000..394c2565b9 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Tmax.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Tmin.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Tmin.xml new file mode 100644 index 0000000000..a8ed570b06 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Tmin.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Tstk.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Tstk.xml new file mode 100644 index 0000000000..e8e1e04ac2 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Tstk.xml @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TwMax.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TwMax.xml new file mode 100644 index 0000000000..47593b1651 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TwMax.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TwMin.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TwMin.xml new file mode 100644 index 0000000000..74e2c83bcc --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TwMin.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Twstk.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Twstk.xml new file mode 100644 index 0000000000..d3466d4dd0 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Twstk.xml @@ -0,0 +1,33 @@ + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TxSM.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TxSM.xml index b2340264b9..fe3b3b89a3 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TxSM.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TxSM.xml @@ -19,10 +19,16 @@ further_licensing_information. --> + + + + + + - - - - - + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml index 550260cb4d..97d633cf65 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml @@ -19,6 +19,9 @@ further_licensing_information. --> + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WndChl.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WndChl.xml index a9e0ffb2fa..6c195843f7 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WndChl.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WndChl.xml @@ -1,5 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/cTOT.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/cTOT.xml new file mode 100644 index 0000000000..4ff42e4b8b --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/cTOT.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/climoPW.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/climoPW.xml new file mode 100644 index 0000000000..9f70682f90 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/climoPW.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/climoPWimp.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/climoPWimp.xml new file mode 100644 index 0000000000..b00dda98bf --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/climoPWimp.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dPW1hr.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dPW1hr.xml new file mode 100644 index 0000000000..6469b83eca --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dPW1hr.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dPW3hr.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dPW3hr.xml new file mode 100644 index 0000000000..4b8b39755b --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dPW3hr.xml @@ -0,0 +1,31 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dPW6hr.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dPW6hr.xml new file mode 100644 index 0000000000..9a896171f8 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dPW6hr.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dZ.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dZ.xml index bf495ac644..76fb6ab32e 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dZ.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/dZ.xml @@ -19,6 +19,14 @@ further_licensing_information. --> + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/ehi01.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/ehi01.xml new file mode 100644 index 0000000000..6893efeb76 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/ehi01.xml @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/esp.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/esp.xml new file mode 100644 index 0000000000..09ef0d8e8d --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/esp.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/esp2.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/esp2.xml new file mode 100644 index 0000000000..b77dfedde2 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/esp2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/inv.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/inv.xml new file mode 100644 index 0000000000..3d74c90013 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/inv.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/lm6.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/lm6.xml new file mode 100644 index 0000000000..488f9c7772 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/lm6.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/loCape.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/loCape.xml index 8de7425d1e..dd9a984643 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/loCape.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/loCape.xml @@ -18,7 +18,15 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/maxEPT.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/maxEPT.xml new file mode 100644 index 0000000000..824c4c5773 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/maxEPT.xml @@ -0,0 +1,33 @@ + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/minEPT.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/minEPT.xml new file mode 100644 index 0000000000..938a3b9e19 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/minEPT.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/mixRat.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/mixRat.xml index 4ed4802922..a8cbfcd916 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/mixRat.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/mixRat.xml @@ -19,6 +19,12 @@ further_licensing_information. --> + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/mllcl.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/mllcl.xml new file mode 100644 index 0000000000..abe731aa40 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/mllcl.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/mmp.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/mmp.xml new file mode 100644 index 0000000000..867c16123f --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/mmp.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/msl-P.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/msl-P.xml index cc7d23fcee..70c4b3a462 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/msl-P.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/msl-P.xml @@ -19,7 +19,10 @@ further_licensing_information. --> - + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/nst.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/nst.xml new file mode 100644 index 0000000000..a739a95e69 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/nst.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/nst1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/nst1.xml new file mode 100644 index 0000000000..fe3b3fb053 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/nst1.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/nst2.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/nst2.xml new file mode 100644 index 0000000000..d42f89a9b0 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/nst2.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pec.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pec.xml new file mode 100644 index 0000000000..5b5da4bdf4 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pec.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pec_tt24.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pec_tt24.xml new file mode 100644 index 0000000000..fb79760575 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pec_tt24.xml @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_001.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_001.xml new file mode 100644 index 0000000000..3a81137181 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_001.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_002.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_002.xml new file mode 100644 index 0000000000..3e09e5393f --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_002.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_003.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_003.xml new file mode 100644 index 0000000000..becf451b7d --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_003.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_004.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_004.xml new file mode 100644 index 0000000000..e6e4289fcd --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_004.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_005.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_005.xml new file mode 100644 index 0000000000..adc13b6164 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_005.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_006.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_006.xml new file mode 100644 index 0000000000..d88aa2192d --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_006.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_007.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_007.xml new file mode 100644 index 0000000000..09dc1e0d5c --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_007.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_008.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_008.xml new file mode 100644 index 0000000000..fb0ab3a3e9 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_008.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_009.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_009.xml new file mode 100644 index 0000000000..4d5750b30c --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_009.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_010.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_010.xml new file mode 100644 index 0000000000..34ac1f995e --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_010.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_011.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_011.xml new file mode 100644 index 0000000000..14bca7b5ba --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_011.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_012.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_012.xml new file mode 100644 index 0000000000..fe6fa1c2c8 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_012.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_013.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_013.xml new file mode 100644 index 0000000000..dea6c760ef --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_013.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_014.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_014.xml new file mode 100644 index 0000000000..9ff65cebc1 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_014.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_015.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_015.xml new file mode 100644 index 0000000000..c8a4bd94e6 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_015.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_016.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_016.xml new file mode 100644 index 0000000000..eeb47b71d5 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/pop_016.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/qpv1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/qpv1.xml new file mode 100644 index 0000000000..4899296e03 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/qpv1.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/qpv2.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/qpv2.xml new file mode 100644 index 0000000000..50ce5bd47a --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/qpv2.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/qpv3.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/qpv3.xml new file mode 100644 index 0000000000..283a8a460e --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/qpv3.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/qpv4.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/qpv4.xml new file mode 100644 index 0000000000..6e94f9a83f --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/qpv4.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/rh_001.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/rh_001.xml new file mode 100644 index 0000000000..d3bcc5f961 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/rh_001.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/rh_002.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/rh_002.xml new file mode 100644 index 0000000000..3d20db2fa5 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/rh_002.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/rm6.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/rm6.xml new file mode 100644 index 0000000000..d05129d82f --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/rm6.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/snwa.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/snwa.xml new file mode 100644 index 0000000000..3516f4afec --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/snwa.xml @@ -0,0 +1,35 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/ssp.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/ssp.xml new file mode 100644 index 0000000000..8269fdd27b --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/ssp.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/stp1.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/stp1.xml new file mode 100644 index 0000000000..f312fa4f06 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/stp1.xml @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/t_001.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/t_001.xml new file mode 100644 index 0000000000..a1c40d78dd --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/t_001.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/uW.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/uW.xml index 719ff457e7..c9b69d8c96 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/uW.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/uW.xml @@ -19,7 +19,34 @@ further_licensing_information. --> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/ulwrf.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/ulwrf.xml new file mode 100644 index 0000000000..6486983c97 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/ulwrf.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/uswrf.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/uswrf.xml new file mode 100644 index 0000000000..4c54eb0457 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/uswrf.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/vTOT.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/vTOT.xml new file mode 100644 index 0000000000..30c4302957 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/vTOT.xml @@ -0,0 +1,31 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/vW.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/vW.xml index 1f7494de88..b6b308b42a 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/vW.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/vW.xml @@ -19,7 +19,34 @@ further_licensing_information. --> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp.xml index 575d014f61..d017b81b34 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp.xml @@ -19,6 +19,9 @@ further_licensing_information. --> + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_001.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_001.xml new file mode 100644 index 0000000000..e19a7cddaa --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_001.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_001_bin.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_001_bin.xml new file mode 100644 index 0000000000..eac5b1617e --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_001_bin.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_001_perts.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_001_perts.xml new file mode 100644 index 0000000000..75218ddf88 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_001_perts.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_002.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_002.xml new file mode 100644 index 0000000000..b3d4340ecf --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_002.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_002_bin.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_002_bin.xml new file mode 100644 index 0000000000..b2eb6b91f7 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_002_bin.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_002_perts.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_002_perts.xml new file mode 100644 index 0000000000..1589c2ee0f --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_002_perts.xml @@ -0,0 +1,28 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_003.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_003.xml new file mode 100644 index 0000000000..5ac682d18d --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_003.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_003_bin.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_003_bin.xml new file mode 100644 index 0000000000..496f4983ae --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_003_bin.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_003_perts.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_003_perts.xml new file mode 100644 index 0000000000..9fc7dc28a4 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_003_perts.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_004.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_004.xml new file mode 100644 index 0000000000..55a154c6fd --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_004.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_004_bin.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_004_bin.xml new file mode 100644 index 0000000000..b9bfc9f4bb --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_004_bin.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_004_perts.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_004_perts.xml new file mode 100644 index 0000000000..cf3d911d6a --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wSp_004_perts.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wcd.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wcd.xml new file mode 100644 index 0000000000..6bf069b9a0 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wcd.xml @@ -0,0 +1,31 @@ + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.kml.export.feature/build.properties b/cave/com.raytheon.uf.viz.kml.export.feature/build.properties old mode 100644 new mode 100755 diff --git a/cave/com.raytheon.uf.viz.kml.export.feature/feature.xml b/cave/com.raytheon.uf.viz.kml.export.feature/feature.xml old mode 100644 new mode 100755 diff --git a/cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject old mode 100644 new mode 100755 diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/WindRosePlotDlg.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/WindRosePlotDlg.java old mode 100755 new mode 100644 diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/LoaderDialog.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/LoaderDialog.java old mode 100755 new mode 100644 diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/SendDialog.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/SendDialog.java old mode 100755 new mode 100644 diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/utility/TransmissionQueueDlg.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/utility/TransmissionQueueDlg.java old mode 100755 new mode 100644 diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/HelpUsageDlg.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/HelpUsageDlg.java old mode 100755 new mode 100644 diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java old mode 100755 new mode 100644 diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java old mode 100755 new mode 100644 diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/sampler/ParmHisto.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/sampler/ParmHisto.java index 3b6575bd38..21cbbf9306 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/sampler/ParmHisto.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/sampler/ParmHisto.java @@ -22,12 +22,12 @@ package com.raytheon.viz.gfe.sampler; import java.awt.Point; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import com.raytheon.uf.common.dataplugin.gfe.GridDataHistory; import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridParmInfo; @@ -47,6 +47,7 @@ import com.raytheon.uf.common.time.TimeRange; * May 21, 2008 1167 mnash Initial creation * Sep 3, 2008 1283 njensen Fixed issues * Jun 15, 2012 14994 ryu Fixed NPE on _minMaxSumHP + * Sep 10, 2012 15306 ryu Order _minMaxSumHP list by HistValue * * * @@ -444,7 +445,7 @@ public class ParmHisto { */ private List makeHistogramFromPoints(List points, GridParmInfo info) { - Map hp = new HashMap(); + Map hp = new TreeMap(); for (int i = 0; i < points.size(); i++) { Float val = binit(points.get(i), _resolution); Integer count = hp.get(val); diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java old mode 100755 new mode 100644 index d30393685c..594a89f1f5 --- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java +++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java @@ -1989,7 +1989,6 @@ public class TabularTimeSeriesDlg extends CaveSWTDialog implements || ts.toUpperCase().startsWith("C")) { dr.setBasisTime(basistime); - dataRecordList.add(dr); /* Delete all rows that have been selected */ String where = createUpdDelWhereFcst(td, dr); queryList.add("delete from " + tablename + " " + where); @@ -2025,14 +2024,17 @@ public class TabularTimeSeriesDlg extends CaveSWTDialog implements + " An error occurred executing load_obs_river function", e); } } - - if (pe.toUpperCase().startsWith("H") + if (ts.toUpperCase().startsWith("F") + || ts.toUpperCase().startsWith("C")) { + if (pe.toUpperCase().startsWith("H") || pe.toUpperCase().startsWith("Q")) { - try { - LoadMaxFcst.loadMaxFcstItem(lid, pe, ts); - } catch (VizException e) { - statusHandler.handle(Priority.PROBLEM, "Data Query:" + + try { + LoadMaxFcst.loadMaxFcstItem(lid, pe, ts); + } catch (VizException e) { + statusHandler.handle(Priority.PROBLEM, "Data Query:" + " An error occurred executing loadMaxFcst function", e); + } } } } @@ -2838,7 +2840,7 @@ public class TabularTimeSeriesDlg extends CaveSWTDialog implements private String createUpdDelWhereFcst(TabularData td, DataRecord dr) { final String format = " where lid = '%s' and pe = '%s' " + "and validtime = '%s' and basistime = '%s' " - + "and dur = %d and ts = '%s' and extremum = '%s' "; + + "and dur = %d and ts = '%s' and extremum = '%s' ; "; String where = String.format(format, dr.getLid(), dr.getPe(), HydroConstants.DATE_FORMAT.format(dr.getObsTime()), diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/CountyZoneUgcDataManager.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/CountyZoneUgcDataManager.java index bc5a4d577c..894ddd04f8 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/CountyZoneUgcDataManager.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/CountyZoneUgcDataManager.java @@ -36,6 +36,7 @@ import com.raytheon.viz.hydrocommon.data.ZoneInfoData; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jan 5, 2009 1802 askripsky Initial Creation + * Sep 11,2012 15362 wkwock Fix selected zones * * * @@ -158,7 +159,7 @@ public class CountyZoneUgcDataManager { * @throws VizException */ public ArrayList getZonesSelected() throws VizException { - return getZonesSelected(false); + return getZonesSelected(true); } /** diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/B44AReport.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/B44AReport.java index 614d4b395d..e0a988140f 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/B44AReport.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/B44AReport.java @@ -34,6 +34,7 @@ import com.raytheon.viz.hydrocommon.whfslib.GeoUtil; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Sep 18, 2009 2260 mpduff Initial creation + * Sep 11, 2012 13781 wkwock add print menu * * * @@ -53,7 +54,7 @@ public class B44AReport extends TextReport { private int b44aLastPage = B44A_COOPERATIVE; - private String lid = null; + protected String lid = null; TextReportData locB44AData; @@ -166,7 +167,7 @@ public class B44AReport extends TextReport { if ((data.getObserver().getLastname() != null) && (data.getObserver().getLastname().length() > 0)) { - name.concat(data.getObserver().getLastname()); + name = name.concat(data.getObserver().getLastname()); } String dos; diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/E19AReport.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/E19AReport.java index 7e5b0569ff..4bc32ad21f 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/E19AReport.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/E19AReport.java @@ -38,6 +38,7 @@ import com.raytheon.viz.hydrocommon.whfslib.GeoUtil; * ------------ ---------- ----------- -------------------------- * Sep 18, 2009 2260 mpduff Initial creation * Apr 25, 2012 14499 wkwock Refine format, query, etc + * Sep 11, 2012 13781 wkwock add print menu * * * @@ -47,7 +48,7 @@ import com.raytheon.viz.hydrocommon.whfslib.GeoUtil; public class E19AReport extends E19Report { private static final int E19A_SUMMARY = 0; - private static final int E19A_ALLPAGES = 1; + protected static final int E19A_ALLPAGES = 1; private int e19aFirstPage = E19A_SUMMARY; private int e19aLastPage = E19A_SUMMARY; diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintB44ATextReportDlg.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintB44ATextReportDlg.java new file mode 100644 index 0000000000..b00d462905 --- /dev/null +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintB44ATextReportDlg.java @@ -0,0 +1,88 @@ +/** + * This software was developed and / or modified by Raytheon Company, + * pursuant to Contract DG133W-05-CQ-1067 with the US Government. + * + * U.S. EXPORT CONTROLLED TECHNICAL DATA + * This software product contains export-restricted data whose + * export/transfer/disclosure is restricted by U.S. law. Dissemination + * to non-U.S. persons whether in the United States or abroad requires + * an export license or other authorization. + * + * Contractor Name: Raytheon Company + * Contractor Address: 6825 Pine Street, Suite 340 + * Mail Stop B8 + * Omaha, NE 68106 + * 402.291.0100 + * + * See the AWIPS II Master Rights File ("Master Rights File.pdf") for + * further licensing information. + **/ + +package com.raytheon.viz.hydrocommon.textreport; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; + +/** + * print menu for report B-44A. + * + * 
+ * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Sep 11, 2012 13781      wkwock     Initial creation
+ * 
+ *
+ * + * @author wkwock + * @version 1.0 + */ +public class PrintB44ATextReportDlg extends PrintTextReportDlg { + private B44AReport report=null; + + protected PrintB44ATextReportDlg(Shell parentShell, B44AReport rpt) { + super(parentShell, rpt); + this.report=rpt; + this.setText("B-44A (Cooperative) - Print - " + report.lid); + } + + @Override + protected void initializeComponents(Shell shell) { + createTableOfContents(); + createBottomButtons(); + } + + private void createTableOfContents(){ + GridData gd = new GridData(GridData.FILL_BOTH); + Composite comp = new Composite(shell, SWT.NONE); + GridLayout gridLayout = new GridLayout(1, false); + comp.setLayout(gridLayout); + comp.setLayoutData(gd); + Label header = new Label(comp, SWT.RIGHT); + header.setText(" B-44A (SCooperative) Report:"); + + Label seperator1=new Label(comp, SWT.SEPARATOR | SWT.HORIZONTAL); + seperator1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + Label singlePageLbl = new Label(comp, SWT.None); + singlePageLbl.setText("An Unofficial Cooperative Report\nfor station "+report.lid); + Label seperator2=new Label(comp,SWT.NONE); + seperator2.setText("==========================="); + + Label seperator3=new Label(comp, SWT.SEPARATOR | SWT.HORIZONTAL | SWT.BOLD); + seperator3.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + } + + /** + * Get print data for selected contents from the report + */ + protected String getPrintData () { + return report.getText(B44AReport.STNCLASS_ALLPAGES).replace("null", ""); + } +} diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintE19ATextReportDlg.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintE19ATextReportDlg.java new file mode 100644 index 0000000000..20cc532417 --- /dev/null +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintE19ATextReportDlg.java @@ -0,0 +1,88 @@ +/** + * This software was developed and / or modified by Raytheon Company, + * pursuant to Contract DG133W-05-CQ-1067 with the US Government. + * + * U.S. EXPORT CONTROLLED TECHNICAL DATA + * This software product contains export-restricted data whose + * export/transfer/disclosure is restricted by U.S. law. Dissemination + * to non-U.S. persons whether in the United States or abroad requires + * an export license or other authorization. + * + * Contractor Name: Raytheon Company + * Contractor Address: 6825 Pine Street, Suite 340 + * Mail Stop B8 + * Omaha, NE 68106 + * 402.291.0100 + * + * See the AWIPS II Master Rights File ("Master Rights File.pdf") for + * further licensing information. + **/ +package com.raytheon.viz.hydrocommon.textreport; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; + +/** + * print menu for report E-19A. + * + * 
+ * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Sep 11, 2012 13781      wkwock     Initial creation
+ * 
+ *
+ * + * @author wkwock + * @version 1.0 + */ + +public class PrintE19ATextReportDlg extends PrintTextReportDlg { + private E19AReport report=null; + + protected PrintE19ATextReportDlg(Shell parentShell, E19AReport rpt) { + super(parentShell, rpt); + this.report=rpt; + this.setText("E-19A (Summary) - Print - " + report.lid); + } + + @Override + protected void initializeComponents(Shell shell) { + createTableOfContents(); + createBottomButtons(); + } + + private void createTableOfContents(){ + GridData gd = new GridData(GridData.FILL_BOTH); + Composite comp = new Composite(shell, SWT.NONE); + GridLayout gridLayout = new GridLayout(1, false); + comp.setLayout(gridLayout); + comp.setLayoutData(gd); + Label header = new Label(comp, SWT.RIGHT); + header.setText(" E-19A (Summary) Report:"); + + Label seperator1=new Label(comp, SWT.SEPARATOR | SWT.HORIZONTAL); + seperator1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + Label singlePageLbl = new Label(comp, SWT.None); + singlePageLbl.setText("A Single-page Summary Report\nfor station "+report.lid); + Label seperator2=new Label(comp,SWT.NONE); + seperator2.setText("==========================="); + + Label seperator3=new Label(comp, SWT.SEPARATOR | SWT.HORIZONTAL | SWT.BOLD); + seperator3.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + } + + /** + * Get print data for selected contents from the report + */ + protected String getPrintData () { + return report.getText(E19AReport.E19A_ALLPAGES).replace("null", ""); + } +} diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintE19TextReportDlg.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintE19TextReportDlg.java new file mode 100644 index 0000000000..9e04e242cf --- /dev/null +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintE19TextReportDlg.java @@ -0,0 +1,257 @@ +/** + * This software was developed and / or modified by Raytheon Company, + * pursuant to Contract DG133W-05-CQ-1067 with the US Government. + * + * U.S. EXPORT CONTROLLED TECHNICAL DATA + * This software product contains export-restricted data whose + * export/transfer/disclosure is restricted by U.S. law. Dissemination + * to non-U.S. persons whether in the United States or abroad requires + * an export license or other authorization. + * + * Contractor Name: Raytheon Company + * Contractor Address: 6825 Pine Street, Suite 340 + * Mail Stop B8 + * Omaha, NE 68106 + * 402.291.0100 + * + * See the AWIPS II Master Rights File ("Master Rights File.pdf") for + * further licensing information. + **/ +package com.raytheon.viz.hydrocommon.textreport; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.graphics.Color; + + +import com.raytheon.viz.hydrocommon.textreport.TextReportConstants.E19Pages; +/** + * print menu for report E-19. + * + * 
+ * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Sep 11, 2012 13781      wkwock     Initial creation
+ * 
+ *
+ * + * @author wkwock + * @version 1.0 + */ + +public class PrintE19TextReportDlg extends PrintTextReportDlg { + private E19Report report=null; + Button converBtn = null; + Button mapBtn = null; + Button benchmarkBtn = null; + Button gagesBtn = null; + Button historyBtn = null; + Button crestsBtn = null; + Button lowWaterBtn = null; + Button conditionsBtn = null; + Button damageBtn = null; + Button riverStageBtn = null; + Button contactsBtn = null; + Button allPageBtn = null; + + protected PrintE19TextReportDlg(Shell parentShell, E19Report rpt) { + super(parentShell, rpt); + this.report=rpt; + this.setText("E-19 - Print - " + report.lid); + } + + @Override + protected void initializeComponents(Shell shell) { + createTableOfContents(); + createBottomButtons(); + } + + private void createTableOfContents(){ + GridData gd = new GridData(GridData.FILL_BOTH); + Composite comp = new Composite(shell, SWT.NONE); + GridLayout gridLayout = new GridLayout(1, false); + comp.setLayout(gridLayout); + comp.setLayoutData(gd); + Label header = new Label(comp, SWT.RIGHT); + header.setText(" E-19 Report Contents:"); + + Label seperator1=new Label(comp, SWT.SEPARATOR | SWT.HORIZONTAL); + seperator1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + converBtn = new Button(comp, SWT.CHECK); + converBtn.setText(E19Pages.COVER.getPageName().toUpperCase()); + converBtn.addSelectionListener(new E19Selection()); + mapBtn = new Button(comp, SWT.CHECK); + mapBtn.setText(E19Pages.MAP_GAGE_LOCATION.getPageName().toUpperCase()); + mapBtn.addSelectionListener(new E19Selection()); + benchmarkBtn = new Button(comp, SWT.CHECK); + benchmarkBtn.setText(E19Pages.BENCHMARKS.getPageName().toUpperCase()); + benchmarkBtn.addSelectionListener(new E19Selection()); + gagesBtn = new Button(comp, SWT.CHECK); + gagesBtn.setText(E19Pages.GAGES.getPageName().toUpperCase()); + gagesBtn.addSelectionListener(new E19Selection()); + historyBtn = new Button(comp, SWT.CHECK); + historyBtn.setText(E19Pages.HISTORY.getPageName().toUpperCase()); + historyBtn.addSelectionListener(new E19Selection()); + crestsBtn = new Button(comp, SWT.CHECK); + crestsBtn.setText(E19Pages.CRESTS.getPageName().toUpperCase()); + crestsBtn.addSelectionListener(new E19Selection()); + lowWaterBtn = new Button(comp, SWT.CHECK); + lowWaterBtn.setText(E19Pages.LOW_WATER_RECORDS.getPageName().toUpperCase()); + lowWaterBtn.addSelectionListener(new E19Selection()); + conditionsBtn = new Button(comp, SWT.CHECK); + conditionsBtn.setText(E19Pages.CONDITIONS_AFFECTING_FLOW.getPageName().toUpperCase()); + conditionsBtn.addSelectionListener(new E19Selection()); + damageBtn = new Button(comp, SWT.CHECK); + damageBtn.setText(E19Pages.DAMAGE.getPageName().toUpperCase()); + damageBtn.addSelectionListener(new E19Selection()); + riverStageBtn = new Button(comp, SWT.CHECK); + riverStageBtn.setText(E19Pages.RIVER_STAGE_DATA.getPageName().toUpperCase()); + riverStageBtn.addSelectionListener(new E19Selection()); + contactsBtn = new Button(comp, SWT.CHECK); + contactsBtn.setText(E19Pages.CONTACTS.getPageName().toUpperCase()); + contactsBtn.addSelectionListener(new E19Selection()); + + Label seperator2=new Label(comp,SWT.NONE); + seperator2.setText("==========================="); + + allPageBtn = new Button(comp, SWT.CHECK); + allPageBtn.setText("ALL PAGES"); + shell.getDisplay(); + allPageBtn.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_YELLOW)); + allPageBtn.addSelectionListener(new E19Selection()); + allPageBtn.setSelection(true); + + Label seperator3=new Label(comp, SWT.SEPARATOR | SWT.HORIZONTAL | SWT.BOLD); + seperator3.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + } + + /** + * Get print data for selected contents from the report + */ + protected String getPrintData () { + String text=""; + if (allPageBtn.getSelection()) { + text = report.getText(E19Report.E19_ALLPAGES); + }else { + if (converBtn.getSelection()) { + text += report.getText(E19Report.E19_COVER); + } + if (mapBtn.getSelection()){ + text += report.getText(E19Report.E19_MAPPAGE); + } + if (benchmarkBtn.getSelection()){ + text += report.getText(E19Report.E19_BENCHMARKS); + } + if (gagesBtn.getSelection()){ + text += report.getText(E19Report.E19_GAGES); + } + if (historyBtn.getSelection()){ + text += report.getText(E19Report.E19_HISTORY); + } + if (crestsBtn.getSelection()){ + text += report.getText(E19Report.E19_CRESTS); + } + if (lowWaterBtn.getSelection()){ + text += report.getText(E19Report.E19_LOWWATER); + } + if (conditionsBtn.getSelection()){ + text += report.getText(E19Report.E19_CONDITIONS); + } + if (damageBtn.getSelection()){ + text += report.getText(E19Report.E19_DAMAGE); + } + if (riverStageBtn.getSelection()){ + text += report.getText(E19Report.E19_STAFFGAGE); + } + if (contactsBtn.getSelection()){ + text += report.getText(E19Report.E19_CONTACTS); + } + } + return text.replace("null", ""); + } + + /** + * Class for the table of contents clicks + * @author wkwock + * + */ + private class E19Selection extends SelectionAdapter{ + public void widgetSelected(SelectionEvent e) { + Color yellow=Display.getCurrent().getSystemColor(SWT.COLOR_YELLOW); + Color black=Display.getCurrent().getSystemColor(SWT.COLOR_BLACK); + Color red=Display.getCurrent().getSystemColor(SWT.COLOR_RED); + + Button button = (Button) e.getSource(); + if (button.equals(allPageBtn)) {//selected button is not allpage + mapBtn.setSelection(false); + benchmarkBtn.setSelection(false); + benchmarkBtn.setForeground(black); + gagesBtn.setSelection(false); + gagesBtn.setForeground(black); + historyBtn.setSelection(false); + historyBtn.setForeground(black); + crestsBtn.setSelection(false); + crestsBtn.setForeground(black); + lowWaterBtn.setSelection(false); + lowWaterBtn.setForeground(black); + conditionsBtn.setSelection(false); + conditionsBtn.setForeground(black); + damageBtn.setSelection(false); + damageBtn.setForeground(black); + riverStageBtn.setSelection(false); + contactsBtn.setSelection(false); + + if (allPageBtn.getSelection()) { //all page select to on + allPageBtn.setForeground(yellow); + converBtn.setSelection(false); + } else { //all page select to off + converBtn.setSelection(true); + allPageBtn.setForeground(black); + } + }else {//selected button is not allpage + allPageBtn.setSelection(false); + allPageBtn.setForeground(black); + + if (button.getSelection()) {//seleted button is on + if (button.equals(benchmarkBtn) || + button.equals(gagesBtn) || + button.equals(historyBtn) || + button.equals(crestsBtn) || + button.equals(lowWaterBtn) || + button.equals(conditionsBtn) || + button.equals(damageBtn) ) { + button.setForeground(red); + } + } else {//seleted button is off + button.setForeground(black); + if (!converBtn.getSelection() && + !mapBtn.getSelection() && + !benchmarkBtn.getSelection() && + !gagesBtn.getSelection() && + !historyBtn.getSelection() && + !crestsBtn.getSelection() && + !lowWaterBtn.getSelection() && + !conditionsBtn.getSelection() && + !damageBtn.getSelection() && + !riverStageBtn.getSelection() && + !contactsBtn.getSelection() ) { //every thing is off then allpage must be on + allPageBtn.setSelection(true); + allPageBtn.setForeground(yellow); + } + } + } + } + } +} diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintSortedStnTextReportDlg.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintSortedStnTextReportDlg.java new file mode 100644 index 0000000000..9befa9b13e --- /dev/null +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintSortedStnTextReportDlg.java @@ -0,0 +1,215 @@ +/** + * This software was developed and / or modified by Raytheon Company, + * pursuant to Contract DG133W-05-CQ-1067 with the US Government. + * + * U.S. EXPORT CONTROLLED TECHNICAL DATA + * This software product contains export-restricted data whose + * export/transfer/disclosure is restricted by U.S. law. Dissemination + * to non-U.S. persons whether in the United States or abroad requires + * an export license or other authorization. + * + * Contractor Name: Raytheon Company + * Contractor Address: 6825 Pine Street, Suite 340 + * Mail Stop B8 + * Omaha, NE 68106 + * 402.291.0100 + * + * See the AWIPS II Master Rights File ("Master Rights File.pdf") for + * further licensing information. + **/ + +package com.raytheon.viz.hydrocommon.textreport; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.graphics.Color; + +import com.raytheon.viz.hydrocommon.textreport.TextReportConstants.StationListSort; +/** + * print menu for Sorted Station text report. + * + * 
+ * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Sep 11, 2012 13781      wkwock     Initial creation
+ * 
+ *
+ * + * @author wkwock + * @version 1.0 + */ + +public class PrintSortedStnTextReportDlg extends PrintTextReportDlg { + private StationListReport report=null; + TextReportDlg textReportDlg; + + Button nameBtn = null; + Button locationID = null; + Button countyBtn = null; + Button basinBtn = null; + Button observerBtn = null; + Button allPageBtn = null; + + protected PrintSortedStnTextReportDlg(Shell parentShell, StationListReport rpt) { + super(parentShell, rpt); + this.report=rpt; + this.setText("Sorted Station List - Print"); + } + + public void setTextReportDlg(TextReportDlg txtRptDlg) { + textReportDlg = txtRptDlg; + } + + @Override + protected void initializeComponents(Shell shell) { + createTableOfContents(); + createBottomButtons(); + } + + private void createTableOfContents(){ + GridData gd = new GridData(GridData.FILL_BOTH); + Composite comp = new Composite(shell, SWT.NONE); + GridLayout gridLayout = new GridLayout(1, false); + comp.setLayout(gridLayout); + comp.setLayoutData(gd); + Label header = new Label(comp, SWT.RIGHT); + header.setText(" Sorted Station List Report, sort by:"); + + Label seperator1=new Label(comp, SWT.SEPARATOR | SWT.HORIZONTAL); + seperator1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + locationID = new Button(comp, SWT.CHECK); + locationID.setText(StationListSort.LOCATION_ID.getStationSortType().toUpperCase()); + locationID.addSelectionListener(new PrintSelection()); + nameBtn = new Button(comp, SWT.CHECK); + nameBtn.setText(StationListSort.NAME.getStationSortType().toUpperCase()); + nameBtn.addSelectionListener(new PrintSelection()); + countyBtn = new Button(comp, SWT.CHECK); + countyBtn.setText(StationListSort.COUNTY.getStationSortType().toUpperCase()); + countyBtn.addSelectionListener(new PrintSelection()); + basinBtn = new Button(comp, SWT.CHECK); + basinBtn.setText(StationListSort.BASIN.getStationSortType().toUpperCase()); + basinBtn.addSelectionListener(new PrintSelection()); + observerBtn = new Button(comp, SWT.CHECK); + observerBtn.setText(StationListSort.OBSERVER.getStationSortType().toUpperCase()); + observerBtn.addSelectionListener(new PrintSelection()); + + Label seperator2=new Label(comp,SWT.NONE); + seperator2.setText("==========================="); + + allPageBtn = new Button(comp, SWT.CHECK); + allPageBtn.setText("(ALL TYPES)"); + shell.getDisplay(); + allPageBtn.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_YELLOW)); + allPageBtn.addSelectionListener(new PrintSelection()); + allPageBtn.setSelection(true); + + Label seperator3=new Label(comp, SWT.SEPARATOR | SWT.HORIZONTAL | SWT.BOLD); + seperator3.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + } + + /** + * Get print data for selected contents from the report + */ + protected String getPrintData () { + int sortIndex=textReportDlg.getPageSelectionIndex(); + int[] sortArray=report.getSortArray(sortIndex); + + if (!allPageBtn.getSelection()) { + for (int i=0; i + * + * SOFTWARE HISTORY + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Sep 11, 2012 13781 wkwock Initial creation + * + * + * + * @author wkwock + * @version 1.0 + */ + +public class PrintStnClassTextReportDlg extends PrintTextReportDlg { +private StationClassReport report=null; + + protected PrintStnClassTextReportDlg(Shell parentShell, StationClassReport rpt) { + super(parentShell, rpt); + this.report=rpt; + this.setText("Station Class - Print"); + } + + @Override + protected void initializeComponents(Shell shell) { + createTableOfContents(); + createBottomButtons(); + } + + private void createTableOfContents(){ + GridData gd = new GridData(GridData.FILL_BOTH); + Composite comp = new Composite(shell, SWT.NONE); + GridLayout gridLayout = new GridLayout(1, false); + comp.setLayout(gridLayout); + comp.setLayoutData(gd); + Label header = new Label(comp, SWT.RIGHT); + header.setText(" Station Class Report:"); + + Label seperator1=new Label(comp, SWT.SEPARATOR | SWT.HORIZONTAL); + seperator1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + Label singlePageLbl = new Label(comp, SWT.None); + singlePageLbl.setText("Station Class Information\nfor All stations"); + Label seperator2=new Label(comp,SWT.NONE); + seperator2.setText("==========================="); + + Label seperator3=new Label(comp, SWT.SEPARATOR | SWT.HORIZONTAL | SWT.BOLD); + seperator3.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + } + + /** + * Get print data for selected contents from the report + */ + protected String getPrintData () { + return report.getText(StationClassReport.STNCLASS_ALLPAGES).replace("null", ""); + } +} diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintSvcBkTextReportDlg.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintSvcBkTextReportDlg.java new file mode 100644 index 0000000000..1a550d2784 --- /dev/null +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintSvcBkTextReportDlg.java @@ -0,0 +1,92 @@ +/** + * This software was developed and / or modified by Raytheon Company, + * pursuant to Contract DG133W-05-CQ-1067 with the US Government. + * + * U.S. EXPORT CONTROLLED TECHNICAL DATA + * This software product contains export-restricted data whose + * export/transfer/disclosure is restricted by U.S. law. Dissemination + * to non-U.S. persons whether in the United States or abroad requires + * an export license or other authorization. + * + * Contractor Name: Raytheon Company + * Contractor Address: 6825 Pine Street, Suite 340 + * Mail Stop B8 + * Omaha, NE 68106 + * 402.291.0100 + * + * See the AWIPS II Master Rights File ("Master Rights File.pdf") for + * further licensing information. + **/ +package com.raytheon.viz.hydrocommon.textreport; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +/** + * print menu for report Service backup. + * + * 
+ * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Sep 11, 2012 13781      wkwock     Initial creation
+ * 
+ *
+ * + * @author wkwock + * @version 1.0 + */ + +public class PrintSvcBkTextReportDlg extends PrintTextReportDlg { +private ServiceBackupReport report=null; +private TextReportDlg textReportDlg=null; + + protected PrintSvcBkTextReportDlg(Shell parentShell, ServiceBackupReport rpt) { + super(parentShell, rpt); + this.report=rpt; + this.setText("Service Backup - Print"); //dialog title + } + + @Override + protected void initializeComponents(Shell shell) { + createTableOfContents(); + createBottomButtons(); + } + + private void createTableOfContents(){ + GridData gd = new GridData(GridData.FILL_BOTH); + Composite comp = new Composite(shell, SWT.NONE); + GridLayout gridLayout = new GridLayout(1, false); + comp.setLayout(gridLayout); + comp.setLayoutData(gd); + Label header = new Label(comp, SWT.RIGHT); + header.setText(" Service Backup Report, sort by:"); + + Label seperator1=new Label(comp, SWT.SEPARATOR | SWT.HORIZONTAL); + seperator1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + Label singlePageLbl = new Label(comp, SWT.None); + singlePageLbl.setText("Service Backup Information\nfor All stations"); + Label seperator2=new Label(comp,SWT.NONE); + seperator2.setText("==========================="); + + Label seperator3=new Label(comp, SWT.SEPARATOR | SWT.HORIZONTAL | SWT.BOLD); + seperator3.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + } + + /** + * Get print data for selected contents from the report + */ + protected String getPrintData () { + return report.getText(textReportDlg.getPageSelectionIndex()); + } + + public void setTextReportDlg(TextReportDlg txtRptDlg) { + this.textReportDlg=txtRptDlg; + } +} diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintTextReportDlg.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintTextReportDlg.java new file mode 100644 index 0000000000..b21feb2229 --- /dev/null +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/PrintTextReportDlg.java @@ -0,0 +1,298 @@ +/** + * This software was developed and / or modified by Raytheon Company, + * pursuant to Contract DG133W-05-CQ-1067 with the US Government. + * + * U.S. EXPORT CONTROLLED TECHNICAL DATA + * This software product contains export-restricted data whose + * export/transfer/disclosure is restricted by U.S. law. Dissemination + * to non-U.S. persons whether in the United States or abroad requires + * an export license or other authorization. + * + * Contractor Name: Raytheon Company + * Contractor Address: 6825 Pine Street, Suite 340 + * Mail Stop B8 + * Omaha, NE 68106 + * 402.291.0100 + * + * See the AWIPS II Master Rights File ("Master Rights File.pdf") for + * further licensing information. + **/ +package com.raytheon.viz.hydrocommon.textreport; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.GC; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.RGB; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.printing.PrintDialog; +import org.eclipse.swt.printing.Printer; +import org.eclipse.swt.printing.PrinterData; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Shell; + +import com.raytheon.viz.ui.dialogs.CaveSWTDialog; +/** + * generic print menu for reports. + * + * 
+ * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Sep 11, 2012 13781      wkwock     Initial creation
+ * 
+ *
+ * + * @author wkwock + * @version 1.0 + */ + +public class PrintTextReportDlg extends CaveSWTDialog { + /** + * Text viewer. + */ + + protected TextReport report; + + /* Vars used in the printing methods */ + private Printer printer; + + private int lineHeight = 0; + + private int tabWidth = 0; + + private int leftMargin; + + private int rightMargin; + + private int topMargin; + + private int bottomMargin; + + private int x, y; + + private int index, end; + + private StringBuffer wordBuffer; + + private GC gc; + + + protected PrintTextReportDlg(Shell parentShell,TextReport report) { + super(parentShell); + this.report=report; + } + + @Override + protected void initializeComponents(Shell shell) { + // TODO Auto-generated method stub + createBottomButtons(); + } + + /** + * Send the text to the printer + * + * @param printer + * The printer + * @param text + * The text to print + */ + private void print(Printer printer, String text) { + if (printer.startJob("Text")) { + Rectangle clientArea = printer.getClientArea(); + Rectangle trim = printer.computeTrim(0, 0, 0, 0); + Point dpi = printer.getDPI(); + leftMargin = dpi.x + trim.x; // one inch from left side of paper + // one inch from right side of paper + rightMargin = clientArea.width - dpi.x + trim.x + trim.width; + topMargin = dpi.y + trim.y; // one inch from top edge of paper + // one inch from bottom edge of paper + bottomMargin = clientArea.height - dpi.y + trim.y + trim.height; + + /* Create a buffer for computing tab width. */ + int tabSize = 4; // is tab width a user setting in your UI? + StringBuffer tabBuffer = new StringBuffer(tabSize); + for (int i = 0; i < tabSize; i++) { + tabBuffer.append(' '); + } + String tabs = tabBuffer.toString(); + + /* + * Create printer GC, and create and set the printer font & + * foreground color. + */ + gc = new GC(printer); + + Font printerFont = new Font(printer, "Monospace", 8, SWT.NORMAL); + + Color printerForegroundColor = new Color(printer, new RGB(0, 0, 0)); + Color printerBackgroundColor = new Color(printer, new RGB(255, 255, + 255)); + + gc.setFont(printerFont); + gc.setForeground(printerForegroundColor); + gc.setBackground(printerBackgroundColor); + tabWidth = gc.stringExtent(tabs).x; + lineHeight = gc.getFontMetrics().getHeight(); + + /* Print text to current gc using word wrap */ + printText(text); + + printer.endJob(); + + /* Cleanup graphics resources used in printing */ + printerFont.dispose(); + printerForegroundColor.dispose(); + printerBackgroundColor.dispose(); + gc.dispose(); + } + } + + /** + * Print the text + * + * @param text + * The text to be printed + */ + private void printText(String text) { + printer.startPage(); + wordBuffer = new StringBuffer(); + x = leftMargin; + y = topMargin; + index = 0; + end = text.length(); + while (index < end) { + char c = text.charAt(index); + index++; + if (c != 0) { + if ((c == 0x0a) || (c == 0x0d)) { + if ((c == 0x0d) && (index < end) + && (text.charAt(index) == 0x0a)) { + index++; // if this is cr-lf, skip the lf + } + printWordBuffer(); + newline(); + } else { + if (c != '\t') { + wordBuffer.append(c); + } + if (Character.isWhitespace(c)) { + printWordBuffer(); + if (c == '\t') { + x += tabWidth; + } + } + } + } + } + if (y + lineHeight <= bottomMargin) { + printer.endPage(); + } + } + /** + * Word buffer for formating lines on the printed page + */ + private void printWordBuffer() { + if (wordBuffer.length() > 0) { + String word = wordBuffer.toString(); + int wordWidth = gc.stringExtent(word).x; + if (x + wordWidth > rightMargin) { + /* word doesn't fit on current line, so wrap */ + newline(); + } + gc.drawString(word, x, y, false); + x += wordWidth; + wordBuffer = new StringBuffer(); + } + } + + /** + * New line on the printed page + */ + private void newline() { + x = leftMargin; + y += lineHeight; + if (y + lineHeight > bottomMargin) { + printer.endPage(); + if (index + 1 < end) { + y = topMargin; + printer.startPage(); + } + } + } + + /** + * Get data for selected contents for printing + * @return + */ + protected String getPrintData () { + return ""; + } + + /** + * Create the buttons at the bottom of the display. + */ + protected void createBottomButtons() { + GridData mainBtnData = new GridData(SWT.FILL, SWT.DEFAULT, true, false); + Composite btnComp = new Composite(shell, SWT.NONE); + GridLayout btnGl = new GridLayout(3, false); + btnComp.setLayout(btnGl); + btnComp.setLayoutData(mainBtnData); + + GridData gd = new GridData(SWT.BEGINNING, SWT.DEFAULT, true, false); + gd.widthHint = 110; + Button closeBtn = new Button(btnComp, SWT.PUSH); + closeBtn.setText("Close"); + closeBtn.setLayoutData(gd); + closeBtn.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + shell.dispose(); + } + }); + + gd = new GridData(SWT.END, SWT.DEFAULT, true, false); + gd.widthHint = 110; + Button printBtn = new Button(btnComp, SWT.PUSH); + printBtn.setText("Print"); + printBtn.setLayoutData(gd); + printBtn.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + final String text = getPrintData(); + + if (text != null) { + PrintDialog dialog = new PrintDialog(shell, SWT.NONE); + PrinterData data = dialog.open(); + + if (data == null) { + return; + } + + printer = new Printer(data); + + /* + * Do the printing in a background thread so that spooling + * does not freeze the UI. + */ + Thread printingThread = new Thread("PrintTable") { + @Override + public void run() { + print(printer, text); + printer.dispose(); + } + }; + printingThread.start(); + + } + } + }); + } +} diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/StationListReport.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/StationListReport.java index 93d2f4fe03..4e4e82469a 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/StationListReport.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/StationListReport.java @@ -28,7 +28,8 @@ package com.raytheon.viz.hydrocommon.textreport; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Sep 18, 2009 2260 mpduff Initial creation - * + * Sep 11, 2012 13781 wkwock add print menu + * * * * @author mpduff @@ -51,17 +52,17 @@ public class StationListReport extends TextReport { private static final int STALIST_RECORD_LIMIT_PER_PAGE = 54; /* Types used for ordering columns */ - private static final int STALIST_LID = 1; + protected static final int STALIST_LID = 1; - private static final int STALIST_NAM = 2; + protected static final int STALIST_NAM = 2; - private static final int STALIST_COU = 3; + protected static final int STALIST_COU = 3; - private static final int STALIST_BAS = 4; + protected static final int STALIST_BAS = 4; - private static final int STALIST_WFO = 5; + protected static final int STALIST_WFO = 5; - private static final int STALIST_OBS = 6; + protected static final int STALIST_OBS = 6; private static final int[] sortedby_lid = { STALIST_LID, STALIST_NAM, STALIST_COU, STALIST_BAS, STALIST_WFO, STALIST_OBS, 0 }; @@ -100,7 +101,187 @@ public class StationListReport extends TextReport { public String loadTextWidget() { return getText(0);//, TEXTREPORTS_REASON_NORMAL); } + + + public int[] getSortArray(int sort) { + int[] sortArray=null; + switch (sort) { + case TextReportConstants.STALIST_SORTBY_LID: + sortArray = sortedby_lid; + break; + case TextReportConstants.STALIST_SORTBY_NAME: + sortArray = sortedby_name; + break; + case TextReportConstants.STALIST_SORTBY_COUNTY: + sortArray = sortedby_county; + break; + case TextReportConstants.STALIST_SORTBY_BASIN: + sortArray = sortedby_basin; + break; + case TextReportConstants.STALIST_SORTBY_OBSERVER: + sortArray = sortedby_observer; + break; + } + return sortArray; + } + /** + * Generate the report. + * + * @param sort + * Which column to sort on + * + * @return + * The text + */ + public String generateSpecialReport(int sort, int[] sortArray) { + StringBuilder buffer = new StringBuilder(); + String hdrTitle = "LIST OF LOCATIONS"; + + // Get the data for the report + StationList[] slData = TextReportDataManager.getInstance() + .getStnListData(sort); + + int recordLimit; /* max num records per "8 1/2 x 11" page */ + int count = 0; /* for counting the num of records processed so far */ + int pageNum = 1; + + recordLimit = STALIST_RECORD_LIMIT_PER_PAGE; + + /* Check sort type. */ + switch (sort) { + case TextReportConstants.STALIST_SORTBY_LID: + hdrTitle = TITLE_LID; + break; + case TextReportConstants.STALIST_SORTBY_NAME: + hdrTitle = TITLE_NAME; + break; + case TextReportConstants.STALIST_SORTBY_COUNTY: + hdrTitle = TITLE_COUNTY; + break; + case TextReportConstants.STALIST_SORTBY_BASIN: + hdrTitle = TITLE_BASIN; + break; + case TextReportConstants.STALIST_SORTBY_OBSERVER: + hdrTitle = TITLE_OBSERVER; + break; + } + + /* Build header line. */ + buffer.append(getHeaderLine(hdrTitle, pageNum, sortArray)); + + /* + * Keep building the list of locations (& headers) for the given + * pageType until there are no more records or until the record_limit is + * reached. + */ + for (int j = 0; j < slData.length; j++) { + /* Write out a single output line as specified by the order. */ + buffer.append(" "); + for (int i = 0; i < sortArray.length; i++) { + switch (sortArray[i]) { + case STALIST_LID: + buffer.append(String.format("%-8s", slData[j].getLid())); + break; + case STALIST_NAM: + if (slData[j].getName() != null) { + if (slData[j].getName().length() > 20) { + buffer.append(String.format("%-20s", slData[j] + .getName().substring(0, 20))); + } else { + buffer.append(String.format("%-20s", slData[j] + .getName())); + } + } else { + buffer.append(String.format("%-8s", " ")); + } + break; + case STALIST_COU: + buffer + .append(String.format("%-20s", slData[j] + .getCounty())); + break; + case STALIST_BAS: + if (slData[j].getRb() != null) { + if (slData[j].getRb().length() > 20) { + buffer.append(String.format("%-20s", slData[j] + .getRb().substring(0, 20))); + } else { + buffer.append(String.format("%-20s", slData[j] + .getRb())); + } + } else { + buffer.append(String.format("%-20s", " ")); + } + break; + case STALIST_WFO: + buffer.append(String.format("%-3s", slData[j].getWfo())); + break; + case STALIST_OBS: + if (slData[j].getLastname() != null) { + if (slData[j].getLastname().length() > 24) { + buffer.append(String.format("%-24s", slData[j] + .getLastname().substring(0, 24))); + } else { + buffer.append(String.format("%-24s", slData[j] + .getLastname())); + } + } else { + buffer.append(String.format("%-24s", " ")); + } + break; + } + + buffer.append(" "); + } + + if (slData[j].getHPhone() != null) { + if (slData[j].getHPhone().length() > 12) { + buffer.append(String.format("%-12s", slData[j].getHPhone() + .substring(0, 12))); + } else { + buffer + .append(String.format("%-12s", slData[j] + .getHPhone())); + } + } else { + buffer.append(String.format("%-12s", " ")); + } + buffer.append(" "); + + if (slData[j].getOPhone() != null) { + if (slData[j].getOPhone().length() > 14) { + buffer.append(String.format("%-14s\n", slData[j] + .getOPhone().substring(0, 14))); + } else { + buffer.append(String.format("%-14s\n", slData[j] + .getOPhone())); + } + } else { + buffer.append(String.format("%-14s\n", " ")); + } + count++; + + /* + * End of page reached, print header and reset count, increment + * pageNum + */ + if (count == recordLimit) { + pageNum++; + buffer.append("\n"); + buffer.append(getHeaderLine(hdrTitle, pageNum, sortArray)); + count = 0; + } + } + + /* Paginate */ + for (int i = count; i < 60; i++) { + buffer.append("\n"); + } + + return buffer.toString(); + } + /** * Generate the report. * diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/TextReportDlg.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/TextReportDlg.java index 3db31eabdb..f20afe9a70 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/TextReportDlg.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/TextReportDlg.java @@ -27,17 +27,9 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.graphics.GC; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.RGB; -import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.printing.PrintDialog; -import org.eclipse.swt.printing.Printer; -import org.eclipse.swt.printing.PrinterData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; @@ -66,6 +58,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog; * Sep 9, 2008 lvenable Initial creation * Dec 16, 2008 1787 askripsk Started report generation. * Sep 23, 2009 2260 mpduff Finished the dialog, + * Aug 20, 2012 13781 wkwock Added print menu for 6 text reports * * * @@ -108,29 +101,6 @@ public class TextReportDlg extends CaveSWTDialog { private TextReport report; - /* Vars used in the printing methods */ - private Printer printer; - - private int lineHeight = 0; - - private int tabWidth = 0; - - private int leftMargin; - - private int rightMargin; - - private int topMargin; - - private int bottomMargin; - - private int x, y; - - private int index, end; - - private StringBuffer wordBuffer; - - private GC gc; - /** * Constructor. * @@ -400,35 +370,31 @@ public class TextReportDlg extends CaveSWTDialog { Button printBtn = new Button(btnComp, SWT.PUSH); printBtn.setText("Print"); printBtn.setLayoutData(gd); + final TextReportDlg txtRptDlg=this; printBtn.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - final String text = textViewer.getText(); - - if (text != null) { - PrintDialog dialog = new PrintDialog(shell, SWT.NONE); - PrinterData data = dialog.open(); - - if (data == null) { - return; - } - - printer = new Printer(data); - - /* - * Do the printing in a background thread so that spooling - * does not freeze the UI. - */ - Thread printingThread = new Thread("PrintTable") { - @Override - public void run() { - print(printer, text); - printer.dispose(); - } - }; - printingThread.start(); - - } + if (report.getClass().getName().equals(E19Report.class.getName())){ + PrintE19TextReportDlg ptr = new PrintE19TextReportDlg(shell,(E19Report)report); + ptr.open(); + } else if (report.getClass().getName().equals(E19AReport.class.getName())) { + PrintE19ATextReportDlg ptr = new PrintE19ATextReportDlg(shell,(E19AReport)report); + ptr.open(); + } else if (report.getClass().getName().equals(B44AReport.class.getName())) { + PrintB44ATextReportDlg ptr = new PrintB44ATextReportDlg(shell,(B44AReport)report); + ptr.open(); + }else if (report.getClass().getName().equals(ServiceBackupReport.class.getName())) { + PrintSvcBkTextReportDlg ptr = new PrintSvcBkTextReportDlg(shell,(ServiceBackupReport)report); + ptr.setTextReportDlg(txtRptDlg); + ptr.open(); + }else if (report.getClass().getName().equals(StationClassReport.class.getName())) { + PrintStnClassTextReportDlg ptr = new PrintStnClassTextReportDlg(shell,(StationClassReport)report); + ptr.open(); + }else if (report.getClass().getName().equals(StationListReport.class.getName())) { + PrintSortedStnTextReportDlg ptr = new PrintSortedStnTextReportDlg(shell,(StationListReport)report); + ptr.setTextReportDlg(txtRptDlg); + ptr.open(); + } } }); } @@ -444,6 +410,13 @@ public class TextReportDlg extends CaveSWTDialog { } } + /** + * + */ + public int getPageSelectionIndex () { + return this.pageCbo.getSelectionIndex(); + } + /** * Event handler for Report combobox. This populates the page combobox and * displays the report @@ -600,147 +573,4 @@ public class TextReportDlg extends CaveSWTDialog { // text at the top of the page textViewer.setSelection(offset); } - - /** - * Send the text to the printer - * - * @param printer - * The printer - * @param text - * The text to print - */ - private void print(Printer printer, String text) { - if (printer.startJob("Text")) { - Rectangle clientArea = printer.getClientArea(); - Rectangle trim = printer.computeTrim(0, 0, 0, 0); - Point dpi = printer.getDPI(); - leftMargin = dpi.x + trim.x; // one inch from left side of paper - rightMargin = clientArea.width - dpi.x + trim.x + trim.width; // one - // inch - // from - // right - // side - // of - // paper - topMargin = dpi.y + trim.y; // one inch from top edge of paper - bottomMargin = clientArea.height - dpi.y + trim.y + trim.height; // one - // inch - // from - // bottom - // edge - // of - // paper - - /* Create a buffer for computing tab width. */ - int tabSize = 4; // is tab width a user setting in your UI? - StringBuffer tabBuffer = new StringBuffer(tabSize); - for (int i = 0; i < tabSize; i++) { - tabBuffer.append(' '); - } - String tabs = tabBuffer.toString(); - - /* - * Create printer GC, and create and set the printer font & - * foreground color. - */ - gc = new GC(printer); - - Font printerFont = new Font(printer, "Monospace", 8, SWT.NORMAL); - - Color printerForegroundColor = new Color(printer, new RGB(0, 0, 0)); - Color printerBackgroundColor = new Color(printer, new RGB(255, 255, - 255)); - - gc.setFont(printerFont); - gc.setForeground(printerForegroundColor); - gc.setBackground(printerBackgroundColor); - tabWidth = gc.stringExtent(tabs).x; - lineHeight = gc.getFontMetrics().getHeight(); - - /* Print text to current gc using word wrap */ - printText(text); - - printer.endJob(); - - /* Cleanup graphics resources used in printing */ - printerFont.dispose(); - printerForegroundColor.dispose(); - printerBackgroundColor.dispose(); - gc.dispose(); - } - } - - /** - * Print the text - * - * @param text - * The text to be printed - */ - private void printText(String text) { - printer.startPage(); - wordBuffer = new StringBuffer(); - x = leftMargin; - y = topMargin; - index = 0; - end = text.length(); - while (index < end) { - char c = text.charAt(index); - index++; - if (c != 0) { - if ((c == 0x0a) || (c == 0x0d)) { - if ((c == 0x0d) && (index < end) - && (text.charAt(index) == 0x0a)) { - index++; // if this is cr-lf, skip the lf - } - printWordBuffer(); - newline(); - } else { - if (c != '\t') { - wordBuffer.append(c); - } - if (Character.isWhitespace(c)) { - printWordBuffer(); - if (c == '\t') { - x += tabWidth; - } - } - } - } - } - if (y + lineHeight <= bottomMargin) { - printer.endPage(); - } - } - - /** - * Word buffer for formating lines on the printed page - */ - private void printWordBuffer() { - if (wordBuffer.length() > 0) { - String word = wordBuffer.toString(); - int wordWidth = gc.stringExtent(word).x; - if (x + wordWidth > rightMargin) { - /* word doesn't fit on current line, so wrap */ - newline(); - } - gc.drawString(word, x, y, false); - x += wordWidth; - wordBuffer = new StringBuffer(); - } - } - - /** - * New line on the printed page - */ - private void newline() { - x = leftMargin; - y += lineHeight; - if (y + lineHeight > bottomMargin) { - printer.endPage(); - if (index + 1 < end) { - y = topMargin; - printer.startPage(); - } - } - } } diff --git a/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java b/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java index b3215c3dac..54e4232210 100644 --- a/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java +++ b/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java @@ -90,6 +90,8 @@ import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability; * "-" symbols as well as the font size of the * text will be updated when the user changes * the magnification level now. + * Sep 4, 2012 15335 kshresth Will now display lightning/wind + * fields when magnification set to 0 * * * @@ -352,7 +354,9 @@ public class LightningResource extends int posCount = 0; int negCount = 0; - + + if (magnification == 0.0) magnification=(float) 0.01; + IExtent extent = paintProps.getView().getExtent(); CacheObject cacheObject = cacheObjectMap diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java index d947558b40..7579c05884 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java @@ -34,10 +34,6 @@ import java.util.ListIterator; import java.util.Set; import java.util.TimeZone; -import javax.measure.converter.UnitConverter; -import javax.measure.unit.NonSI; -import javax.measure.unit.SI; - import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.graphics.RGB; @@ -96,6 +92,7 @@ import com.vividsolutions.jts.index.strtree.STRtree; * Feb 8, 2011 mschenke Initial creation * Aug 8, 2012 15271 snaples Updated hourly slot * Aug 17, 2012 15271 snaples Added check to add only PP gages + * Sep 5, 2012 15079 snaples Added constant for Milli to inches conversion factor * * * @@ -349,18 +346,14 @@ public class MPEGageResource extends AbstractMPEInputResource { // draw the value if (!gageData.isManedit()) { if (gageData.getId().contains("PSEUDO")) { - UnitConverter conv = SI.MILLIMETER - .getConverterTo(NonSI.INCH); gageValue = String.format("%5.2f", - conv.convert(gageData.getGval())); + gageData.getGval() / MILLICVT); } } else { if (gageData.getId().contains("PSEUDO") && !isMissing) { - UnitConverter conv = SI.MILLIMETER - .getConverterTo(NonSI.INCH); gageValue = String.format("%5.2f", - conv.convert(gageData.getGval())); + gageData.getGval() / MILLICVT); } } } diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/XmrgResource.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/XmrgResource.java index 9e610454ac..c54baac536 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/XmrgResource.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/XmrgResource.java @@ -93,6 +93,7 @@ import com.vividsolutions.jts.geom.GeometryFactory; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Oct 23, 2008 randerso Initial creation + * Sep 5, 2012 15079 snaples Updated interrogate method to handle values without rounding errors. * * * @author randerso @@ -121,6 +122,8 @@ public class XmrgResource extends private static final GeometryFactory gf = new GeometryFactory(); + private static final double MILLICVT = 25.4; + private XmrgFile xmrg; private HRAPSubGrid subGrid; @@ -133,7 +136,7 @@ public class XmrgResource extends private final float contrast = 1.0f; - private boolean isInterpolated = true; + private final boolean isInterpolated = true; private final MPEDisplayManager displayMgr; @@ -579,11 +582,16 @@ public class XmrgResource extends } else if (s > 0 && s <= 24) { s = 0; } - f = (float) parameters.getDataToDisplayConverter() + if ((cv_use.equalsIgnoreCase("Locbias") || cv_use.equalsIgnoreCase("height") || cv_use.equalsIgnoreCase("locspan") || + tempsval == -1)) + { + f = (float) parameters.getDataToDisplayConverter() .convert(s); + } else { + f = (float) (s / 100 / MILLICVT); + } } - float aa = (float) ((Math.floor((int) (f * 100))) / 100.0); - String da = String.format("%2.2f", aa); + String da = String.format("%2.2f", f); values.put("Value", da); } } diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseOCONUSBlendedDerivedProductsImagery.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseOCONUSBlendedDerivedProductsImagery.xml new file mode 100644 index 0000000000..49c45e4bce --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseOCONUSBlendedDerivedProductsImagery.xml @@ -0,0 +1,46 @@ + + + + + /satellite/%/NESDIS/POES-NPOESS/Supernational/Rain_fall_rate + + + + + + + + /satellite/%/NESDIS/Miscellaneous/Supernational/Sounder_Based_Derived_Precipitable_Water_(PW) + + + + + + /satellite/%/NESDIS/Miscellaneous/Supernational/Percent_of_Normal_TPW + + + + + diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/AfosBrowserModel.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/AfosBrowserModel.java old mode 100755 new mode 100644 diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java index c25183a79e..ea12b4095d 100644 --- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java +++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java @@ -89,6 +89,9 @@ import com.raytheon.viz.ui.dialogs.ModeListener; * current alarm queue window. * May 23, 2012 14952 rferrel Now use refTime/createtime to display * selected product + * Aug 28, 2012 14795 mgamazaychikov Fixed problem with "Unhadled event loop" + * exception associated with closing + * "Current Alarm Queue" GUI * * * @author mnash @@ -477,7 +480,16 @@ public class CurrentAlarmQueue extends CaveSWTDialog implements alarmDisplayDlg.setDialogFocus(); } } - displayAll.setEnabled(false); + /* + * DR14795 - fix the "Unhandled event loop" exception + * by calling setEnabled on displayAll only + * for a valid list + */ + if (list != null && !list.isDisposed()) { + if (list.getItemCount() == 0) { + displayAll.setEnabled(false); + } + } } /** diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AfosBrowserDlg.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AfosBrowserDlg.java old mode 100755 new mode 100644 diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/RemoteSiteRequestDlg.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/RemoteSiteRequestDlg.java old mode 100755 new mode 100644 diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java index af0612a26c..df13ccbbb9 100644 --- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java +++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java @@ -284,6 +284,9 @@ import com.raytheon.viz.ui.dialogs.SWTMessageBox; * 25JUL2012 14459 rferrel Strip WMH headers when getting all METARs. * 13AUG2012 14613 M.Gamazaychikov Ensured the WMO and MND header times are the same. * 20AUG2012 15340 D.Friedman Use callbacks for stop sign dialog. Prevent NOR in header. + * 10Sep2012 15103 M.Gamazaychikov DR15103 -do not clear AFOS command from the text box + * when obs are updated and refactored executeCommand + * 10SEP2012 15401 D.Friedman Fix QC problem caused by DR 15340. * * * @author lvenable @@ -3904,7 +3907,8 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, setHeaderTextField(wmoId, siteId, currentDateId, "\n", nnnxxx); } else { setHeaderTextField(tdm.getWmoId(token), tdm.getSiteId(token), - currentDateId + " " + bbbid, "\n", nnnxxx); + bbbid.length() > 0 ? currentDateId + " " + bbbid + : currentDateId, "\n", nnnxxx); } // Update the "now editing" title of the text editor window. @@ -5228,9 +5232,12 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, public String getAddressee() { return addressee; } - - @Override + public void executeCommand(ICommand command) { + executeCommand(command, false); + } + + public void executeCommand(ICommand command, boolean isObsUpdated) { if (isDisposed()) { return; } @@ -5334,7 +5341,13 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, TextDisplayModel.getInstance().createStdTextProduct(token, w, siteNode); } - clearAfosCmdTF(); + /* + * DR15103 - do not clear AFOS command from the text box + * when obs are updated + */ + if ( !isObsUpdated ) { + clearAfosCmdTF(); + } clearWmoTF(); clearAwipsIdTF(); } else { @@ -6443,7 +6456,12 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, @Override public void run() { - executeCommand(command); + /* + * DR15103 - set the flag to 'true' before executing + * AFOS command so the AFOS command box is not cleared + * when obs are updated + */ + executeCommand(command, true); } } diff --git a/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java b/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java old mode 100755 new mode 100644 diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ModelFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ModelFamilies.xml new file mode 100644 index 0000000000..54556827c4 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ModelFamilies.xml @@ -0,0 +1,921 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml index 3d1422e564..e832ad8001 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml @@ -30,6 +30,9 @@ + + @@ -42,4 +45,4 @@ - \ No newline at end of file + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml index b1021f011f..6df01ea438 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml @@ -722,6 +722,407 @@ --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml index dc178f59ab..ec736b0584 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml @@ -297,7 +297,12 @@ Misc menu item --> - + + + + + + @@ -389,4 +394,4 @@ - \ No newline at end of file + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml index 95e1a53c13..a025e86afa 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml @@ -19,6 +19,22 @@ further_licensing_information. --> + + + + + + + + + + + + + + + @@ -1335,4 +1351,4 @@ - \ No newline at end of file + diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java index e162b349d9..c39ec708da 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java @@ -71,8 +71,10 @@ import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.common.time.SimulatedTime; +import com.raytheon.uf.common.util.FileUtil; import com.raytheon.uf.edex.core.EdexException; import com.raytheon.uf.viz.core.exception.VizException; +import com.raytheon.uf.viz.core.localization.LocalizationManager; import com.raytheon.uf.viz.core.maps.rsc.DbMapQueryFactory; import com.raytheon.uf.viz.core.requests.ThriftClient; import com.raytheon.viz.awipstools.ToolsDataManager; @@ -122,7 +124,8 @@ import com.vividsolutions.jts.io.WKTReader; * Jun 15, 2012 15043 Qinglu Lin Added duration to context. * Jul 16, 2012 15091 Qinglu Lin Compute intersection area, which is used for prevent 2nd timezone * from appearing in 2nd and 3rd bullets when not necessary. - * Aug 13, 2012 14493 Qinglu Lin Handled MND time, event time, and TML time specially for COR to NEW. + * Aug 13, 2012 14493 Qinglu Lin Handled MND time, event time, and TML time specially for COR to NEW. + * Sep 10, 2012 15295 snaples Added property setting for runtime log to createScript. * * * @@ -741,7 +744,8 @@ public class TemplateRunner { long tz0 = System.currentTimeMillis(); String script = createScript(warngenLayer.getTemplateName() + ".vm", - context, warngenLayer.getLocalizedSite()); + context, warngenLayer.getLocalizedSite(), + FileUtil.join(LocalizationManager.getUserDir(), "logs")); System.out.println("velocity time: " + (System.currentTimeMillis() - tz0)); @@ -754,7 +758,7 @@ public class TemplateRunner { private static VelocityEngine ENGINE = new VelocityEngine(); private static synchronized String createScript(String vmFile, - VelocityContext context, String site) throws EdexException { + VelocityContext context, String site, String logDir) throws EdexException { StringWriter sw = new StringWriter(); try { Properties p = new Properties(); @@ -765,6 +769,8 @@ public class TemplateRunner { p.setProperty( "velocimacro.permissions.allow.inline.to.replace.global", "true"); + p.setProperty("runtime.log", + FileUtil.join(logDir, "velocity.log")); ENGINE.init(p); context.put("scriptLibrary", "VM_global_library.vm"); Template template = ENGINE.getTemplate(vmFile, diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java index 3754150537..c63e16caf6 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java @@ -64,6 +64,8 @@ import com.raytheon.viz.warngen.gis.AffectedAreasComparator; * d)NullointException/locking does not work for special marine warning * and locking beyond first paragragh. * Jul 17, 2012 14989 Qinglu Lin Removed locks, and , for county names in pathcast line. + * Sep 11, 2012 15372 Qinglu Lin Adjusted code so that and in the line of "MAINLY RURAL AREAS" + * were removed as well. * * * @@ -349,7 +351,7 @@ public class WarningTextHandler { } } - boolean ruralFound = false, ruralReplace = false; + boolean ruralFound = false, ruralReplaced = false; ArrayList usedAreaNotations = new ArrayList(); for (int lineIndex = 0; lineIndex < seperatedLines.length; ++lineIndex) { String line = seperatedLines[lineIndex]; @@ -359,7 +361,7 @@ public class WarningTextHandler { before = false; } - if (!ruralFound && line.contains("MAINLY RURAL AREAS")) { + if (!ruralFound && !ruralReplaced && line.contains("MAINLY RURAL AREAS")) { ruralFound = true; } @@ -436,18 +438,16 @@ public class WarningTextHandler { } if (ruralFound) - if (!ruralReplace) - ruralReplace = true; - else if (ruralReplace) { - if (line.trim().length() == 0) - ruralFound = false; - else { - line = line.replace("", ""); - line = line.replace("", ""); - sb.append(line + "\n"); - continue; - } - } + if (line.trim().length() == 0) + ruralFound = false; + else { + line = line.replace("", ""); + line = line.replace("", ""); + sb.append(line + "\n"); + if (!ruralReplaced) + ruralReplaced = true; + continue; + } if (line.trim().length() == 0) { insideTML = false; diff --git a/deltaScripts/12.5.1/drop_gfe_tables.sh b/deltaScripts/12.5.1/drop_gfe_tables.sh old mode 100755 new mode 100644 diff --git a/edexOsgi/build.edex/esb/bin/start.sh b/edexOsgi/build.edex/esb/bin/start.sh old mode 100755 new mode 100644 diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/Generator.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/Generator.py old mode 100755 new mode 100644 diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java index 9b016312d4..01f207556d 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java @@ -49,6 +49,8 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 20080303 969 jkorman Initial implementation. + * 2012-09-07 DR 15316 M. Porricelli Removed adjustment of + * valid time hour * * * @@ -60,10 +62,10 @@ public abstract class AbstractBUFRUAAdapter extends BUFRPointDataAdapter // Allowable future time in milliseconds (2 hours). private static final long ALLOWABLE_TIME = 2 * 3600 * 1000; - private static final int[] HOUR_MAP = { - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 - 0, -1, -2, -3, 2, 1, 0, -1, -2, -3, 2, 1, 0, -1, -2, -3, 2, 1, 0, - -1, -2, -3, 2, 1 }; +// private static final int[] HOUR_MAP = { +// // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 +// 0, -1, -2, -3, 2, 1, 0, -1, -2, -3, 2, 1, 0, -1, -2, -3, 2, 1, 0, +// -1, -2, -3, 2, 1 }; private static final int YEAR_POS = 4; @@ -115,9 +117,9 @@ public abstract class AbstractBUFRUAAdapter extends BUFRPointDataAdapter Calendar relTime = TimeTools.copy(validTime); - // Now offset the "record" validTime using the hour mapping. - int hour = validTime.get(Calendar.HOUR_OF_DAY); - validTime.add(Calendar.HOUR_OF_DAY, HOUR_MAP[hour]); +// // Now offset the "record" validTime using the hour mapping. +// int hour = validTime.get(Calendar.HOUR_OF_DAY); +// validTime.add(Calendar.HOUR_OF_DAY, HOUR_MAP[hour]); // Set the new validTime back into the UAObs record. obsData.setValidTime(validTime); diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java index 5bb4adb48b..a1cdba2702 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java @@ -103,6 +103,8 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery; * 06/17/09 #2380 randerso Removed purging of grid history. * Should cascade when record deleted. * 08/07/09 #2763 njensen Refactored queryByD2DParmId + * 09/10/12 DR15137 ryu Changed for MOSGuide D2D mxt/mnt grids for consistency + * with A1. * * * @author bphillip @@ -625,11 +627,17 @@ public class GFEDao extends DefaultPluginDao { for (int i = 0; i < records.size(); i++) { TimeRange gribTime = records.get(i).getDataTime().getValidPeriod(); - TimeRange time = info.getTimeConstraints().constraintTime( - gribTime.getStart()); try { - if (D2DGridDatabase.isNonAccumDuration(id, gribTimes) - && !isMos(id)) { + if (isMos(id)) { + TimeRange time = info.getTimeConstraints().constraintTime( + gribTime.getEnd()); + if (timeRange.getEnd().equals(time.getEnd()) + || !info.getTimeConstraints().anyConstraints()) { + GribRecord retVal = records.get(i); + retVal.setPluginName("grib"); + return retVal; + } + } else if (D2DGridDatabase.isNonAccumDuration(id, gribTimes)) { if (timeRange.getStart().equals(gribTime.getEnd()) || timeRange.equals(gribTime)) { GribRecord retVal = records.get(i); @@ -638,6 +646,8 @@ public class GFEDao extends DefaultPluginDao { } } else { + TimeRange time = info.getTimeConstraints().constraintTime( + gribTime.getStart()); if ((timeRange.getStart().equals(time.getStart()) || !info .getTimeConstraints().anyConstraints())) { GribRecord retVal = records.get(i); @@ -651,7 +661,6 @@ public class GFEDao extends DefaultPluginDao { + id.getDbId().getSiteId(), e); } } - // } return null; } @@ -843,8 +852,8 @@ public class GFEDao extends DefaultPluginDao { List results = executeD2DParmQuery(id); for (DataTime o : results) { if (isMos(id)) { - timeList.add(new TimeRange(o.getValidPeriod().getStart(), - 3600 * 1000)); + timeList.add(new TimeRange(o.getValidPeriod().getEnd(), + o.getValidPeriod().getDuration())); } else { timeList.add(o.getValidPeriod()); } diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/Import88DLocationsUtil.java b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/Import88DLocationsUtil.java index a291d56405..d5a300643e 100644 --- a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/Import88DLocationsUtil.java +++ b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/Import88DLocationsUtil.java @@ -27,7 +27,10 @@ import com.raytheon.uf.common.site.ingest.INationalDatasetSubscriber; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; +import com.raytheon.uf.edex.database.DataAccessLayerException; +import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.Point; +import com.vividsolutions.jts.geom.PrecisionModel; import com.vividsolutions.jts.io.ParseException; import com.vividsolutions.jts.io.WKTReader; @@ -39,6 +42,7 @@ import com.vividsolutions.jts.io.WKTReader; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 10Oct2011 10520 JWork Initial check-in. + * 09/11/2012 DR 15366 D. Friedman Set SRID on radar stations. * * */ @@ -52,6 +56,8 @@ public class Import88DLocationsUtil implements INationalDatasetSubscriber { private static final String CONFIG_FILE_NAME = "ndm" + IPathManager.SEPARATOR; + private static final int WGS84_SRID = 4326; + // The list of the required file comprising a Shapefile set private ArrayList theRadarShapeFileList = new ArrayList() { private static final long serialVersionUID = 1L; @@ -265,6 +271,21 @@ public class Import88DLocationsUtil implements INationalDatasetSubscriber { for (RadarStation station : aStationList) { radarStationDAO.saveOrUpdate(station); } + + /* + * Kludge for DR 15366: The GeoTools WKBWriter does not store SRIDs so + * we must update them manually. + * + * Once GetTools is updated/fixed, this should be removed. + */ + try { + radarStationDAO + .executeNativeSql("update radar_spatial set the_geom=st_setsrid(the_geom, 4326)"); + } catch (DataAccessLayerException e) { + statusHandler.handle(Priority.ERROR, + "Failed to update the SRIDs in the radar_spatial_table", e); + } + if (statusHandler.isPriorityEnabled(Priority.INFO)) { statusHandler .handle(Priority.INFO, @@ -301,7 +322,8 @@ public class Import88DLocationsUtil implements INationalDatasetSubscriber { String rda_id = null; RadarStation tempStation = null; Set keySet = null; - WKTReader wkt = new WKTReader(); + GeometryFactory gf = new GeometryFactory(new PrecisionModel(), WGS84_SRID); + WKTReader wkt = new WKTReader(gf); for (HashMap aHashMap : aDataList) { keySet = aHashMap.keySet(); tempStation = new RadarStation(); diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java index e5200f91d8..cfa3ff0cea 100644 --- a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java +++ b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java @@ -49,7 +49,8 @@ import com.vividsolutions.jts.geom.Coordinate; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * May 18, 2011 mnash Initial creation - * + * Sep 10, 2012 15337 kshresth Changed sector on OCONUS:Products under + * Derived Products Imagery Display * * * @author mnash @@ -110,6 +111,10 @@ public class SatelliteMenuUtil extends AbstractMenuUtil { + File.separator + "satellite" + File.separator + "baseCompositeTemplate.xml"); + MenuTemplateFile fileOCONUS = (MenuTemplateFile) fromXml("menuTemplate" + + File.separator + "satellite" + File.separator + + "baseOCONUSDerivedProductsImageryTemplate.xml"); + String state = ""; if (results != null && results.length > 0) { state = results[0].toString(); @@ -124,18 +129,27 @@ public class SatelliteMenuUtil extends AbstractMenuUtil { } ((CommonIncludeMenuContribution) file.contributions[0]).fileName = new File( "menus/satellite/baseSatellite.xml"); - if ("Hawaii".equals(state) || "Alaska".equals(state) + ((CommonIncludeMenuContribution) fileOCONUS.contributions[0]).fileName = new File( + "menus/satellite/baseOCONUSBlendedDerivedProductsImagery.xml"); + if ("Alaska".equals(state) ||"Hawaii".equals(state) || "Puerto Rico".equals(state)) { + ((CommonIncludeMenuContribution) fileOCONUS.contributions[0]).substitutions = new VariableSubstitution[1]; + // sector + VariableSubstitution sub = new VariableSubstitution(); + sub.key = "sector"; + sub.value = state + " National"; + ((CommonIncludeMenuContribution) fileOCONUS.contributions[0]).substitutions[0] = sub; + // ============================================ ((CommonIncludeMenuContribution) file.contributions[0]).substitutions = new VariableSubstitution[5]; // sector0 - VariableSubstitution sub = new VariableSubstitution(); + sub = new VariableSubstitution(); sub.key = "sector0"; - sub.value = state + " Regional"; - ((CommonIncludeMenuContribution) file.contributions[0]).substitutions[0] = sub; + sub.value = "Northern Hemisphere Composite"; + ((CommonIncludeMenuContribution) file.contributions[0]).substitutions[0] = sub; // sector1 sub = new VariableSubstitution(); sub.key = "sector1"; - sub.value = state + " National"; + sub.value = "Northern Hemisphere Composite"; ((CommonIncludeMenuContribution) file.contributions[0]).substitutions[1] = sub; // sector2 sub = new VariableSubstitution(); @@ -219,6 +233,10 @@ public class SatelliteMenuUtil extends AbstractMenuUtil { toXml(file, "menus" + File.separator + "satellite" + File.separator + "baseComposite.xml"); + + toXml(fileOCONUS, "menus" + File.separator + "satellite" + File.separator + + "baseDerivedProductsImagery.xml"); + statusHandler.info("Finished creating satellite menus"); } @@ -232,10 +250,20 @@ public class SatelliteMenuUtil extends AbstractMenuUtil { MenuTemplateFile file = (MenuTemplateFile) fromXml("menus" + File.separator + "satellite" + File.separator + "baseComposite.xml", caveConfigured); + MenuTemplateFile fileO = (MenuTemplateFile) fromXml("menus" + + File.separator + "satellite" + File.separator + + "baseDerivedProductsImagery.xml", caveConfigured); if (file == null || file.contributions == null || file.contributions.length == 0) { - return false; + return false; } else { + if (getSite().equals("AJK") || getSite().equals("AFC") + || getSite().equals("AFG") || getSite().equals("HFO") + || getSite().equals("GUM") || getSite().equals("SJU")) { + if( fileO == null || fileO.contributions == null + || fileO.contributions.length == 0) + return false; + } statusHandler.info("Menus already created for site " + getSite() + " for satellite"); return true; diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/edex_static/base/menuTemplate/satellite/baseOCONUSDerivedProductsImageryTemplate.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/edex_static/base/menuTemplate/satellite/baseOCONUSDerivedProductsImageryTemplate.xml new file mode 100644 index 0000000000..804daec219 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/edex_static/base/menuTemplate/satellite/baseOCONUSDerivedProductsImageryTemplate.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java index 3ea00bd760..bd86a944dd 100644 --- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java +++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java @@ -293,7 +293,7 @@ public class AlertalarmStdTextProductUtil { String suffix = reportOptions.getFileSuffix(); if (suffix.length() > 0) - currReport = new File(reportDir + File.separator + pid + suffix); + currReport = new File(reportDir + File.separator + pid + "." + suffix); else currReport = new File(reportDir + File.separator + pid); diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/GridCoverage.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/GridCoverage.java index 0859b0585b..dc17fb6cd2 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/GridCoverage.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/GridCoverage.java @@ -63,6 +63,7 @@ import com.vividsolutions.jts.geom.Geometry; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 4/7/09 1994 bphillip Initial Creation + * 09/10/2012 DR 15270 D. Friedman Fix subgrid model name handling. * * * @@ -77,6 +78,8 @@ public abstract class GridCoverage extends PersistableDataObject implements ISpatialObject { private static final long serialVersionUID = -1355232934065074837L; + + protected static final String SUBGRID_TOKEN = "-SubGrid-"; /** The id for this grid. This value is generated in the initialize method **/ @Id @@ -723,7 +726,7 @@ public abstract class GridCoverage extends PersistableDataObject implements String subGridName = getName(); if (subGridName != null) { - return getName().contains("SubGrid"); + return getName().contains(SUBGRID_TOKEN); } return false; @@ -739,9 +742,9 @@ public abstract class GridCoverage extends PersistableDataObject implements String model = null; if (isSubGridded()) { String subGridName = getName(); - int index = subGridName.lastIndexOf("-"); - if (index > 0 && index + 1 < subGridName.length()) { - model = subGridName.substring(index + 1); + int index = subGridName.lastIndexOf(SUBGRID_TOKEN); + if (index >= 0 && index + SUBGRID_TOKEN.length() < subGridName.length()) { + model = subGridName.substring(index + SUBGRID_TOKEN.length()); } } return model; @@ -751,8 +754,8 @@ public abstract class GridCoverage extends PersistableDataObject implements String parentName = null; if (isSubGridded()) { String subGridName = getName(); - int index = subGridName.indexOf("-"); - if (index > 0) { + int index = subGridName.indexOf(SUBGRID_TOKEN); + if (index >= 0) { parentName = subGridName.substring(0, index); } } diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/LambertConformalGridCoverage.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/LambertConformalGridCoverage.java index 46fc640917..9a6d4cc21a 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/LambertConformalGridCoverage.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/LambertConformalGridCoverage.java @@ -56,6 +56,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 4/7/09 1994 bphillip Initial Creation + * 09/10/2012 DR 15270 D. Friedman Fix subgrid model name handling. * * * @@ -149,7 +150,7 @@ public class LambertConformalGridCoverage extends GridCoverage { rval.majorAxis = this.majorAxis; rval.minorAxis = this.minorAxis; - rval.setName(this.name + "-SubGrid-" + subGrid.getModelName()); + rval.setName(this.name + SUBGRID_TOKEN + subGrid.getModelName()); try { Unit spacingUnitObj = Unit.valueOf(spacingUnit); diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/LatLonGridCoverage.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/LatLonGridCoverage.java index e9c3df891a..f384ad2476 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/LatLonGridCoverage.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/LatLonGridCoverage.java @@ -49,6 +49,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 4/7/09 1994 bphillip Initial Creation + * 09/10/2012 DR 15270 D. Friedman Fix subgrid model name handling. * * * @@ -139,7 +140,7 @@ public class LatLonGridCoverage extends GridCoverage { rval.dy = this.dy; rval.spacingUnit = this.spacingUnit; - rval.setName(this.name + "-SubGrid-" + subGrid.getModelName()); + rval.setName(this.name + SUBGRID_TOKEN + subGrid.getModelName()); try { if (spacingUnit.equals("degree")) { diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/MercatorGridCoverage.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/MercatorGridCoverage.java index afca85c139..aaed40b631 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/MercatorGridCoverage.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/MercatorGridCoverage.java @@ -58,6 +58,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 4/7/09 1994 bphillip Initial Creation + * 09/10/2012 DR 15270 D. Friedman Fix subgrid model name handling. * * * @@ -236,7 +237,7 @@ public class MercatorGridCoverage extends GridCoverage { rval.latin = this.latin; rval.majorAxis = this.majorAxis; rval.minorAxis = this.minorAxis; - rval.setName(this.name + "-SubGrid-" + subGrid.getModelName()); + rval.setName(this.name + SUBGRID_TOKEN + subGrid.getModelName()); try { Unit spacingUnitObj = Unit.valueOf(spacingUnit); diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/PolarStereoGridCoverage.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/PolarStereoGridCoverage.java index cc36150f80..4c9aecf2a5 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/PolarStereoGridCoverage.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/spatial/projections/PolarStereoGridCoverage.java @@ -56,6 +56,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 4/7/09 1994 bphillip Initial Creation + * 09/10/2012 DR 15270 D. Friedman Fix subgrid model name handling. * * * @@ -134,7 +135,7 @@ public class PolarStereoGridCoverage extends GridCoverage { rval.lov = this.lov; rval.majorAxis = this.majorAxis; rval.minorAxis = this.minorAxis; - rval.setName(this.name + "-SubGrid-" + subGrid.getModelName()); + rval.setName(this.name + SUBGRID_TOKEN + subGrid.getModelName()); try { Unit spacingUnitObj = Unit.valueOf(spacingUnit); diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/masterLevels.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/masterLevels.xml index 1b2584d9d9..c84552322f 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/masterLevels.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/masterLevels.xml @@ -19,6 +19,10 @@ further_licensing_information. --> + + + + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/CompositeReflectivityProduct.java b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/CompositeReflectivityProduct.java index 2bf44454a4..64264f0506 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/CompositeReflectivityProduct.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/CompositeReflectivityProduct.java @@ -69,6 +69,8 @@ import com.raytheon.uf.edex.core.EDEXUtil; * 05/07/2009 2037 dhladky Initial Creation. * 02/22/2012 DR14414 mgamazay Added initializing the ScanTableData table * to an empty map if no features are present. + * 09/06/2012 14727 Xiaochuan setIsNew(false) for the storm id should based + * on FCSTRAN, FCSTDIR values. * * * @@ -168,8 +170,6 @@ public class CompositeReflectivityProduct extends RadarProduct { // by storm ID, update for (String id : getUpdates(catKeys, table)) { if (table.getRow(id) != null) { - // no longer a new row - table.getRow(id).setIsNew(false); // previous position stuff if ((table.getRow(id).getLat() != null) && (table.getRow(id).getLon() != null)) { @@ -203,7 +203,7 @@ public class CompositeReflectivityProduct extends RadarProduct { .purgeCoordinates(rec.getDataTime() .getRefTime()); table.updateRow(id, write(table.getRow(id), rec, id)); - // System.out.println("CELL: Updated Row: "+id); + } } } @@ -232,10 +232,10 @@ public class CompositeReflectivityProduct extends RadarProduct { } // add new rows last for (String id : newIds) { - table.addRow(id, + table.addRow(id, write(new CellTableDataRow(rec.getDataTime()), rec, id)); } - + // send out an alertViz message if (processAlarms) { EDEXUtil.sendMessageAlertViz(Priority.CRITICAL, @@ -477,6 +477,8 @@ public class CompositeReflectivityProduct extends RadarProduct { && !cellValMap.get(GraphicBlockValues.FCSTDIR).equals(NEW)) { ((CellTableDataRow) row).setDir(new Double(cellValMap .get(GraphicBlockValues.FCSTDIR))); + + ((CellTableDataRow) row).setIsNew(false); } // set the speed @@ -487,6 +489,7 @@ public class CompositeReflectivityProduct extends RadarProduct { && !cellValMap.get(GraphicBlockValues.FCSTRAN).equals(NEW)) { ((CellTableDataRow) row).setSpd(new Double(cellValMap .get(GraphicBlockValues.FCSTRAN))); + ((CellTableDataRow) row).setIsNew(false); } // Try setting it here diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/msg/fxaAnnounce.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/msg/fxaAnnounce.py old mode 100755 new mode 100644 diff --git a/nativeLib/dist.native/i386-pc-linux-gnu.tar.REMOVED.git-id b/nativeLib/dist.native/i386-pc-linux-gnu.tar.REMOVED.git-id index 52f1f6e6b2..faa0930c95 100644 --- a/nativeLib/dist.native/i386-pc-linux-gnu.tar.REMOVED.git-id +++ b/nativeLib/dist.native/i386-pc-linux-gnu.tar.REMOVED.git-id @@ -1 +1 @@ -b288540d9df12e4f12524428bcfe5d37ae56cd76 \ No newline at end of file +e0807c547d1d9fe1c96688bb0955467ab6fdb8e1 \ No newline at end of file diff --git a/nativeLib/ncep_grib2module/dependencies/src/g2clib-1.1.8/makefile b/nativeLib/ncep_grib2module/dependencies/src/g2clib-1.1.8/makefile old mode 100755 new mode 100644 diff --git a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/Jep.java b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/Jep.java old mode 100755 new mode 100644 diff --git a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/jep.c b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/jep.c old mode 100755 new mode 100644 diff --git a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyembed.h b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyembed.h old mode 100755 new mode 100644 diff --git a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjarray.c b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjarray.c old mode 100755 new mode 100644 diff --git a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjarray.h b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjarray.h old mode 100755 new mode 100644 diff --git a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjclass.h b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjclass.h old mode 100755 new mode 100644 diff --git a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjmethod.h b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjmethod.h old mode 100755 new mode 100644 diff --git a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjmethodwrapper.h b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjmethodwrapper.h old mode 100755 new mode 100644 diff --git a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjobject.h b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjobject.h old mode 100755 new mode 100644 diff --git a/nativeLib/rary.ohd.filesystem/awips/hydroapps/whfs/bin/run_damcrest b/nativeLib/rary.ohd.filesystem/awips/hydroapps/whfs/bin/run_damcrest old mode 100755 new mode 100644 diff --git a/nativeLib/rary.ohd.filesystem/awips/hydroapps/whfs/bin/run_report_alarm b/nativeLib/rary.ohd.filesystem/awips/hydroapps/whfs/bin/run_report_alarm old mode 100755 new mode 100644 index 49a84038b7..065f4230e4 --- a/nativeLib/rary.ohd.filesystem/awips/hydroapps/whfs/bin/run_report_alarm +++ b/nativeLib/rary.ohd.filesystem/awips/hydroapps/whfs/bin/run_report_alarm @@ -5,7 +5,7 @@ # a product and send them to the text database # -# Revised:July 22, 2011 +# Revised:Sep 11, 2012 ###################################################################### @@ -133,7 +133,28 @@ export CLASSPATH=$HIBERNATE:$SPRING:$DB_DRIVER_PATH:$CAMEL:$GEOTOOLS:$JAVAX_MEAS # run the application # $SYS_JAVA_DIR/bin/java -Xms64m -Xmx512m com.raytheon.edex.plugin.shef.alarms.AlertalarmStdTextProductUtil -d$DB_NAME -p$PRODUCT_ID -s$SUFFIX -rNEAREST >> $LOGFILE 2>&1 +NUM_ALARMS=$? +if [ $NUM_ALARMS -eq 0 ] +then + print No alarms reported, info sent to $FILENAME >> $LOGFILE + print File NOT sent to text database >> $LOGFILE + +else + print $NUM_ALARMS alarms reported, report written to $FILENAME >> $LOGFILE + + echo Writing $FILENAME to textdb as id $PRODUCT_ID >> $LOGFILE + /awips2/fxa/bin/textdb -w $PRODUCT_ID < $FILENAME >> $LOGFILE 2>&1 + RETURN_STATUS=$? + + if [ $RETURN_STATUS -eq 0 ] + then + print Product successfully sent >> $LOGFILE + else + print Product send error detected, status= $RETURN_STATUS >> $LOGFILE + fi +fi + Dte=`date -u ` echo Completed report_alarm at $Dte >> $LOGFILE diff --git a/nativeLib/rary.ohd.filesystem/awips/hydroapps/whfs/bin/start_fcstservice b/nativeLib/rary.ohd.filesystem/awips/hydroapps/whfs/bin/start_fcstservice old mode 100755 new mode 100644 diff --git a/nativeLib/rary.ohd.filesystem/awips/hydroapps/whfs/bin/start_rivermonitor b/nativeLib/rary.ohd.filesystem/awips/hydroapps/whfs/bin/start_rivermonitor old mode 100755 new mode 100644 diff --git a/rpms/awips2.cave/deploy.builder/build.sh b/rpms/awips2.cave/deploy.builder/build.sh old mode 100755 new mode 100644 diff --git a/rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment b/rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment old mode 100644 new mode 100755 diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template old mode 100755 new mode 100644 diff --git a/rpms/awips2.qpid/SOURCES/qpidd b/rpms/awips2.qpid/SOURCES/qpidd old mode 100755 new mode 100644 diff --git a/rpms/python.site-packages/Installer.cherrypy/component.spec b/rpms/python.site-packages/Installer.cherrypy/component.spec old mode 100755 new mode 100644