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
2024-10-07 14:22:52 +03:00
parent 6b1576461d
commit 61fc37b574
173 changed files with 960 additions and 1526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/GlobalData/RunConfiguration/RunConfiguration.java
View File

@@ -1,10 +1,10 @@
package GlobalData.RunConfiguration;
import Common_old.Constants;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
import Common.Utils.TextLog;
import Common_old.Utils.Utils;
import GlobalData.Compiler.Compiler;
import GlobalData.DVMParameter.DVMParameter;
import GlobalData.EnvironmentValue.EnvironmentValue;
@@ -23,7 +23,7 @@ public class RunConfiguration extends iDBObject {
public int machine_id;
//---------------------------------------->
@Description("DEFAULT -1")
public int compiler_id = Constants.Nan;
public int compiler_id = CommonConstants.Nan;
public String LauncherCall = ""; //например DVM или mpirun
public String LauncherOptions = ""; //например run
//--------------------------------------
@@ -146,16 +146,16 @@ public class RunConfiguration extends iDBObject {
public String getDescription() {
String res = "";
if (!LauncherCall.isEmpty()) {
res += Utils.Brackets(LauncherCall);
res += CommonUtils.Brackets(LauncherCall);
if (!LauncherOptions.isEmpty())
res += " " + Utils.Brackets(LauncherOptions);
res += " " + CommonUtils.Brackets(LauncherOptions);
} else res = " — ";
return res;
}
public String getLaunchScriptText(String binary_name, String task_matrix) {
String res = "";
if (!LauncherCall.isEmpty()) {
res += Utils.DQuotes(LauncherCall);
res += CommonUtils.DQuotes(LauncherCall);
if (!LauncherOptions.isEmpty())
res += " " + LauncherOptions;
if (!task_matrix.isEmpty())
@@ -163,14 +163,14 @@ public class RunConfiguration extends iDBObject {
}
if (!res.isEmpty())
res += " ";
res += Utils.DQuotes("./" + binary_name);
res += CommonUtils.DQuotes("./" + binary_name);
if (!args.isEmpty())
res += " " + args;
return res;
}
public String getLaunchShortDescription() {
String res = "";
if (compiler_id != Constants.Nan) {
if (compiler_id != CommonConstants.Nan) {
res += getCompiler().description;
if (!LauncherOptions.isEmpty())
res += " " + LauncherOptions;

4
src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -1,5 +1,5 @@
package GlobalData.RunConfiguration;
import Common_old.Constants;
import Common.CommonConstants;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.DataSetControlForm;
@@ -72,7 +72,7 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
Result.LauncherOptions = (String) fields.cbLaunchOptions.getSelectedItem();
if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
Result.compiler_id = ((Compiler) (fields.cbLauncherCall.getSelectedItem())).id;
} else Result.compiler_id = Constants.Nan;
} else Result.compiler_id = CommonConstants.Nan;
//-
Result.dim = (int) fields.sMaxDim.getValue();
Result.minMatrix = fields.minMatrixBar.pack(Result.dim);