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

удаление отладочной печати сравнения и не только

Browse Source
This commit is contained in:
02090095
2024-07-22 00:57:05 +03:00
parent 3374c9783b
commit 53ad5e637f
76 changed files with 78 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
View File

@@ -25,8 +25,6 @@ public class BaseDirective extends BasicCompletion {
return visible = isMatch();
}
protected CaretInfo getCaretInfo() {
// System.out.println(getOwner());
// System.out.println(getOwner().getEditor());
return getOwner().getEditor().getCaretInfo();
}
protected SapforAutoComplete getOwner() {

1
src/ProjectData/Files/UI/Editor/SPFEditor.java
View File

@@ -163,7 +163,6 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
ClearGOCVHighlights();
for (int lineNum : file.gcov_info.line_info.keySet()) {
Pair<Long, Integer> p = file.gcov_info.line_info.get(lineNum);
//System.out.println((lineNum + 1) + ": " + p.getKey() + " " + p.getValue() + "%");
Color color = never;
if (p.getKey() > 0) {
color = (p.getValue() >= Global.db.settings.get(SettingName.GCOVLimit).toInt32()) ?

2
src/ProjectData/Files/UI/FilesTree.java
View File

@@ -65,7 +65,6 @@ public class FilesTree extends StyledTree {
}
@Override
public void SelectionAction(TreePath e) {
System.out.println("Select");
DefaultMutableTreeNode node = (DefaultMutableTreeNode) e.getLastPathComponent();
Current.set(Current.ProjectNode, node);
Object o = node.getUserObject();
@@ -97,7 +96,6 @@ public class FilesTree extends StyledTree {
public void LeftMouseAction1() {
if (Global.files_multiselection && Current.getSelectedFile() != null) {
Current.getSelectedFile().SwitchSelection();
System.out.println("LMC "+Current.getSelectedFile().name+" : "+Current.getSelectedFile().isSelected());
updateUI();
}
}

1
src/ProjectData/Messages/Message.java
View File

@@ -392,7 +392,6 @@ public class Message extends FileObject {
}
} while (idx != -1);
if (sum != splited.length && !message.equals("")) {
System.out.println("message="+ Utils.Brackets(message));
Utils.CopyToClipboard(message);
throw new PassException("Ошибка при декодировании сообщений на русском языке\n" +
"message=" + Utils.Brackets(message));

13
src/ProjectData/Project/db_project_info.java
View File

@@ -1082,14 +1082,11 @@ public class db_project_info extends DBObject {
public void Clone(File dst, boolean cloneData) throws Exception {
CopySubdirectories(dst);
//->
System.out.println("---->>>>>CLONE >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
for (DBProjectFile file : db.files.Data.values()) {
File src_file = file.file;
File dst_file = Paths.get(dst.getAbsolutePath(),
Global.isWindows ? file.name :
file.name.replace('\\', '/')).toFile();
System.out.println("src=" + src_file);
System.out.println("dst=" + dst_file);
Files.copy(src_file.toPath(), dst_file.toPath());
}
//теперь копируем инфу по файлам.
@@ -1263,7 +1260,6 @@ public class db_project_info extends DBObject {
LinkedHashMap<String, Long> res = new LinkedHashMap<>();
for (DBProjectFile file : db.files.Data.values()) {
if (!file.state.equals(FileState.Excluded)) {
System.out.println(file.file.getAbsolutePath());
long matches_count = Utils.findInFile(keyword_in, registerOn, wholeWord, file.file);
if (matches_count > 0) {
res.put(file.name, matches_count);
@@ -1273,14 +1269,8 @@ public class db_project_info extends DBObject {
return res;
}
public db_project_info CreateVersionsTree() throws Exception {
// System.out.println("CREATE VERSIONS TREE");
File anchestor_file = find_anchestor();
// System.out.println("anchestor = " + anchestor_file);
// System.out.println("---------------");
db_project_info root_ = createVersionsTree_r(anchestor_file);
// System.out.println("print versions r--------");
// root_.PrintVersions_r();
// System.out.println("----------------");
return root_;
}
public static int extractVersionNumber(db_project_info version) {
@@ -1387,7 +1377,6 @@ public class db_project_info extends DBObject {
ProjectArray mainTemplate = sortedSizeTemplates.get(0);
for (long mVarId : mainTemplate.get_varIDs(false)) {
String main_binary = mainTemplate.get_binary(mVarId);
// System.out.println("main_binary = " + main_binary);
boolean variantEnabled = true;
for (int i = 1; i < sortedSizeTemplates.size(); ++i) {
ProjectArray template = sortedSizeTemplates.get(i);
@@ -1419,7 +1408,6 @@ public class db_project_info extends DBObject {
for (Vector<BigInteger> triple : main_template_triples) {
//двоичное представление максимального шаблона. 1111
String main_binary = mainTemplate.get_binary(triple.get(1).longValueExact());
// System.out.println("main_binary = " + main_binary);
boolean variantEnabled = true;
Vector<BigInteger> variantVector = new Vector<>(triple);
//перебор остальных шаблонов
@@ -1428,7 +1416,6 @@ public class db_project_info extends DBObject {
String template_binary = (mainTemplate.dimSize > template.dimSize) ?
main_binary.substring(0, template.dimSize) :
main_binary;
// System.out.println("template_binary: " + template_binary);
//сконвертировать из двоичной в long, чтобы получить varId
long varID = Long.parseLong(template_binary, 2);
//-- проверить на пригодность этот самый varID

1
src/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -335,7 +335,6 @@ public class ProjectArray extends DBObject {
char s = distributed ? '1' : '0';
String filterMask = getFilterMask();
String variant = binary_in.isEmpty() ? get_binary(varID) : binary_in;
// System.out.println(shortName+"|mask="+filterMask+"|varId="+variant+"|"+s);
for (int i = 0; i < variant.length(); ++i) {
if ((filterMask.toCharArray()[i] == s) && (variant.toCharArray()[i] != s)) return false;
}

11
src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
View File

@@ -34,9 +34,7 @@ public class FunctionsGraphUI extends mxGraph {
public final static Timer ffTimer = new Timer(1000, new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
System.out.println("Time to Redraw Functions Graph");
Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).Do();
System.out.println("DONE");
}
});
//---
@@ -221,21 +219,12 @@ public class FunctionsGraphUI extends mxGraph {
}
}
}
/*
System.out.println("------");
for (String key: mxEventObject.getProperties().keySet()){
System.out.println(key+" : "+ mxEventObject.getProperties().get(key));
}
System.out.println("------");
*/
});
graphComponent.getGraphControl().setComponentPopupMenu(new FunctionsGraphMenu());
//обработка клика мышом.
graphComponent.getGraphControl().addMouseListener(new MouseAdapter() {
public void mouseReleased(MouseEvent e) {
System.out.println("Released");
Object cell = graphComponent.getCellAt(e.getX(), e.getY());
if (cell != null) {
mxCell mx_cell = (mxCell) cell;

11
src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
View File

@@ -41,15 +41,12 @@ public class ArrayAlignmentBar extends JToolBar {
ChangeListener changeListener = e -> {
//инфа о связях. из списка всех объявленных массивов.
ProjectArray d_array = Current.getProject().declaratedArrays.get(array.id);
System.out.println("current region = " + Current.getParallelRegion().regionId);
System.out.println(array.id + " links count= " + d_array.links.size() + ":" + d_array.printLinks());
//опять же, берем инфу из объявлений!
for (ProjectArray d_link : d_array.links.values()) {
//это массивы из объявлений. прежде чем их трогать проверим а есть ли они в текущей области.
// по адресам принадлежность смотреть нельзя.
// на момент поиска массивов у них их еще нет. а вот ид совпадают.
if (Current.getParallelRegion().ArrayBelongsToRegion(d_link.id)) {
System.out.println(d_link.id + " belongs to current region, apply link!");
//инфа о массиве уже из области. имеющая адрес и бар.
ProjectArray r_link = Current.getParallelRegion().getArrayById(d_link.id);
Pair<JSpinner, JSpinner> pair = r_link.bar.dimensions.get(dim);
@@ -65,17 +62,9 @@ public class ArrayAlignmentBar extends JToolBar {
}
}
public void apply_changes() {
System.out.println(array);
for (int dim : dimensions.keySet()) {
array.ac_new.get(dim).K = (int) dimensions.get(dim).getKey().getValue();
array.ac_new.get(dim).B = (int) dimensions.get(dim).getValue().getValue();
//-
System.out.println("dim=" + dim +
" k=" + array.ac_new.get(dim).K +
" b=" + array.ac_new.get(dim).B
);
//- }
System.out.println("-----");
}
}
}