Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Export csv/fix issue 161 #162

Merged
merged 2 commits into from
Nov 18, 2018
Merged

Export csv/fix issue 161 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe257da
rename variable skip_colum to firstdata_column
PeterPitterling Nov 18, 2018
dae9eee
fix issue #161 - getCsvLineHeader & getCsvLine
PeterPitterling Nov 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/main/java/net/atomique/ksar/graph/Graph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class Graph {

private static final Logger log = LoggerFactory.getLogger(Graph.class);

public Graph(kSar hissar, GraphConfig g, String Title, String hdrs, int skipcol,
public Graph(kSar hissar, GraphConfig g, String Title, String hdrs, int firstdatacolumn,
SortedTreeNode pp) {
mysar = hissar;
graphtitle = Title;
Expand All @@ -68,7 +68,7 @@ public Graph(kSar hissar, GraphConfig g, String Title, String hdrs, int skipcol,
}

});
skipColumn = skipcol;
firstDataColumn = firstdatacolumn;
if (pp != null) {
TreeNodeInfo infotmp = new TreeNodeInfo(Title, this);
SortedTreeNode nodetmp = new SortedTreeNode(infotmp);
Expand All @@ -80,7 +80,7 @@ public Graph(kSar hissar, GraphConfig g, String Title, String hdrs, int skipcol,

private void create_DataStore() {
// create timeseries
for (int i = skipColumn; i < HeaderStr.length; i++) {
for (int i = firstDataColumn; i < HeaderStr.length; i++) {
Stats.add(new TimeSeries(HeaderStr[i]));
}
// create stack
Expand Down Expand Up @@ -112,7 +112,7 @@ public int parse_line(Second now, String s) {
String[] cols = s.split("\\s+");
Double colvalue;
//log.debug("graph parsing: {}", s);
for (int i = skipColumn; i < HeaderStr.length; i++) {
for (int i = firstDataColumn; i < HeaderStr.length; i++) {
try {
colvalue = new Double(cols[i]);
} catch (NumberFormatException ne) {
Expand All @@ -127,7 +127,7 @@ public int parse_line(Second now, String s) {
return 0;
}

add_datapoint_plot(now, i - skipColumn, HeaderStr[i - skipColumn], colvalue);
add_datapoint_plot(now, i - firstDataColumn, HeaderStr[i - firstDataColumn], colvalue);


TimeTableXYDataset tmp = StackListbyCol.get(HeaderStr[i]);
Expand Down Expand Up @@ -256,8 +256,8 @@ public String make_csv() {

public String getCsvHeader() {
StringBuilder tmp = new StringBuilder();
for (int i = 1 + skipColumn; i < HeaderStr.length; i++) {
TimeSeries tmpseries = Stats.get(i - skipColumn);
for (int i = firstDataColumn; i < HeaderStr.length; i++) {
TimeSeries tmpseries = Stats.get(i - firstDataColumn);
tmp.append(graphtitle).append(" ").append(tmpseries.getKey());
tmp.append(";");
}
Expand All @@ -266,8 +266,8 @@ public String getCsvHeader() {

public String getCsvLine(RegularTimePeriod t) {
StringBuilder tmp = new StringBuilder();
for (int i = 1 + skipColumn; i < HeaderStr.length; i++) {
TimeSeries tmpseries = Stats.get(i - skipColumn);
for (int i = firstDataColumn; i < HeaderStr.length; i++) {
TimeSeries tmpseries = Stats.get(i - firstDataColumn);
tmp.append(tmpseries.getValue(t));

tmp.append(";");
Expand Down Expand Up @@ -477,7 +477,7 @@ private Second convertLocalDateTimeToSecond(LocalDateTime ldt) {
private boolean printSelected = true;
private JCheckBox printCheckBox = null;
private GraphConfig graphconfig = null;
private int skipColumn = 0;
private int firstDataColumn = 0;
private String[] HeaderStr = null;
private ArrayList<TimeSeries> Stats = new ArrayList<TimeSeries>();
private Map<String, TimeTableXYDataset> StackListbyName =
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/net/atomique/ksar/graph/List.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

public class List {

public List(kSar hissar, GraphConfig g, String stitle, String sheader, int i) {
public List(kSar hissar, GraphConfig g, String stitle, String sheader, int firstdatacolumn) {
mysar = hissar;
HeaderStr = sheader;
graphconfig = g;
Title = stitle;
skipColumn = i;
FirstDataColumn = firstdatacolumn;
ParentNodeInfo tmp = new ParentNodeInfo(Title, this);
parentTreeNode = new SortedTreeNode(tmp);
mysar.add2tree(mysar.graphtree, parentTreeNode);
Expand All @@ -49,15 +49,15 @@ public int parse_line(LocalDateTime ldt, String s) {
public int parse_line(Second now, String s) {
String cols[] = s.split("\\s+");
Graph tmp;
if (!nodeHashList.containsKey(cols[skipColumn])) {
tmp = new Graph(mysar, graphconfig, Title + " " + cols[skipColumn], HeaderStr, skipColumn + 1,
if (!nodeHashList.containsKey(cols[FirstDataColumn])) {
tmp = new Graph(mysar, graphconfig, Title + " " + cols[FirstDataColumn], HeaderStr, FirstDataColumn + 1,
null);
nodeHashList.put(cols[skipColumn], tmp);
TreeNodeInfo infotmp = new TreeNodeInfo(cols[skipColumn], tmp);
nodeHashList.put(cols[FirstDataColumn], tmp);
TreeNodeInfo infotmp = new TreeNodeInfo(cols[FirstDataColumn], tmp);
SortedTreeNode nodetmp = new SortedTreeNode(infotmp);
mysar.add2tree(parentTreeNode, nodetmp);
} else {
tmp = nodeHashList.get(cols[skipColumn]);
tmp = nodeHashList.get(cols[FirstDataColumn]);
}

return tmp.parse_line(now, s);
Expand Down Expand Up @@ -111,7 +111,7 @@ public JPanel getprintform() {
protected kSar mysar = null;
protected String HeaderStr = null;
protected SortedMap<String, Graph> nodeHashList = new TreeMap<>(NaturalComparator.NULLS_FIRST);
protected int skipColumn = 0;
protected int FirstDataColumn = 0;
protected String Title = null;

}