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:
darksnake 2015-12-22 14:19:17 +03:00
parent 9721b173c5
commit 829d48b625
4 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
numass-storage/src/main/java/inr/numass/storage/NumassDataLoader.java
View File

@ -72,14 +72,6 @@ public class NumassDataLoader extends AbstractLoader implements BinaryLoader<Env
*/
public static final String HV_FRAGMENT_NAME = "voltage";
// private static final DefaultEnvelopeReader newFormat = new DefaultEnvelopeReader() {
//
// @Override
// protected byte[] separator() {
// return "\r\n\r\n\r".getBytes(); //To change body of generated methods, choose Tools | Templates.
// }
//
// };
public static NumassDataLoader fromLocalDir(Storage storage, File directory) throws IOException {
return fromDir(storage, new DefaultLocalFileProvider().findLocalFile(directory), null);
}

2
numass-storage/src/main/java/inr/numass/storage/NumassStorage.java
View File

@ -66,7 +66,7 @@ public class NumassStorage extends FileStorage {
Meta meta = new MetaBuilder("storage")
.setValue("type", "file.numass")
.setValue("readOnly", readOnly)
.setValue("monitor", true);
.setValue("monitor", false);
return new NumassStorage(VFSUtils.getLocalFile(dir), meta);
} catch (FileSystemException ex) {
throw new RuntimeException(ex);

4
numass-viewer/src/main/java/inr/numass/viewer/MainViewerController.java
View File

@ -73,6 +73,7 @@ public class MainViewerController implements Initializable, ProgressUpdateCallba
private Button loadDirectoryButton;
//controllers
@FXML
private MspViewController mspController;
//main pane views
@ -116,6 +117,8 @@ public class MainViewerController implements Initializable, ProgressUpdateCallba
slider.setAimContentVisible(t1);
});
slider.setAimContentVisible(false);
loadRemoteButton.setDisable(true);
}
@FXML
@ -162,6 +165,7 @@ public class MainViewerController implements Initializable, ProgressUpdateCallba
public void setRootStorage(NumassStorage root) {
fillNumassStorageData(root);
if (mspController != null) {
mspController.setCallback(this);
mspController.fillMspData(root);
} else {
mspTab.getContent().setVisible(false);

27
numass-viewer/src/main/java/inr/numass/viewer/MspViewController.java
View File

@ -49,6 +49,7 @@ import org.jfree.chart.renderer.xy.XYStepRenderer;
import org.jfree.data.xy.XYDataset;
import org.jfree.data.xy.XYSeries;
import org.jfree.data.xy.XYSeriesCollection;
import org.slf4j.LoggerFactory;
/**
* FXML Controller class
@ -137,8 +138,16 @@ public class MspViewController implements Initializable {
}
}
XYSeriesCollection mspSeriesCollection = new XYSeriesCollection();
for (XYSeries ser : series.values()) {
mspSeriesCollection.addSeries(ser);
List<String> names = new ArrayList<>(series.keySet());
names.sort((String o1, String o2) -> {
try {
return Integer.valueOf(o1).compareTo(Integer.valueOf(o2));
} catch (Exception ex) {
return 0;
}
});
for (String name : names) {
mspSeriesCollection.addSeries(series.get(name));
}
updateMspPane(mspSeriesCollection);
} catch (StorageException ex) {
@ -152,7 +161,8 @@ public class MspViewController implements Initializable {
DataPoint last = null;
for (String loaderName : storage.loaders().keySet()) {
if (loaderName.startsWith("msp")) {
PointLoader mspLoader = (PointLoader) storage.getLoader(loaderName);
try (PointLoader mspLoader = (PointLoader) storage.getLoader(loaderName)) {
mspLoader.open();
updateProgress("Loading mass spectrometer data from " + mspLoader.getName());
updateProgress(-1);
for (DataPoint dp : mspLoader.asDataSet()) {
@ -162,14 +172,17 @@ public class MspViewController implements Initializable {
if (last != null) {
mspData.add(terminatorPoint(last));
}
} catch (Exception ex) {
LoggerFactory.getLogger(getClass()).error("Can't read msp loader data", ex);
}
}
for (String shelfName : storage.shelves().keySet()) {
mspData.addAll(getMspData(storage.getShelf(shelfName)));
}
// for (String shelfName : storage.shelves().keySet()) {
// mspData.addAll(getMspData(storage.getShelf(shelfName)));
// }
updateProgress("Loading msp data finished");
updateProgress(1);
updateProgress(0);
return mspData;
}
@ -190,7 +203,7 @@ public class MspViewController implements Initializable {
}
/**
* Create a NaN value point to terminate msp series
* Create a null value point to terminate msp series
*
* @param last
* @return