NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[no commit message]

Browse Source
This commit is contained in:
Alexander Nozik 2016-01-20 22:07:07 +03:00
parent 9a4c2f119e
commit 9b85f7c5be
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-main/src/main/java/inr/numass/actions/MonitorCorrectAction.java
View File

@ -43,7 +43,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
* @author Darksnake * @author Darksnake
*/ */
@TypedActionDef(name = "monitor", inputType = DataSet.class, outputType = DataSet.class) @TypedActionDef(name = "monitor", inputType = DataSet.class, outputType = DataSet.class)
@ValueDef(name = "monitorPoint", type = "UMBER", required = true, info = "The Uset for monitor point") @ValueDef(name = "monitorPoint", type = "NUMBER", required = true, info = "The Uset for monitor point")
@ValueDef(name = "monitorFile", info = "The outputfile for monitor points", def = "monitor.out") @ValueDef(name = "monitorFile", info = "The outputfile for monitor points", def = "monitor.out")
@ValueDef(name = "calculateRelative", info = "Calculate count rate relative to average monitor point", def = "false") @ValueDef(name = "calculateRelative", info = "Calculate count rate relative to average monitor point", def = "false")
public class MonitorCorrectAction extends OneToOneAction<DataSet, DataSet> { public class MonitorCorrectAction extends OneToOneAction<DataSet, DataSet> {

6
numass-main/src/main/java/inr/numass/workbench/NumassWorkbenchController.java
View File

@ -218,16 +218,18 @@ public class NumassWorkbenchController implements Initializable, StagePaneHolder
actionsConfig.setNode("action", actions); actionsConfig.setNode("action", actions);
int counter = 0;
for (Configuration action : actions) { for (Configuration action : actions) {
counter++;
MetaEditor actionEditor = new MetaEditor(); MetaEditor actionEditor = new MetaEditor();
MetaTreeItem rootItem = new MetaTreeItem(action, getDescriptorForAction(action.getString("type"))); MetaTreeItem rootItem = new MetaTreeItem(action, getDescriptorForAction(action.getString("type")));
//Freezing actions names //Freezing actions names
rootItem.setFrozenValuePredicate((c, n) -> c.getName().equals("action") && n.equals("type")); // rootItem.setFrozenValuePredicate((c, n) -> c.getName().equals("action") && n.equals("type"));
actionEditor.setRoot(rootItem); actionEditor.setRoot(rootItem);
actionEditors.add(actionEditor); actionEditors.add(actionEditor);
String actionTitle = String.format("action [%d]: %s", actions.indexOf(action), action.getString("type")); String actionTitle = String.format("action [%d]: %s", counter, action.getString("type"));
TitledPane actionPane = new TitledPane(actionTitle, actionEditor); TitledPane actionPane = new TitledPane(actionTitle, actionEditor);
metaContainer.getPanes().add(actionPane); metaContainer.getPanes().add(actionPane);
} }

20
numass.gradle
View File

@ -26,26 +26,6 @@ dependencies {
deployerJars "org.apache.maven.wagon:wagon-ssh:2.8" deployerJars "org.apache.maven.wagon:wagon-ssh:2.8"
} }
task sourcesJar(type: Jar, dependsOn: classes, description: 'Creates a jar from the source files.') {
classifier = 'sources'
from sourceSets.main.allSource
}
artifacts {
archives jar
archives sourcesJar
}
task createFolders(description: 'Creates the source folders if they do not exist.') doLast {
sourceSets*.allSource*.srcDirs*.each { File srcDir ->
if (!srcDir.isDirectory()) {
println "Creating source folder: ${srcDir}"
srcDir.mkdirs()
}
}
}
uploadArchives { uploadArchives {
repositories.mavenDeployer { repositories.mavenDeployer {
configuration = configurations.deployerJars configuration = configurations.deployerJars