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 20:27:43 +03:00
parent b48e2c995d
commit bbe99efefe
9 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/workspace.xml generated
View File

@@ -14,7 +14,7 @@
<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/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/LastOpenedProjectsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.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" />

1
properties
View File

@@ -51,6 +51,7 @@
"FortranWrapsOn": false,
"ExtensionsOn": false,
"ComparsionDiffMergeOn": true,
"ShowFullArraysDeclarations": false,
"BugReportsAgeLimit": 4,
"FastAccessPassesCount": 5,
"LastOpenedProjectsCount": 25

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

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Settings;
public enum SettingName {
Undefined,
//--------------
ShowFullArraysDeclarations,
ShowFullTabsNames,
LocalMakePathWindows,
SmallScreen,
@@ -55,8 +54,6 @@ public enum SettingName {
return "Путь к make.exe";
case ShowFullTabsNames:
return "Показывать полные имена вкладок";
case ShowFullArraysDeclarations:
return "Показывать развернутый список объявлений массивов";
case STATIC_SHADOW_ANALYSIS:
return "Оптимизация теневых обменов";
case STATIC_PRIVATE_ANALYSIS:

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

@@ -30,7 +30,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
public void AddAll() throws Exception {
//проверка списка всех настроек.
//<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.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
if (Utils_.isWindows())

8
src/_VisualDVM/GlobalProperties.java
View File

@@ -107,7 +107,7 @@ public class GlobalProperties {
public int lastUserId = CommonConstants.Nan;
@Expose
public int lastCompilerId = CommonConstants.Nan;
//--
//-- сравнение
@Expose
public boolean RegisterOn = false;
@Expose
@@ -120,6 +120,10 @@ public class GlobalProperties {
public boolean ExtensionsOn = false;
@Expose
public boolean ComparsionDiffMergeOn = false;
//--
//компактность
@Expose
public boolean ShowFullArraysDeclarations =false;
@Expose
public int BugReportsAgeLimit = 2;
@Expose
@@ -177,6 +181,8 @@ public class GlobalProperties {
//-----------------
public String getFieldDescription(String fieldName) {
switch (fieldName) {
case "ShowFullArraysDeclarations":
return "Показывать развернутый список объявлений массивов";
case "LastOpenedProjectsCount":
return "Число отображаемых последних открытых проектов";
case "FastAccessPassesCount":

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

@@ -26,21 +26,14 @@ public class UpdateProperty extends Pass<Object> {
oldValue = field.get(Global.properties);
newValue = null;
SliderNumberForm sliderNumberForm = new SliderNumberForm();
SpinnerNumberForm spinnerNumberForm = new SpinnerNumberForm() {
@Override
public void InitFields() {
fields.setModel(new SpinnerNumberModel(
(int)oldValue,
1,
50,
1));
}
};
VDirectoryChooser directoryChooser = new VDirectoryChooser("");
VFileChooser fileChooser = new VFileChooser("", "exe");
//-
if (args.length==1){
if (oldValue instanceof Boolean){
newValue=!(Boolean)oldValue;
return true;
}
switch (name){
case "BugReportsAgeLimit":
if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
@@ -51,6 +44,16 @@ public class UpdateProperty extends Pass<Object> {
newValue=sliderNumberForm.Result;
break;
case "LastOpenedProjectsCount":
SpinnerNumberForm spinnerNumberForm = new SpinnerNumberForm() {
@Override
public void InitFields() {
fields.setModel(new SpinnerNumberModel(
(int)oldValue,
1,
50,
1));
}
};
if (spinnerNumberForm.ShowDialog(description, oldValue, 1, 50))
newValue=spinnerNumberForm.Result;
break;
@@ -102,6 +105,10 @@ public class UpdateProperty extends Pass<Object> {
case "FastAccessPassesCount":
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
break;
case "ShowFullArraysDeclarations":
if (Global.mainModule.HasProject())
Global.mainModule.getProject().declaratedArrays.ShowUI();
break;
}
}
}

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

@@ -81,10 +81,6 @@ public class UpdateSetting extends Pass<DBSetting> {
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowGCOV();
break;
case ShowFullArraysDeclarations:
if (Global.mainModule.HasProject())
Global.mainModule.getProject().declaratedArrays.ShowUI();
break;
case ShowFullTabsNames:
Global.mainModule.getUI().getMainWindow().getTestingWindow().RefreshTabsNames();
if (Global.mainModule.HasProject())

6
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
View File

@@ -53,15 +53,15 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
@Override
public Class getRendererClass() {
//todo все настройки переделать в проперти(?)
return (Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean() ? RendererHyperlinks.class : RendererHiddenList.class;
return Global.properties.ShowFullArraysDeclarations ? RendererHyperlinks.class : RendererHiddenList.class;
}
@Override
public Class getEditorClass() {
return (Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean() ? EditorFilesHyperlinks.class : null;
return Global.properties.ShowFullArraysDeclarations ? EditorFilesHyperlinks.class : null;
}
@Override
public int getMaxWidth() {
return (Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean() ? CommonConstants.Nan : 200;
return Global.properties.ShowFullArraysDeclarations ? CommonConstants.Nan : 200;
}
},
new ColumnInfo<ProjectArray>("Размерность") {

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

@@ -6,9 +6,9 @@ public class CompactnessSettingsMenu extends SettingsSubmenu {
public CompactnessSettingsMenu() {
super("Компактность отображения", null,
SettingName.SmallScreen,
SettingName.ShowFullTabsNames,
SettingName.ShowFullArraysDeclarations
SettingName.ShowFullTabsNames
);
add(Global.properties.getMenuItem("ShowFullArraysDeclarations"));
add(Global.properties.getMenuItem("LastOpenedProjectsCount"));
add(Global.properties.getMenuItem("FastAccessPassesCount"));
addSeparator();