diff --git a/html/spreadsheet.html b/html/spreadsheet.html index 177ca05..6357164 100644 --- a/html/spreadsheet.html +++ b/html/spreadsheet.html @@ -29,8 +29,8 @@ const { dialog, BrowserWindow, Menu } = remote; var full = document.getElementById("fullS"); var xcol = [], data = [], hot, columns = [], xName, mytable; - var btn = document.getElementById("btn"); - btn.style.visibility = "hidden"; + // var btn = document.getElementById("btn"); + // btn.style.visibility = "hidden"; var event, th_in = 0, $ch = $("#custom-handle"), $slider = $("#slider"); ipcRenderer.on("slider", function (e, d) { @@ -76,10 +76,11 @@ allowRenameColumn : false, updateTable:function(_, cell, _, _, _, label, _) {cell.style.color = parseFloat(label)!=label ? 'red' : '#000000'}, onload:_=>setTimeout(_=>{let tt=$('.jexcel_content'); tt.height(window.innerHeight-tt.offset().top-10)},1), - onchange:_=>btn.style.visibility = "visible", - onsort:_=>{data[th_in] = mytable.records.map(x=>x.map(y=>y.innerHTML));btn.style.visibility = "visible"} + // onchange:_=>btn.style.visibility = "visible", + // oninsertrow:_=>btn.style.visibility = "visible", + onsort:_=>{data[th_in] = mytable.records.map(x=>x.map(y=>y.innerHTML))}//;btn.style.visibility = "visible"} }) - mytable.setData(data[0]) + mytable.setData(data[0]) }) @@ -93,10 +94,8 @@ return m[0].map((_, i) => m.map(x => x[i])); }; - - function updateData() { //parse the formulas during the return - btn.style.visibility = "hidden"; + // btn.style.visibility = "hidden"; var dat = data.map(blocks=> blocks.map(line=>line.map(elem=>{ if (('' + elem).substr(0,1) == '=') return mytable.executeFormula(elem); return elem }))) diff --git a/lib/init.min.js b/lib/init.min.js index eec4f83..630ef8a 100644 --- a/lib/init.min.js +++ b/lib/init.min.js @@ -1 +1 @@ -require("v8-compile-cache");const{remote:remote,ipcRenderer:ipcRenderer,shell:shell}=require("electron"),{dialog:dialog,BrowserWindow:BrowserWindow,Menu:Menu,MenuItem:MenuItem,app:app}=remote;var recentLocation,recentFiles=[];function versionCheck(){require("request")({url:"https://api.github.com/repos/Koushikphy/Interactive-Data-Editor/releases/latest",headers:{"User-Agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1521.3 Safari/537.36});"}},function(e,e,n){var r=JSON.parse(n).name;if(r!=`v${require("../package.json").version}`){var t=`A new version of the software ${r} is available.\n Do you want to download it now?`;dialog.showMessageBoxSync({type:"question",title:"Update available!!!",message:t,buttons:["OK","Cancel"]})||shell.openExternal("https://koushikphy.github.io/ide/#download--installation")}})}function replaceWithHome(e){var n=process.env.HOME||process.env.USERPROFILE;return e.includes(n)?e.replace(n,"~"):e}function recentMenu(){var e=menu.getMenuItemById("rf").submenu,n=menu.getMenuItemById("arf").submenu;recentFiles.length>10&&recentFiles.splice(0,1),e.clear(),n.clear();for(let o=recentFiles.length-1;o>=0;o--){var r=replaceWithHome(recentFiles[o].slice()),t={label:r,click(){ipcRenderer.send("rf",recentFiles[o])}},l={label:r,click(){ipcRenderer.send("adrf",recentFiles[o])}};e.append(new MenuItem(t)),n.append(new MenuItem(l))}localStorage.setItem("files",JSON.stringify(recentFiles))}var fl,menu=Menu.getApplicationMenu();if(null!==(fl=JSON.parse(localStorage.getItem("files")))&&(recentFiles=fl,recentMenu()),null!==(fl=JSON.parse(localStorage.getItem("recent")))&&(recentLocation=fl),app.isPackaged)if(versionCheck(),remote.process.argv.length>1)window.onload=function(){let e=path.resolve(__dirname,remote.process.argv[1]);console.log(e),fileReader(e)};else{require("particles.js");window.particlesJS.load("particle","../lib/particles.json")}else document.getElementById("branding").remove(),document.getElementById("particle").remove(),document.getElementById("full").style.display="block",remote.process.argv.length>2&&(window.onload=function(){let e=path.resolve(process.cwd(),remote.process.argv[2]);console.log(e),console.log(process.cwd()),fileReader(e)}); \ No newline at end of file +require("v8-compile-cache");const{remote:remote,ipcRenderer:ipcRenderer,shell:shell}=require("electron"),{dialog:dialog,BrowserWindow:BrowserWindow,Menu:Menu,MenuItem:MenuItem,app:app}=remote;var recentLocation,recentFiles=[];function versionCheck(){require("request")({url:"https://api.github.com/repos/Koushikphy/Interactive-Data-Editor/releases/latest",headers:{"User-Agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1521.3 Safari/537.36});"}},function(e,e,r){var t=JSON.parse(r).name;if(t!=`v${require("../package.json").version}`){var n=`A new version of the software ${t} is available.\n Do you want to download it now?`;dialog.showMessageBoxSync({type:"question",title:"Update available!!!",message:n,buttons:["OK","Cancel"]})||shell.openExternal("https://koushikphy.github.io/ide/#download--installation")}})}function replaceWithHome(e){var r=process.env.HOME||process.env.USERPROFILE;return e.includes(r)?e.replace(r,"~"):e}function recentMenu(){var e=menu.getMenuItemById("rf").submenu,r=menu.getMenuItemById("arf").submenu;recentFiles.length>10&&recentFiles.splice(0,1),e.clear(),r.clear();for(let o=recentFiles.length-1;o>=0;o--){var t=replaceWithHome(recentFiles[o].slice()),n={label:t,click(){ipcRenderer.send("rf",recentFiles[o])}},l={label:t,click(){ipcRenderer.send("adrf",recentFiles[o])}};e.append(new MenuItem(n)),r.append(new MenuItem(l))}localStorage.setItem("files",JSON.stringify(recentFiles))}var fl,menu=Menu.getApplicationMenu();if(null!==(fl=JSON.parse(localStorage.getItem("files")))&&(recentFiles=fl,recentMenu()),null!==(fl=JSON.parse(localStorage.getItem("recent")))&&(recentLocation=fl),app.isPackaged)if(versionCheck(),remote.process.argv.length>1)window.onload=function(){let e=path.resolve(process.cwd(),remote.process.argv[1]);fileReader(e)};else{require("particles.js");window.particlesJS.load("particle","../lib/particles.json")}else document.getElementById("branding").remove(),document.getElementById("particle").remove(),document.getElementById("full").style.display="block",remote.process.argv.length>2&&(window.onload=function(){let e=path.resolve(process.cwd(),remote.process.argv[2]);fileReader(e)}); \ No newline at end of file diff --git a/src/dataOp.js b/src/dataOp.js index 65d4ebb..51e065c 100644 --- a/src/dataOp.js +++ b/src/dataOp.js @@ -116,8 +116,9 @@ function dataFiller() { for (let i = 0; i < data[0].length; i++) if (i != col.y) cols_wo_y.push(i) } - for(let dt of data){ + for(let dt of data[0][col.y]){ if(dt[0]>=dt[1]){ + console.log(dt[0],dt[1]) alert('Monotonically increasing values required for interpolation.\n NOTE: You can use the spreadsheet to sort the data') return } diff --git a/src/functions.js b/src/functions.js index d548e87..5db8998 100644 --- a/src/functions.js +++ b/src/functions.js @@ -37,7 +37,7 @@ function updateData() { col2dChanged() }; fullDataCols[0] = JSON.parse(JSON.stringify(col)); - updatePlot(1); + updatePlot(); makeRows(); startDragBehavior(); updateOnServer(); @@ -88,7 +88,6 @@ function fileReader(fname) { buttons: ['Yes', "No"] }); if (res) return; - // parse the file and data data = parseData(fs.readFileSync(fname, "utf8")) if(data==undefined) return @@ -120,7 +119,7 @@ function fileReader(fname) { if (window["pJSDom"] instanceof Array) window["pJSDom"][0].pJS.fn.vendors.destroypJS(); $("#full").show(); $('#jsoneditor').height(window.innerHeight - jsoneditor.offsetTop) - if (figurecontainer.data.length > 2){ + if (figurecontainer.data.length > 1){ let tt = []; for(let i=1;i