Skip to content

Commit

Permalink
Records implementation (WIP)
Browse files Browse the repository at this point in the history
  • Loading branch information
kernelshreyak committed Feb 25, 2024
1 parent eb53d0c commit 1960450
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/com/edass/GUI/EdassGUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class EdassGUI implements ActionListener {

AnalysisEngine engine;

private ArrayList<EdassRecord> records = new ArrayList<>();
private final ArrayList<EdassRecord> records = new ArrayList<>();

public EdassGUI(AnalysisEngine analysis_engine){
JFrame frame = new JFrame("EDASS 1.0");
Expand Down Expand Up @@ -90,7 +90,7 @@ public void showDataTable(Dataset<Row> df){
String[][] rows = AnalysisUtilities.dataframeToRows(df,50);
String[] columns = engine.getDataFrame().columns();

records.add(new AnalysisRecord("Data View " + (records.size() + 1),df,""));
records.add(new AnalysisRecord("Data View " + (records.size() + 1),df,"",null));

JTable data_table = new JTable(rows,columns);
JFrame new_window = new JFrame("Data View");
Expand Down
4 changes: 2 additions & 2 deletions src/com/edass/Record/AnalysisRecord.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
public class AnalysisRecord extends EdassRecord{
private final Dataset<Row> dataFrame;
private final String analysisOutput;
public AnalysisRecord(String recordName, Dataset<Row> dataFrame, String analysisOutput) {
super(recordName);
public AnalysisRecord(String recordName, Dataset<Row> dataFrame, String analysisOutput,EdassRecord parentRecord) {
super(recordName,parentRecord);
this.dataFrame = dataFrame;
this.analysisOutput = analysisOutput;
}
Expand Down
10 changes: 8 additions & 2 deletions src/com/edass/Record/EdassRecord.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@
* Represents an operation (Analysis, Transformation etc.) on EDASS which can be stored and executed at a later time
*/
public class EdassRecord {
private String recordName;
private final String recordName;
private final EdassRecord parentRecord;

public EdassRecord(String recordName) {
public EdassRecord(String recordName, EdassRecord parentRecord) {
this.recordName = recordName;
this.parentRecord = parentRecord;
}

public String getRecordName() {
return recordName;
}

public EdassRecord getParentRecord() {
return parentRecord;
}
}
4 changes: 2 additions & 2 deletions src/com/edass/Record/TransformationRecord.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.edass.Record;

public class TransformationRecord extends EdassRecord {
public TransformationRecord(String recordName) {
super(recordName);
public TransformationRecord(String recordName,EdassRecord parentRecord) {
super(recordName,parentRecord);
}
}

0 comments on commit 1960450

Please sign in to comment.