diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b334de4a..bb2ec1a1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,7 +10,6 @@ - diff --git a/properties b/properties index a7fc1ac9..ae67a19e 100644 --- a/properties +++ b/properties @@ -38,6 +38,7 @@ "InstructionPath": "", "PerformanceAnalyzerPath": "", "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe", + "Kernels": 8, "ComponentsBackUpsCount": 10, "AutoCheckTesting": true, "CheckTestingIntervalSeconds": 10, diff --git a/src/_VisualDVM/GlobalData/Settings/SettingName.java b/src/_VisualDVM/GlobalData/Settings/SettingName.java index acacb2d4..48fd5774 100644 --- a/src/_VisualDVM/GlobalData/Settings/SettingName.java +++ b/src/_VisualDVM/GlobalData/Settings/SettingName.java @@ -6,7 +6,6 @@ public enum SettingName { SaveModifications, // сохранять исходную версию GCOVLimit, DVMConvertationOptions, - Kernels, //-- // STATIC_SHADOW_ANALYSIS, @@ -39,8 +38,6 @@ public enum SettingName { return "Сохранять копию исходной версии при преобразованиях"; case DVMConvertationOptions: return "Опции DVM конвертации"; - case Kernels: - return "Число ядер при компиляции"; case GCOVLimit: return "Нижний порог отображения GCOV"; case Precompilation: diff --git a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java index 00f7432b..40a83f62 100644 --- a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java +++ b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java @@ -30,7 +30,6 @@ public class SettingsDBTable extends DBTable { public void AddAll() throws Exception { //проверка списка всех настроек. // - AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser)); // //-- // diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java index 9723e50a..c2b06678 100644 --- a/src/_VisualDVM/GlobalProperties.java +++ b/src/_VisualDVM/GlobalProperties.java @@ -94,6 +94,8 @@ public class GlobalProperties { @Expose public String LocalMakePathWindows= "C:\\MinGW\\msys\\1.0\\bin\\make.exe"; @Expose + public int Kernels= Utils.getHalfKernels(); + @Expose public int ComponentsBackUpsCount = 10; @Expose public boolean AutoCheckTesting = false; // проверять ли задачи тестирования при включенном визуализаторе. @@ -187,6 +189,8 @@ public class GlobalProperties { //----------------- public String getFieldDescription(String fieldName) { switch (fieldName) { + case "Kernels": + return "Число ядер при компиляции"; case "LocalMakePathWindows": return "Путь к make.exe"; case "SmallScreen": diff --git a/src/_VisualDVM/Passes/All/Precompilation.java b/src/_VisualDVM/Passes/All/Precompilation.java index d9ae8127..4acc148d 100644 --- a/src/_VisualDVM/Passes/All/Precompilation.java +++ b/src/_VisualDVM/Passes/All/Precompilation.java @@ -185,10 +185,10 @@ public class Precompilation extends Pass { protected void body() throws Exception { if (Utils_.isWindows()) { name_to_kill = "make.exe"; - StartProcess(Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(), + StartProcess(Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " -j " + Global.properties.Kernels, target.compilation_maxtime); } else - StartProcess("make -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime); + StartProcess("make -j " + Global.properties.Kernels, target.compilation_maxtime); } protected void StartProcess(String command, int TA) throws Exception { killed = false; diff --git a/src/_VisualDVM/Passes/All/UpdateProperty.java b/src/_VisualDVM/Passes/All/UpdateProperty.java index db933f85..d04210e5 100644 --- a/src/_VisualDVM/Passes/All/UpdateProperty.java +++ b/src/_VisualDVM/Passes/All/UpdateProperty.java @@ -8,6 +8,7 @@ import Common.Visual.Windows.Dialog.VFileChooser; import _VisualDVM.Global; import _VisualDVM.GlobalProperties; import _VisualDVM.Passes.PassCode; +import _VisualDVM.Utils; import javax.swing.*; import java.io.File; @@ -35,6 +36,10 @@ public class UpdateProperty extends Pass { return true; } switch (name){ + case "Kernels": + if (sliderNumberForm.ShowDialog(description, oldValue, 1, Utils.getMaxKernels())) + newValue=sliderNumberForm.Result; + break; case "LocalMakePathWindows": fileChooser.setTitle(description); File file = fileChooser.ShowDialog(); diff --git a/src/_VisualDVM/Passes/All/UpdateSetting.java b/src/_VisualDVM/Passes/All/UpdateSetting.java index 4d626eff..c38fb575 100644 --- a/src/_VisualDVM/Passes/All/UpdateSetting.java +++ b/src/_VisualDVM/Passes/All/UpdateSetting.java @@ -41,19 +41,6 @@ public class UpdateSetting extends Pass { break; } break; - case IntField: - int min = 0; - int max = 0; - switch (target.Name) { - case Kernels: - min = 1; - max = Utils.getMaxKernels(); - SliderNumberForm ffff = new SliderNumberForm(); - if (ffff.ShowDialog(target.Name.getDescription(), target.toInt32(), min, max)) - NewValue = String.valueOf(ffff.Result); - break; - } - break; } } else { NewValue = args[1].toString(); diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java index 821180cc..fcd4d10b 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java @@ -21,19 +21,19 @@ public class VisualiserSettingsMenu extends VisualiserMenu { add(new SettingsSubmenu("Компиляция на локальной машине", null){ { add(Global.properties.getMenuItem("LocalMakePathWindows")); + add(Global.properties.getMenuItem("Kernels")); } } ); + }else { + add(new SettingsSubmenu("Компиляция на локальной машине", null){ + { + add(Global.properties.getMenuItem("Kernels")); + } + } + ); } - /* - SettingName.Kernels - )); - } else { - add(new SettingsSubmenu("Компиляция на локальной машине", null, - SettingName.Kernels - )); - } - */ + add(new SynchronizationSettingsMenu()); add(new VersionsComparisonMenu()); add(Global.properties.getMenuItem("Workspace"));