Skip to content

Commit

Permalink
a6.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mararsh
Mararsh committed Aug 15, 2024
1 parent 7ba13f1 commit ddf15fc
Show file tree
Hide file tree
Showing 27 changed files with 223 additions and 150 deletions.
4 changes: 2 additions & 2 deletions alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import javafx.scene.input.KeyEvent;
import mara.mybox.db.data.DataNode;
import mara.mybox.db.data.VisitHistory;
import mara.mybox.db.table.BaseTreeData;
import mara.mybox.db.table.BaseTableTreeData;
import mara.mybox.db.table.TableTag;
import mara.mybox.db.table.TableDataNode;
import mara.mybox.db.table.TableDataTag;
Expand All @@ -20,7 +20,7 @@ public abstract class BaseDataTreeController extends BaseController {
protected ControlDataTreeView treeController;
protected BaseDataTreeNodeController nodeController;

protected BaseTreeData dataTable;
protected BaseTableTreeData dataTable;
protected TableDataNode treeTable;
protected TableTag tagTable;
protected TableDataTag treeTagTable;
Expand Down
2 changes: 1 addition & 1 deletion alpha/MyBox/src/main/java/mara/mybox/controller/ControlNewDataTable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ public void importRow(Connection conn, List<String> pageRow, InvalidAs invalidAs
int col = columnIndices.get(i);
Data2DColumn sourceColumn = data2D.column(col);
Data2DColumn targetColumn = dataTable.column(i + 1);
data2DRow.setColumnValue(targetColumn.getColumnName(),
data2DRow.setMapValue(targetColumn.getColumnName(),
sourceColumn.fromString(pageRow.get(col + 1), invalidAs));
}
tableData2D.insertData(conn, data2DRow);
Expand Down
4 changes: 2 additions & 2 deletions alpha/MyBox/src/main/java/mara/mybox/data2d/DataTable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public Data2DRow fromTableRow(List<String> values, InvalidAs invalidAs) {
for (int i = 0; i < Math.min(columns.size(), values.size() - 1); i++) {
Data2DColumn column = columns.get(i);
String name = column.getColumnName();
data2DRow.setColumnValue(name, column.fromString(values.get(i + 1), invalidAs));
data2DRow.setMapValue(name, column.fromString(values.get(i + 1), invalidAs));
}
return data2DRow;
} catch (Exception e) {
Expand Down Expand Up @@ -409,7 +409,7 @@ public Data2DRow makeRow(List<String> values, InvalidAs invalidAs) {
Data2DColumn column = vColumns.get(i);
String name = column.getColumnName();
String value = i < rowSize ? values.get(i) : null;
data2DRow.setColumnValue(name, column.fromString(value, invalidAs));
data2DRow.setMapValue(name, column.fromString(value, invalidAs));
}
return data2DRow;
} catch (Exception e) {
Expand Down
32 changes: 16 additions & 16 deletions alpha/MyBox/src/main/java/mara/mybox/data2d/DataTableGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,8 @@ private boolean byEqualValues() {
} else {
groupChanged = false;
for (String group : mappedGroupNames) {
Object tv = tmpRow.getColumnValue(group);
Object lv = lastRow.getColumnValue(group);
Object tv = tmpRow.getMapValue(group);
Object lv = lastRow.getMapValue(group);
if (tv == null) {
if (lv != null) {
groupChanged = true;
Expand All @@ -353,7 +353,7 @@ private boolean byEqualValues() {
parameterValue = null;
groupMap.clear();
for (int i = 0; i < groupNames.size(); i++) {
groupMap.put(groupNames.get(i), tmpRow.getColumnValue(mappedGroupNames.get(i)));
groupMap.put(groupNames.get(i), tmpRow.getMapValue(mappedGroupNames.get(i)));
}
parameterValue = groupMap.toString();
recordGroup(groupid, parameterValue);
Expand Down Expand Up @@ -619,7 +619,7 @@ private boolean byTime() {
}
try {
Data2DRow tmpRow = tableTmpData.readData(query);
Object tv = tmpRow.getColumnValue(tmpTimeName);
Object tv = tmpRow.getMapValue(tmpTimeName);
timeValue = tv == null ? null : (long) tv;
groupChanged = lastTimeValue == Long.MAX_VALUE || lastTimeValue != timeValue;
if (groupChanged) {
Expand Down Expand Up @@ -724,7 +724,7 @@ private boolean byExpression() {
}
try {
Data2DRow tmpRow = tableTmpData.readData(query);
expValue = tmpRow.getColumnValue(tmpExpName);
expValue = tmpRow.getMapValue(tmpExpName);
groupChanged = expColumn.compare(lastExpValue, expValue) != 0;
if (groupChanged) {
groupChanged();
Expand Down Expand Up @@ -1000,8 +1000,8 @@ private boolean byConditions() {
private boolean recordGroup(long index, String value) {
try {
Data2DRow group = tableGroupParameters.newRow();
group.setColumnValue("group_index", index);
group.setColumnValue("group_parameters", value);
group.setMapValue("group_index", index);
group.setMapValue("group_parameters", value);
tableGroupParameters.insertData(conn, group);
if (task != null) {
task.setInfo(message("GroupID") + ": " + groupid);
Expand Down Expand Up @@ -1043,19 +1043,19 @@ private void writeRow(Data2DRow tmpRow) {
targetValueOffset++;
}
Data2DRow data2DRow = tableTarget.newRow();
data2DRow.setColumnValue(mappedIdColName, groupid);
data2DRow.setColumnValue(mappedParameterName, parameterValue);
data2DRow.setMapValue(mappedIdColName, groupid);
data2DRow.setMapValue(mappedParameterName, parameterValue);
if (includeRowNumber) {
data2DRow.setColumnValue(finalColumns.get(3).getColumnName(),
tmpRow.getColumnValue(tmpData.columnName(1)));
data2DRow.setMapValue(finalColumns.get(3).getColumnName(),
tmpRow.getMapValue(tmpData.columnName(1)));
}
for (int i = 0; i < sourcePickIndice.size(); i++) {
Object value = tmpRow.getColumnValue(tmpData.columnName(sourcePickIndice.get(i) + tmpValueOffset));
Object value = tmpRow.getMapValue(tmpData.columnName(sourcePickIndice.get(i) + tmpValueOffset));
Data2DColumn finalColumn = finalColumns.get(i + targetValueOffset);
if (finalColumn.needScale() && scale >= 0 && value != null) {
value = DoubleTools.scaleString(value + "", invalidAs, scale);
}
data2DRow.setColumnValue(finalColumn.getColumnName(),
data2DRow.setMapValue(finalColumn.getColumnName(),
finalColumn.fromString(value == null ? null : value + ""));
}
if (tableTarget.setInsertStatement(conn, insert, data2DRow)) {
Expand Down Expand Up @@ -1091,11 +1091,11 @@ private void writeRow(Data2DRow tmpRow) {
fileRow.add(groupid + "");
fileRow.add(parameterValue);
if (includeRowNumber) {
Object value = tmpRow.getColumnValue(tmpData.columnName(1));
Object value = tmpRow.getMapValue(tmpData.columnName(1));
fileRow.add(value == null ? null : value + "");
}
for (int i = 0; i < sourcePickIndice.size(); i++) {
Object value = tmpRow.getColumnValue(tmpData.columnName(sourcePickIndice.get(i) + tmpValueOffset));
Object value = tmpRow.getMapValue(tmpData.columnName(sourcePickIndice.get(i) + tmpValueOffset));
Data2DColumn finalColumn = finalColumns.get(i + targetValueOffset);
if (finalColumn.needScale() && scale >= 0 && value != null) {
value = DoubleTools.scaleString(value + "", invalidAs, scale);
Expand Down Expand Up @@ -1234,7 +1234,7 @@ public String parameterValue(Connection qconn, long index) {
+ " WHERE group_index=" + index;
try (PreparedStatement statement = qconn.prepareStatement(sql)) {
Data2DRow row = tableGroupParameters.query(qconn, statement);
Object v = row.getColumnValue("group_parameters");
Object v = row.getMapValue("group_parameters");
return v == null ? null : (String) v;
} catch (Exception e) {
return null;
Expand Down
10 changes: 5 additions & 5 deletions alpha/MyBox/src/main/java/mara/mybox/data2d/DataTableGroupStatistic.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public boolean run() {
Data2DRow data2DRow = tableGroup.newRow();
for (String name : calNames) {
Object v = groupColumn(name).value(query);
data2DRow.setColumnValue(groupColumnName(name), v);
data2DRow.setMapValue(groupColumnName(name), v);
}
if (groupid > 0 && groupid != currentGroupid) {
insert.executeBatch();
Expand Down Expand Up @@ -243,13 +243,13 @@ private void statistic() {
}
for (int i = 0; i < colSize; i++) {
Data2DRow data2DRow = tableStatistic.newRow();
data2DRow.setColumnValue(statisticData.columnName(1), groupid);
data2DRow.setColumnValue(statisticData.columnName(2), parameterValue);
data2DRow.setColumnValue(statisticData.columnName(3), calNames.get(i));
data2DRow.setMapValue(statisticData.columnName(1), groupid);
data2DRow.setMapValue(statisticData.columnName(2), parameterValue);
data2DRow.setMapValue(statisticData.columnName(3), calNames.get(i));
DoubleStatistic s = sData[i];
for (int k = 0; k < calculation.types.size(); k++) {
StatisticType type = calculation.types.get(k);
data2DRow.setColumnValue(statisticData.columnName(k + 4),
data2DRow.setMapValue(statisticData.columnName(k + 4),
DoubleTools.scale(s.value(type), scale));
}
if (tableStatistic.setInsertStatement(conn, statisticInsert, data2DRow)) {
Expand Down
8 changes: 4 additions & 4 deletions alpha/MyBox/src/main/java/mara/mybox/data2d/TmpTable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public Data2DRow makeRow(List<String> sourceRow, InvalidAs invalidAs) {
if (includeRowNumber) {
String rowNum = sourceRow.get(0);
index = Long.parseLong(rowNum);
data2DRow.setColumnValue(column(1).getColumnName(), index);
data2DRow.setMapValue(column(1).getColumnName(), index);
values = sourceRow.subList(1, sourceRow.size());
} else {
index = -1;
Expand Down Expand Up @@ -335,7 +335,7 @@ public Data2DRow makeRow(List<String> sourceRow, InvalidAs invalidAs) {
tmpValue = targetColumn.fromString(sourceValue, invalidAs);
}
}
data2DRow.setColumnValue(targetColumn.getColumnName(), tmpValue);
data2DRow.setMapValue(targetColumn.getColumnName(), tmpValue);
}
return data2DRow;
} catch (Exception e) {
Expand Down Expand Up @@ -442,12 +442,12 @@ public boolean sort(FxTask currentTask, Data2DWriter writer, int maxSortResults)
Data2DRow dataRow = tableData2D.readData(query);
List<String> rowValues = new ArrayList<>();
if (includeRowNumber) {
Object v = dataRow.getColumnValue(numberName);
Object v = dataRow.getMapValue(numberName);
rowValues.add(v == null ? null : v + "");
}
for (int i = 0; i < sourcePickIndice.size(); i++) {
Data2DColumn tmpColumn = columns.get(i + valueIndexOffset);
Object v = dataRow.getColumnValue(tmpColumn.getColumnName());
Object v = dataRow.getMapValue(tmpColumn.getColumnName());
rowValues.add(v == null ? null : v + "");
}
writer.writeRow(rowValues);
Expand Down
2 changes: 1 addition & 1 deletion alpha/MyBox/src/main/java/mara/mybox/data2d/modify/DataTableSetValue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void writeRow() {
for (int i = 0; i < columnsNumber; ++i) {
Data2DColumn column = columns.get(i);
String name = column.getColumnName();
sourceTableRow.setColumnValue(name, column.fromString(targetRow.get(i)));
sourceTableRow.setMapValue(name, column.fromString(targetRow.get(i)));
}
if (tableData2D.setUpdateStatement(conn, update, sourceTableRow)) {
update.addBatch();
Expand Down
2 changes: 1 addition & 1 deletion alpha/MyBox/src/main/java/mara/mybox/data2d/operate/Data2DSingleColumn.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public boolean handleRow() {
Data2DColumn targetColumn = writerTable.columnByName("data");
String value = sourceRow.get(col);
if (targetColumn != null) {
data2DRow.setColumnValue("data", targetColumn.fromString(value, InvalidAs.Empty));
data2DRow.setMapValue("data", targetColumn.fromString(value, InvalidAs.Empty));
writerTableData2D.insertData(conn, data2DRow);
if (++count % Database.BatchSize == 0) {
conn.commit();
Expand Down
2 changes: 1 addition & 1 deletion alpha/MyBox/src/main/java/mara/mybox/data2d/tools/Data2DTableTools.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public static DataTable importTable(FxTask task, String targetName,
for (List<String> row : pageRows) {
for (int i = 0; i < columns.size(); i++) {
Data2DColumn column = columns.get(i);
data2DRow.setColumnValue(column.getColumnName(), column.fromString(row.get(i + 1), invalidAs));
data2DRow.setMapValue(column.getColumnName(), column.fromString(row.get(i + 1), invalidAs));
}
tableData2D.insertData(conn, data2DRow);
if (++count % Database.BatchSize == 0) {
Expand Down
2 changes: 1 addition & 1 deletion alpha/MyBox/src/main/java/mara/mybox/data2d/writer/DataTableWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public void writeRow(List<String> inRow) {
}
printRow = new ArrayList<>();
Data2DRow data2DRow = targetTable.makeRow(inRow, invalidAs);
if (data2DRow == null || data2DRow.isNoColumn()) {
if (data2DRow == null || data2DRow.isMapEmpty()) {
return;
}
if (tableData2D.setInsertStatement(conn, insert, data2DRow)) {
Expand Down
Loading

0 comments on commit ddf15fc

Please sign in to comment.