M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2023-10-30 20:19:31 +03:00
parent 5cde073d56
commit bfc9efe834
7 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml generated
View File

@@ -8,7 +8,11 @@
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />

10
src/SapforTestingSystem/Json/SapforTasksResults_json.java
View File

@@ -33,16 +33,6 @@ public class SapforTasksResults_json {
}
tasks.add(task);
}
for (String configuration_id: tasksByConfigurations.keySet()){
System.out.println(configuration_id);
LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
for (String group: groups_tasks.keySet()){
System.out.println(group);
for (SapforTask task: groups_tasks.get(group)){
System.out.println(task.id);
}
}
}
return tasksByConfigurations;
}
//--

43
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
View File

@@ -6,10 +6,12 @@ import ProjectData.Files.DBProjectFile;
import ProjectData.Files.FileType;
import SapforTestingSystem.Json.SapforTasksResults_json;
import SapforTestingSystem.SapforTask.SapforTask;
import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Vector;
public class SapforTasksPackageInterface {
@@ -37,26 +39,53 @@ public class SapforTasksPackageInterface {
}
return res;
}
public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) {
public static Vector<DefaultMutableTreeNode> getTaskConfigurationDescription(SapforTask task) {
Vector<DefaultMutableTreeNode> res = new Vector<>();
DefaultMutableTreeNode codesNode = new DefaultMutableTreeNode("Проходы");
Vector<String> codes = new Vector<>(Arrays.asList(task.codes.split(" ")));
for (String code_s : codes)
codesNode.add(new DefaultMutableTreeNode(PassCode_2021.valueOf(code_s).getDescription()));
res.add(codesNode);
DefaultMutableTreeNode flagsNode = new DefaultMutableTreeNode("Флаги");
flagsNode.add(new DefaultMutableTreeNode(task.flags));
res.add(flagsNode);
return res;
}
public static DefaultMutableTreeNode getTreeRoot(SapforTasksPackage package_in) {
SapforTasksResults_json results_json = getLocalResults(package_in);
//-- флаги группы
LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = results_json.sortTasksByConfigurationsAndGroups();
//--
DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id);
for (String configuration_id: tasksByConfigurations.keySet()){
System.out.println(configuration_id);
// DefaultMutableTreeNode configurationsTitleNode = new DefaultMutableTreeNode("Конфигурации");
// root.add(configurationsTitleNode);
for (String configuration_id : tasksByConfigurations.keySet()) {
DefaultMutableTreeNode configurationNode = new DefaultMutableTreeNode(configuration_id);
// DefaultMutableTreeNode groupsTitleNode = new DefaultMutableTreeNode("Группы тестов");
// Vector<DefaultMutableTreeNode> configurationDescription = null;
LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
for (String group: groups_tasks.keySet()){
System.out.println(group);
for (String group : groups_tasks.keySet()) {
DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group);
for (SapforTask task: groups_tasks.get(group)){
System.out.println(task.id);
for (SapforTask task : groups_tasks.get(group)) {
/*
if (configurationDescription == null)
configurationDescription = getTaskConfigurationDescription(task);
*/
DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description);
groupNode.add(taskNode);
}
/*
if (configurationDescription != null) {
for (DefaultMutableTreeNode node : configurationDescription)
configurationNode.add(node);
}
*/
// groupsTitleNode.add(groupNode);
configurationNode.add(groupNode);
}
// configurationNode.add(groupsTitleNode);
// configurationsTitleNode.add(configurationNode);
root.add(configurationNode);
}
return root;

5
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
View File

@@ -7,14 +7,13 @@ public class SapforTasksPackageTree extends DataTree {
public SapforTasksPackageTree(DefaultMutableTreeNode root_in) {
super(root_in);
// setRootVisible(false);
ExpandAll();
// CollapseAll();
}
/*
@Override
protected int getStartLine() {
return 1;
}
*/
@Override
public void SelectionAction(TreePath path) {}
@Override

2
src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
View File

@@ -31,6 +31,6 @@ public class SapforPackageFields implements DialogFields, FormWithSplitters {
lObjectName.setText(object.id);
treePanel.add(
new JScrollPane(
new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(object))));
new SapforTasksPackageTree(SapforTasksPackageInterface.getTreeRoot(object))));
}
}

2
src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
View File

@@ -27,7 +27,7 @@ public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageF
fields.lObjectName.setText(sapforTasksPackage.id);
fields.getTreePanel().add(
new JScrollPane(
new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(sapforTasksPackage))));
new SapforTasksPackageTree(SapforTasksPackageInterface.getTreeRoot(sapforTasksPackage))));
/*
if (Global.db.sapforProfiles.size() > 0) {
for (Object key : Global.db.sapforProfiles.Data.keySet()) {

2
src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
View File

@@ -82,7 +82,7 @@ public class SapforPackagesComparisonForm {
protected void showObject() {
lObjectName.setText(object.getPK().toString() + (isMaster() ? "(эталон)" : ""));
lObjectName.setToolTipText(object.getPK().toString());
treePanel.add(new JScrollPane(new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(object))));
treePanel.add(new JScrollPane(new SapforTasksPackageTree(SapforTasksPackageInterface.getTreeRoot(object))));
}
protected String getText() {
return "";