bug fix, ranged selector, v2.9.1

Author: Koushikphy

README.md

@@ -2,9 +2,9 @@
 ### <i>A Software to interactively edit data in a graphical manner.</i>
 
 
-[![Version](https://img.shields.io/badge/Version-2.8.0-brightgreen.svg)]() 
+[![Version](https://img.shields.io/badge/Version-2.9.1-brightgreen.svg)]() 
 [![MIT License](https://img.shields.io/badge/License-MIT-brightgreen.svg)](https://github.com/Koushikphy/Interactive_Data_Editor/blob/master/LICENSE)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3947508.svg)](https://doi.org/10.5281/zenodo.3947508)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3947507.svg)](https://doi.org/10.5281/zenodo.3947507)
 [![Version](https://img.shields.io/badge/Web-https://koushikphy.github.io/ide/-success.svg)](https://koushikphy.github.io/ide/)  
 
 ![alt text](figs/screenshot.gif "Screen shot")
@@ -43,4 +43,4 @@ Licensed under the MIT License.
 
 
 ## Citaion
-If this software was helpful in your work, please cite this project as https://doi.org/10.5281/zenodo.3947508.
+If this software was helpful in your work, please cite this project as https://doi.org/10.5281/zenodo.3947507.

RELEASE.md

@@ -1,3 +1,24 @@
+## v2.9.1
+1. Added multiplot surface plot option for the 3D viewer.
+1. Ranged selector, select intermediate points that are out of the view.
+2. Fixed several bugs.
+
+
+## v2.9.0
+### NEW:
+1. Directly load multiple files.
+3. List of plot is moved to a sidebar instead of the popup window.
+5. Lock axes when working with multiple files.
+7. Save fitted data.
+9. `Fill values` can now take number of gird or grid spacing
+
+### Fixed:
+2. Fixed bug with loading file directly from terminal.
+4. Fixed bug in undo.
+6. Fixed bug with swapper when working with multiple files.
+8. Fixed bug with 3D viewer not updating
+
+
 ## v2.8.0
 1. UI changes.
 2. doc style changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "interactive_data_editor",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "main": "index.js",
   "description": "A Software to interactively edit data in a graphical manner.",
   "homepage": "https://github.com/Koushikphy/Interactive-Data-Editor",

src/html/about.html

@@ -52,12 +52,12 @@
         <div style="font-size: large;font-style: italic;margin-top: 3px; font-weight:500">
             A Software to interactively edit data in a graphical manner
         </div>
-        <div id='versionname' style="font-size: large;margin-top: 7px">Version 2.8.0 </div>
+        <div id='versionname' style="font-size: large;margin-top: 7px">Version 2.9.1 </div>
         <div style="font-size: larger;margin-top: 5px;font-style: italic;margin-bottom: 9px; font-weight:600">
             Developed by Koushik Naskar
         </div>
         <div style="font-size: larger;margin-top: 50px;font-style: italic;margin-bottom: 9px;font-weight:530">
-            Copyright &copy; July, 2020 Koushik Naskar
+            Copyright &copy; October, 2020 Koushik Naskar
         </div>
 
         <a title="Open website" href="javascript:void(0)" onclick="shell.openExternal('https://koushikphy.github.io');"><img src="../../figs/internet.png" width="30" height="30"></a>

src/html/doc.html

@@ -207,7 +207,7 @@
         <img src="../../figs/charts.png" alt="Interactive Data Editor" height="13%",width='13%' id='charts'>
         <br>
         <label for="charts" id='chartitle'>Interactive Data Editor</label>
-        <label for="charts" id='charsubtitle'>v2.8.0</label>
+        <label for="charts" id='charsubtitle'>v2.9.1</label>
         <br>
         <!-- <label for="charts">v2.7.0</label> -->
         <a href="javascript:void(0)" class="page" id='getStart' onclick="showThis(0)">Getting Startted</a>
@@ -275,10 +275,10 @@
                 User Interface
             </div>
             <div class="textarea">
-                <p> The main window has basically 3 parts, Menu bar, Tool bar, and the Plot area. 
+                <p> The main window has basically 3 parts, Menu bar, Tool bar, Plot area and the Plot list dashboard. 
                     Most of the menubar options are self-explanatory and are detailed in the following sections.
-                    Tool bar contains the column selector and slider. Appropriate columns can be set from the column selector, while setting primary editable plot and 
-                    adding or removing plots is done from the plot utility. 
+                    Tool bar contains the column selector and slider. Appropriate columns can be set from the column selector, 
+                    while setting primary editable plot and adding or removing plots is done from the Plot list dashboard. 
                     The slider, available only when working with 3D data, is used
                     to change the X/Y value for which the corresponding 2D cut is plotted.
                 </p>
@@ -292,7 +292,8 @@
                     Apart from the main window this application has 2 external windows, which are accessed from the 'windows' menu in Menubar. 
                     Using the <label class='dom'>3D Plot Viewer</label> one can
                     view the complete 3D plot in real time as you edit the the 2D projection on main window. Two types of 3D plots are available
-                    here, surface type and wireframe type and either one can be selected using the provided menu.
+                    here, surface type and wireframe type and either one can be selected using the provided menu. By default it shows only the surface being edited,
+                    check <label class='dom'>Plot all</label> to show all the traces.
                     On the otherhand, with <label class='dom'>Spreadsheet</label> one can check the data in spreadsheet like editor, 
                     with all basic excel like feature e.g. editing, sorting, applying formulas etc. This is useful if you want to edit the 
                     data directly instead of the graphical way.
@@ -473,6 +474,7 @@
                     <li><label class="key">&lt;dot></dot></label> Move slider up.</li>
                     <li><label class="key">&lt;comma></label> Move slider down.</li>
                     <li><label class="key">P</label> Swap data between the selected lines.</li>
+                    <li><label class="key">Ctrl+A</label> Select intermediate points.</li>
                     <li><label class="key">Ctrl+C</label> Copy values from current 2D projection.</li>
                     <li><label class="key">Ctrl+V</label> Paste copied values.</li>
                     <li><label class="key">Ctrl+ Left/Right Arrow</label> Repeat selected points to left or right.</li>

src/html/index.html

@@ -18,12 +18,12 @@
             <div style="font-size: large;font-style: italic;margin-top: 3px; font-weight:500">
                 A Software to interactively edit data in a graphical manner
             </div>
-            <div id='versionname' style="font-size: large;margin-top: 7px">Version 2.8.0 </div>
+            <div id='versionname' style="font-size: large;margin-top: 7px">Version 2.9.1 </div>
             <div style="font-size: larger;margin-top: 5px;font-style: italic;margin-bottom: 9px; font-weight:600">
                 Developed by Koushik Naskar
             </div>
             <div style="font-size: larger;margin-top: 50px;font-style: italic;margin-bottom: 9px;font-weight:530">
-                Copyright &copy; July, 2020 Koushik Naskar
+                Copyright &copy; October, 2020 Koushik Naskar
             </div>
 
             <a title="Open website" href="javascript:void(0)" onclick="shell.openExternal('https://koushikphy.github.io');"><img src="../../figs/internet.png" width="30" height="30"></a>

src/js/functions.js

@@ -171,15 +171,13 @@ function fileReader(fname) {
     undoStack = []; redoStack = []; swapperIsOn = false;
 
     if(figurecontainer.data.length>1) { // delete extra traces
+        Plotly.deleteTraces(figurecontainer,Plotly.d3.range(1,figurecontainer.data.length))
         if(currentEditable!=0){
-            let tmp = clone(iniPointsD)
-            delete tmp.x; delete tmp.y // iniPointsD x/y is not in update format
-            Plotly.update(figurecontainer,tmp,clone(layout))
+            Plotly.update(figurecontainer, {... clone(iniPointsD), x:[[1]], y:[[1]]}, clone(layout))
             $(`.scatterlayer .trace:first-of-type .points path`).css({'pointer-events':'all'})
             points = figurecontainer.querySelector(".scatterlayer .trace:first-of-type .points").getElementsByTagName("path");
             currentEditable = 0
         }
-        Plotly.deleteTraces(figurecontainer,Plotly.d3.range(1,figurecontainer.data.length))
     }
 
 
@@ -229,12 +227,9 @@ function addNewFileDialog() {
 
 
 function addNewFile(fname) {
-    // let dat = parseData(fs.readFileSync(fname, "utf8"))
-    // if(dat==undefined) return
     dat = fileOpener(fname)
     if (fullData[0].length != dat.length) alertElec("Trying to open a file with different grid.\nThis is not supported for 3D data.",1,"Can't add the file!!!")
-        // return
-    // }
+
 
     let dirname = path.dirname(fname);
     let filename = path.basename(fname, path.extname(fname));
@@ -253,6 +248,20 @@ function addNewFile(fname) {
     makeRows()
 }
 
+function addTrace(){
+    let ind = fullData.length-1
+    let thisTrace = {
+        ... clone(iniPointsD),
+        x : fullData[ind][th_in][fullDataCols[ind].y],
+        y : fullData[ind][th_in][fullDataCols[ind].z],
+        name : legendNames[ind]
+    }
+
+    delete thisTrace.marker.color
+    delete thisTrace.line.color
+
+    Plotly.addTraces(figurecontainer, thisTrace);
+}
 
 
 var cRange=false,cRangeY=[NaN, NaN]; //hidden feature
@@ -483,20 +492,6 @@ function changeEditable2(ind){ // used for deleting trace below the currentedita
 
 
 
-function addTrace(){
-    let ind = fullData.length-1
-    let thisTrace = {
-        ... iniPointsD,
-        x : fullData[ind][th_in][fullDataCols[ind].y],
-        y : fullData[ind][th_in][fullDataCols[ind].z],
-        name : legendNames[ind]
-    }
-    delete thisTrace.marker.color
-    delete thisTrace.line.color
-    Plotly.addTraces(figurecontainer, thisTrace);
-}
-
-
 var swapperIsOn = false
 function openSwapper() {
     if (fileNames.length!=1) alertElec("Can't use this feature when multiple files are open.",0,"Operation Unavailable")

src/js/keyIpcTrigger.js

@@ -108,6 +108,10 @@ window.onkeydown = function hotKeys(e) {
     }else if(e.key=="ArrowRight" && !e.ctrlKey && e.shiftKey){
         moveReflect(true, true)
 
+    }else if ((e.key=="a" || e.key=="A") && e.ctrlKey) {
+        index = Plotly.d3.range(index[0], index[index.length-1]+1,1)
+        Plotly.restyle(figurecontainer, {selectedpoints : [index]})
+
     // }else{
     //     console.log('No available trigger',e.key)
     }