Bugfixes. Engine Changed to Rhino. For details see CHANGELOG

Author: babaissarkar

CHANGELOG

@@ -4,3 +4,6 @@ Version 2.0 (31.08.2023)
     3. UI improvements
     4. Can change plot names from DataViewer
     5. Menu reorganization
+Version 2.1 (04.09.2023)
+    1. Switched Default Parsing Engine to Mozilla Rhino
+    2. Added scribble pad/notes area to the logs pane

ssplot-deb/usr/share/java/SSPlot-2.0.jar jar/SSPlot.jarssplot-deb/usr/share/java/SSPlot-2.0.jar renamed to jar/SSPlot.jar

@@ -8,7 +8,7 @@
 
   <groupId>com.babai.ssplot</groupId>
   <artifactId>SSPlot</artifactId>
-  <version>2.0</version>
+  <version>2.1</version>
 
   <name>SSPlot</name>
   <url>http://www.github.com/babaissarkar/ssplot</url>
@@ -61,6 +61,16 @@
   		<artifactId>flatlaf-intellij-themes</artifactId>
   		<version>3.2</version>
   	</dependency>
+  	<dependency>
+  		<groupId>org.mozilla</groupId>
+  		<artifactId>rhino</artifactId>
+ 		<version>1.7.14</version>
+	</dependency>
+  	<dependency>
+  		<groupId>org.mozilla</groupId>
+  		<artifactId>rhino-engine</artifactId>
+ 		<version>1.7.14</version>
+	</dependency>
   </dependencies>
 
   <build>
@@ -76,6 +86,8 @@
                         <include>com.formdev:flatlaf</include>
                         <include>com.formdev:flatlaf-intellij-themes</include>
                         <include>org.scilab.forge:jlatexmath</include>
+                        <include>org.mozilla:rhino</include>
+                        <include>org.mozilla:rhino-engine</include>
                     </includes>
                 </artifactSet>
             <transformers>

pom.xml

@@ -71,23 +71,27 @@ public class DBViewer extends JInternalFrame implements ActionListener {
     private ODEInputFrame input = null;
 
     private static PlotData zeroData;
-    static {
-    	Vector<Double> zeros = new Vector<Double>();
-    	zeros.add(0.0);
-    	zeros.add(0.0);
-    	
-    	Vector<Vector<Double>> zeros2d = new Vector<Vector<Double>>();
-    	for (int i = 0; i < 5; i++) {
-    		zeros2d.add(zeros);
-    	}
-    	zeroData = new PlotData(zeros2d);
-    }
+//    static {
+//    	Vector<Double> zeros = new Vector<Double>();
+//    	zeros.add(0.0);
+//    	zeros.add(0.0);
+//    	
+//    	Vector<Vector<Double>> zeros2d = new Vector<Vector<Double>>();
+//    	for (int i = 0; i < 5; i++) {
+//    		zeros2d.add(zeros);
+//    	}
+//    	zeroData = new PlotData(zeros2d);
+//    }
 
-    public DBViewer() {
-    	this(zeroData);
+    public DBViewer(ODEInputFrame input, PlotView pv) {
+//    	this(zeroData, input, pv);
+    	this(null, input, pv);
     }
 
-	public DBViewer(PlotData data) {
+	public DBViewer(PlotData data, ODEInputFrame input, PlotView pv) {
+		setODEInputFrame(input);
+		setView(pv);
+		
 		plotlist = new Vector<PlotData>();
 
         /* GUI */
@@ -106,9 +110,9 @@ public DBViewer(PlotData data) {
 					if (id != -1) {
 						PlotData curData = plotlist.get(id);
 						setDataOnly(curData);
-						if ((input != null) && (curData.sysData != null)) {
-							input.setSystemData(curData.sysData);
-						}
+//						if ((input != null) && (curData.sysData != null)) {
+//							input.setSystemData(curData.sysData);
+//						}
 					}
 					jcbPlotlist.setSelectedIndex(id);
 				}
@@ -164,7 +168,7 @@ public DBViewer(PlotData data) {
 		if (data != null) {
 			setData(data);
 		} else {
-			setBounds(500, 100, 700, 600);
+			setBounds(500, 100, 600, 600);
 		}
 
 		JScrollPane scroll = new JScrollPane(table,
@@ -253,12 +257,14 @@ private void setDataOnly(PlotData pdata) {
             columns.getColumn(i).setPreferredWidth(20);
 		}
 
+		// I should remove this part
 		if (80*colNo > 500) {
-            setBounds(500, 100, 80*colNo+200, 600);
+            setBounds(500, 100, 50*colNo+200, 600);
         } else {
         	setBounds(500, 100, 500+200, 600);
         }
-    }
+		
+	}
 
     /** @return the dataset */
     public PlotData getData() {
@@ -286,13 +292,17 @@ public PlotData getData() {
 
 //    	PlotData pdata = new PlotData(newdataset);
     	int id = jcbPlotlist.getSelectedIndex();
-    	PlotData curData = plotlist.get(id);
-    	curData.data = newdataset;
-    	curData.setDataCols(getCol1(), getCol2());
-    	updateList();
-    	jcbPlotlist.setSelectedIndex(id);
-    	
-        return curData;
+    	if (id != -1) {
+    		PlotData curData = plotlist.get(id);
+    		curData.data = newdataset;
+    		curData.setDataCols(getCol1(), getCol2());
+    		updateList();
+    		jcbPlotlist.setSelectedIndex(id);
+    		return curData;
+    	} else {
+    		System.err.println("No data found!");
+    		return zeroData;
+    	}
     }
 
     /** @return the number of rows in the dataset */
@@ -449,11 +459,13 @@ private void updateList() {
 		for (PlotData pdata : plotlist) {
 			jcbPlotlist.addItem(pdata.getTitle());
 		}
+		jcbPlotlist.setSelectedIndex(jcbPlotlist.getItemCount()-1);
 	}
 
 	public void clear() {
 		plotlist.clear();
-		updateList();
+//		updateList();
+		this.setData(zeroData);
 	}
 
 	public void setODEInputFrame(ODEInputFrame odeinput) {

src/main/java/com.babai.ssplot/math/plot/DBViewer.java

@@ -47,6 +47,8 @@
 import javax.swing.JOptionPane;
 import javax.swing.JRadioButtonMenuItem;
 import javax.swing.JSplitPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JTextArea;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
@@ -110,14 +112,14 @@ public MainFrame() {
 		odeinput.setClosable(true);
 		odeinput.setIconifiable(true);
 
-		dbv = new DBViewer();
-		dbv.setView(pv);
+		dbv = new DBViewer(odeinput, pv);
+//		dbv.setView(pv);
 		dbv.addListener(this);
 		dbv.setClosable(true);
 		dbv.setResizable(true);
 		dbv.setIconifiable(true);
 		dbv.setMaximizable(true);
-		dbv.setODEInputFrame(odeinput);
+//		dbv.setODEInputFrame(odeinput);
 
         pv.addMouseListener(
         		new MouseAdapter() {
@@ -307,33 +309,24 @@ public void mousePressed(MouseEvent ev) {
 
         mnuWindow.add(jmiShowDBV);
         mnuWindow.add(jmiShowEqn);
-        mnuWindow.add(jmiShowLogs);
-		
-		JSplitPane mainPane2 = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
-//		mainPane.setLeftComponent(pv);
-//		mainPane.setRightComponent(this.getLogger().getComponent());
-		mainPane2.setDividerLocation(600);
+//        mnuWindow.add(jmiShowLogs);
 
 		JDesktopPane mainPane = new JDesktopPane();
 		mainPane.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
 
 		ifrmPlot.setSize(Plotter.DEFAULT_W+50, Plotter.DEFAULT_H + 80);
 
-		ifrmLogs.setSize(560, 150);
-		ifrmLogs.setLocation(Plotter.DEFAULT_W + 100, 10);
-		ifrmLogs.setDefaultCloseOperation(JInternalFrame.HIDE_ON_CLOSE);
+//		ifrmLogs.setSize(560, 150);
+//		ifrmLogs.setLocation(Plotter.DEFAULT_W + 100, 10);
+//		ifrmLogs.setDefaultCloseOperation(JInternalFrame.HIDE_ON_CLOSE);
 
 		dbv.setSize(500, 500);
 		dbv.setLocation(Plotter.DEFAULT_W + 100, 180);
 		dbv.setDefaultCloseOperation(JInternalFrame.HIDE_ON_CLOSE);
 
 		odeinput.setSize(600, Plotter.DEFAULT_H + 80);
-		odeinput.setLocation(Plotter.DEFAULT_W + 100, 10);
+		odeinput.setLocation(Plotter.DEFAULT_W + 100, 0);
 
-		//put PV inside a panel
-//		JPanel pnlPV = new JPanel();
-//		pnlPV.add(pv);
-//		JScrollPane sp2 = new JScrollPane(pnlPV, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 		ifrmPlot.add(pv);
 		ifrmLogs.add(this.getLogger().getComponent());
 
@@ -375,12 +368,18 @@ public void mousePressed(MouseEvent ev) {
         odeinput.pack();
 
 		ifrmPlot.setVisible(true);
-//		dbv.setVisible(true);
-//		ifrmLogs.setVisible(true);
 		odeinput.setVisible(true);
 
+		JTabbedPane statusPane = new JTabbedPane();
+		statusPane.addTab("Logs", ifrmLogs.getContentPane());
+		JTextArea txtNotes = new JTextArea();
+		txtNotes.setText("You can write anything here.");
+		statusPane.addTab("Notes", txtNotes);
+		
+		JSplitPane mainPane2 = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+		mainPane2.setDividerLocation(550);
 		mainPane2.setTopComponent(mainPane);
-		mainPane2.setBottomComponent(ifrmLogs.getContentPane());
+		mainPane2.setBottomComponent(statusPane);
 
 		this.setJMenuBar(jmb);
         this.getContentPane().setLayout(new BorderLayout());        
@@ -506,13 +505,15 @@ public void actionPerformed(ActionEvent ae) {
 		} else if (ae.getSource() == jmAbout) {
 			String str ="""
 					 <h1>SSPlot</h1>
-					 Created by : Subhraman Sarkar, 2021<br>
+					 Version : 2.1.0<br>
+					 Created by : Subhraman Sarkar, 2021-2023<br>
 					 Available under the LGPL 2.1 license or, (at your choice)
 					 any later version.<br>
 					 Homepage : <a href='https://github.com/babaissarkar/ssplot'>
 					 https://github.com/babaissarkar/ssplot</a>
 					""";
             logger.log(str);
+			JOptionPane.showMessageDialog(this, "See Logs.");
         } else if (ae.getSource() == jmQuit) {
             System.exit(0);
 //        } else if (ae.getSource() == jmTitle) {
@@ -557,6 +558,7 @@ public void actionPerformed(ActionEvent ae) {
 
 	public void setPlotData(PlotData pdata) {
 		pv.setCurPlot(pdata);
+		pv.setCurPlotType(pdata.getPltype());
 		dbv.setData(pdata);
 	}