Changeset 35236 for branches/eam_branches/ipp-20130207/ippMonitor

Timestamp:

Mar 5, 2013, 2:24:05 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207

Files:

• . (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippMonitor/Makefile.in (modified) (1 diff)
• ippMonitor/raw/czartool_getplot.php (modified) (1 diff)
• ippMonitor/raw/heathers_plot.php (copied) (copied from trunk/ippMonitor/raw/heathers_plot.php )
• ippMonitor/raw/ipp.imfiles.dat (modified) (1 diff)

branches/eam_branches/ipp-20130207/ippMonitor/Makefile.in

@@ -76 +76 @@
 $(DESTWWW)/diskUsage.php \
 $(DESTWWW)/version.php \
-$(DESTWWW)/show_log.php 
+$(DESTWWW)/show_log.php \
+$(DESTWWW)/heathers_plot.php 
 
 DEFSRC = \

branches/eam_branches/ipp-20130207/ippMonitor/raw/czartool_getplot.php

@@ -34 +34 @@
 else if ($type=="id")
 $filePath = "$path/ippToPsps_density_".$label.".png";
+else if ($type=="hp_c")
+$filePath = "$path/heathers_plots/cam.png";
+else if ($type=="hp_s")
+$filePath = "$path/heathers_plots/skycal.png";
 
 

branches/eam_branches/ipp-20130207/ippMonitor/raw/ipp.imfiles.dat

@@ -24 +24 @@
 menutop   | menutop      | link    | czartool - ipptopsps         | czartool_ipptopsps.php
 menutop   | menutop      | link    | mask stats                   | maskStats.php
+menutop   | menutop      | link    | Heather's Plots              | heathers_plot.php
 
 menutop   | menutop      | plain   |                         |