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
2025-01-11 19:32:54 +03:00
parent 0d3edd7e3f
commit fc60b78784
9 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml generated
View File

@@ -8,11 +8,13 @@
<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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

3
properties
View File

@@ -51,5 +51,6 @@
"FortranWrapsOn": false,
"ExtensionsOn": false,
"ComparsionDiffMergeOn": true,
"BugReportsAgeLimit": 4
"BugReportsAgeLimit": 4,
"FastAccessPassesCount": 5
}

4
src/_VisualDVM/GlobalData/Settings/SettingName.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Settings;
public enum SettingName {
Undefined,
//--------------
FastAccessPassesCount,
LastOpenedProjectsCount,
ShowFullArraysDeclarations,
ShowFullTabsNames,
@@ -93,8 +92,7 @@ public enum SettingName {
return "Сохранять SPF директивы при преобразованиях";
case PARSE_FOR_INLINE:
return "Синтаксический анализ для подстановки";
case FastAccessPassesCount:
return "Число проходов на панели быстрого доступа";
case LastOpenedProjectsCount:
return "Число отображаемых последних открытых проектов";
}

1
src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
View File

@@ -32,7 +32,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
//<editor-fold desc="Global">
AddSetting(new DBSetting(SettingName.ShowFullArraysDeclarations, 0, SettingType.SapforFlag, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.FastAccessPassesCount, 5, SettingType.IntField, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.LastOpenedProjectsCount, 5, SettingType.IntField, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
if (Utils_.isWindows())

4
src/_VisualDVM/GlobalProperties.java
View File

@@ -122,6 +122,8 @@ public class GlobalProperties {
public boolean ComparsionDiffMergeOn = false;
@Expose
public int BugReportsAgeLimit = 2;
@Expose
public int FastAccessPassesCount=10;
public GlobalProperties(GlobalProperties p) {
super();
Mode = p.Mode;
@@ -173,6 +175,8 @@ public class GlobalProperties {
//-----------------
public String getFieldDescription(String fieldName) {
switch (fieldName) {
case "FastAccessPassesCount":
return "Число проходов на панели быстрого доступа";
case "Workspace":
return "Рабочее пространство визуализатора";
case "BugReportsAgeLimit":

2
src/_VisualDVM/MainModule.java
View File

@@ -157,7 +157,7 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
//--
@Override
public int getFirstAccessPassesCount() {
return getDb().settings.get(SettingName.FastAccessPassesCount).toInt32();
return Global.properties.FastAccessPassesCount;
}
@Override
public boolean confirmPassesStart() {

8
src/_VisualDVM/Passes/All/UpdateProperty.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Passes.All;
import Common.MainModule_;
import Common.Passes.Pass;
import Common.Visual.Windows.Dialog.SliderNumberForm;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
@@ -32,6 +33,10 @@ public class UpdateProperty extends Pass<Object> {
if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
newValue=sliderNumberForm.Result;
break;
case "FastAccessPassesCount":
if (sliderNumberForm.ShowDialog(description, oldValue, 5, 15))
newValue=sliderNumberForm.Result;
break;
case "Workspace":
directoryChooser.setTitle(description);
directoryChooser.SetCurrentDirectory(
@@ -77,6 +82,9 @@ public class UpdateProperty extends Pass<Object> {
Global.mainModule.getFile().form.ExpandMessages();
}
break;
case "FastAccessPassesCount":
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
break;
}
}
}

10
src/_VisualDVM/Passes/All/UpdateSetting.java
View File

@@ -65,13 +65,6 @@ public class UpdateSetting extends Pass<DBSetting> {
if (f_.ShowDialog(target.Name.getDescription()))
NewValue = String.valueOf(f_.Result);
break;
case FastAccessPassesCount:
min = 5;
max = 15;
SliderNumberForm fff = new SliderNumberForm();
if (fff.ShowDialog(target.Name.getDescription(), target.toInt32(), min, max))
NewValue = String.valueOf(fff.Result);
break;
case Kernels:
min = 1;
max = Utils.getMaxKernels();
@@ -102,9 +95,6 @@ public class UpdateSetting extends Pass<DBSetting> {
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowGCOV();
break;
case FastAccessPassesCount:
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
break;
case ShowFullArraysDeclarations:
if (Global.mainModule.HasProject())
Global.mainModule.getProject().declaratedArrays.ShowUI();

2
src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
View File

@@ -8,9 +8,9 @@ public class CompactnessSettingsMenu extends SettingsSubmenu {
SettingName.SmallScreen,
SettingName.ShowFullTabsNames,
SettingName.ShowFullArraysDeclarations,
SettingName.FastAccessPassesCount,
SettingName.LastOpenedProjectsCount
);
add(Global.properties.getMenuItem("FastAccessPassesCount"));
addSeparator();
String[] propertiesNames = new String[]{
"collapseProjectTrees",