Changeset e83480b359c565d8f63b410fcb38103793ddfb00

Show
Ignore:
Timestamp:
06/24/09 19:26:38 (5 years ago)
Author:
Umar Farooq <umar@omniti.com>
git-committer:
Umar Farooq <umar@omniti.com> 1245871598 +0000
git-parent:

[d614dd63f4060d13f617da4bd9a8027c9fee40a9]

git-author:
Umar Farooq <umar@omniti.com> 1245871598 +0000
Message:

match default granularity for plots, the initial blank worksheet is now editable, as it should be

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • ui/web/htdocs/drawing_board.php

    r4a1704f re83480b  
    9191       } 
    9292       else end = ""; 
     93       var gran = <?php echo "\"$gran\"";?>; 
    9394 
    9495       if(otype == 'graph') { 
    95           var gran = <?php echo "\"$gran\"";?>; 
    9696          $('#drawing_board').width('780px'); 
    9797          $('#drawing_board').height('400px'); 
    98           worksheet.render_graph_inpage('drawing_board', id, start, end); 
     98          worksheet.render_graph_inpage('drawing_board', id, start, end, gran); 
    9999       } 
    100100       else if(otype == 'wsheet') { 
    101101          $('#drawing_board').width('1200px'); 
    102102          $('#drawing_board').height('800px'); 
    103           worksheet.render_ws_inpage('drawing_board', id, start, end); 
     103          worksheet.render_ws_inpage('drawing_board', id, start, end, gran); 
    104104       } 
    105105} 
  • ui/web/htdocs/js/recon.js

    rd614dd6 re83480b  
    814814  var ws_displayinfo = { start : 14*86400, cnt: '100', end: '' }; 
    815815  var wsinfo = {}; 
    816   var locked = true; 
     816  var locked = false; 
    817817  streaming = false;  //precautionary...should be set to false wherever we use it when weere done 
    818818  var stream_graph; 
     
    865865  } 
    866866 
    867   function render_ws_inpage(divid, id, start, end) { 
     867  function render_ws_inpage(divid, id, start, end, gran) { 
    868868      ws_displayinfo.start = start; 
    869869      ws_displayinfo.end = end; 
     870      if(gran) ws_displayinfo.cnt = gran; 
    870871 
    871872      plot_board = $('#'+divid); 
     
    914915  } 
    915916 
    916   function render_graph_inpage(divid, id, start, end) { 
     917  function render_graph_inpage(divid, id, start, end, gran) { 
    917918 
    918919$.getJSON("json/graph/info/" + id, function (ginfo) { 
     920 
    919921              streaming = false;  //precautionary 
    920922              stream_graph = $('#'+divid); 
    921               stream_graph.ReconGraph({graphid: ginfo.id, type: ginfo.type}); 
     923              stream_graph.ReconGraph({graphid: ginfo.id, type: ginfo.type, width: (gran) ? gran : 780}); 
    922924              stream_graph.ReconGraphRefresh({graphid: ginfo.id, start: start, end: end, stacks: ginfo.stacks}); 
    923925 
     
    987989 
    988990    streaming = false;  //precautionary 
    989     stream_graph = $('<div></div>').ReconGraph({graphid: ginfo.id, type: ginfo.type}); 
     991    stream_graph = $('<div></div>').ReconGraph({graphid: ginfo.id, type: ginfo.type, width:780}); 
    990992    var smod = stream_graph.modal({ 
    991993      containerId: 'StreamingModalContainer', 
     
    11521154                   else { 
    11531155                      $(".rememberWorksheet").html('Remebered').fadeOut('slow'); 
     1156                      if(wsinfo.id) update_worksheet_permalink(wsinfo.id, "", "", ""); 
    11541157                      unlock_wforms(); 
    11551158                   } 
     
    11881191         }); 
    11891192      } 
    1190       update_worksheet_permalink(wsinfo.id, "", "", ""); 
     1193      update_worksheet_permalink(wsinfo.id, "", "", ws_displayinfo.cnt); 
    11911194      ul.sortable("refresh"); 
    11921195  } 
     
    12261229    ws_displayinfo.end = end; 
    12271230    if(cnt) ws_displayinfo.cnt = cnt; 
    1228     update_worksheet_permalink(wsinfo.id, ws_displayinfo.start, ws_displayinfo.end, ""); 
     1231    update_worksheet_permalink(wsinfo.id, ws_displayinfo.start, ws_displayinfo.end, ws_displayinfo.cnt); 
    12291232  } 
    12301233  function refresh_worksheet() {