Index: /trunk/FACT++/www/viewer/index.html
===================================================================
--- /trunk/FACT++/www/viewer/index.html	(revision 17737)
+++ /trunk/FACT++/www/viewer/index.html	(revision 17738)
@@ -268,12 +268,37 @@
 <div id="waveformcontainer"  class="ui-widget-content">
    <div id="waveform" style="width:100%;height:300px;"></div>
-   <div style="text-align:center;margin-bottom:2px">
-      Min: 
-      <input id="waveformmin"   style="text-align:right"type="number"   onchange="onWaveformMinMax();"  value="0" disabled="true"></input>
-      <input id="waveformminon" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
-      Max: 
-      <input id="waveformmax"   style="text-align:right"type="number"   onchange="onWaveformMinMax();"  value="0" disabled="true"></input>
-      <input id="waveformmaxon" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
-   </div>
+   <table style="width:100%">
+      <colgroup>
+         <col style="width:50%;">
+         <col style="width:50%;">
+      </colgroup>
+      <tr>  
+         <td style="text-align:left">
+            <span style="white-space:nowrap;float:left">
+               Xmin:
+               <input id="waveformxmin"   style="width:55px;text-align:right"type="number"   onchange="onWaveformMinMax();"  value="0" disabled="true"></input>
+               <input id="waveformxminon" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
+               &nbsp;
+      	    </span>
+      	    <span style="white-space:nowrap;float:left">
+               Xmax:
+               <input id="waveformxmax"   style="width:55px;text-align:right"type="number"   onchange="onWaveformMinMax();"  value="0" disabled="true"></input>
+               <input id="waveformxmaxon" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
+      	    </span>
+     	 </td>
+         <td style="text-align:right">
+            <span style="white-space:nowrap;">
+               Ymin: 
+               <input id="waveformmin"   style="text-align:right"type="number"   onchange="onWaveformMinMax();"  value="0" disabled="true"></input>
+               <input id="waveformminon" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
+            </span>
+            <span style="white-space:nowrap;">
+               &nbsp;Ymax:
+               <input id="waveformmax"   style="text-align:right"type="number"   onchange="onWaveformMinMax();"  value="0" disabled="true"></input>
+               <input id="waveformmaxon" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
+           </span>
+         </td>
+      </tr>
+   </table>
 </div>
 
Index: /trunk/FACT++/www/viewer/index.js
===================================================================
--- /trunk/FACT++/www/viewer/index.js	(revision 17737)
+++ /trunk/FACT++/www/viewer/index.js	(revision 17738)
@@ -495,4 +495,9 @@
         waveform.xmax = evt.numRoi;
 
+        if (document.getElementById("waveformxminon").checked)
+            document.getElementById("waveformxmin").value = waveform.xmin;
+        if (document.getElementById("waveformxmaxon").checked)
+            document.getElementById("waveformxmax").value = waveform.xmax;
+
         if (document.getElementById("waveformminon").checked)
             document.getElementById("waveformmin").value = waveform.ymin;
@@ -500,4 +505,7 @@
             document.getElementById("waveformmax").value = waveform.ymax;
 
+        var xmin = document.getElementById("waveformxminon").checked ? waveform.xmin : parseInt(document.getElementById("waveformxmin").value);
+        var xmax = document.getElementById("waveformxmaxon").checked ? waveform.xmax : parseInt(document.getElementById("waveformxmax").value);
+
         var ymin = document.getElementById("waveformminon").checked ? waveform.ymin : parseInt(document.getElementById("waveformmin").value);
         var ymax = document.getElementById("waveformmaxon").checked ? waveform.ymax : parseInt(document.getElementById("waveformmax").value);
@@ -506,6 +514,6 @@
         {
            xaxis: {
-               min: waveform.xmin-1,
-               max: waveform.xmax+1,
+               min: xmin-1,
+               max: xmax+1,
            },
            yaxis: {
@@ -903,4 +911,8 @@
 
     var redraw;
+    if (!document.getElementById("waveformxminon").checked)
+        xmin = document.getElementById("waveformxmin").value;
+    if (!document.getElementById("waveformxmaxon").checked)
+        xmax = document.getElementById("waveformxmax").value;
     if (!document.getElementById("waveformminon").checked)
         ymin = document.getElementById("waveformmin").value;
@@ -919,4 +931,22 @@
 
     var redraw;
+    if (document.getElementById("waveformxminon").checked)
+    {
+        document.getElementById("waveformxmin").setAttribute("disabled", "true");
+        document.getElementById("waveformxmin").value = wf.xmin;
+        xmin = wf.xmin-1;
+    }
+    else
+        document.getElementById("waveformxmin").removeAttribute("disabled");
+
+    if (document.getElementById("waveformxmaxon").checked)
+    {
+        document.getElementById("waveformxmax").setAttribute("disabled", "true");
+        document.getElementById("waveformxmax").value = wf.xmax;
+        xmax = wf.xmax+1;
+    }
+    else
+        document.getElementById("waveformxmax").removeAttribute("disabled");
+
     if (document.getElementById("waveformminon").checked)
     {