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

msp fix

Browse Source
This commit is contained in:
Alexander Nozik 2017-05-18 13:58:01 +03:00
parent 2c58a16fac
commit 5570afea77
5 changed files with 42 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java
View File

@ -59,12 +59,7 @@ import java.util.function.Consumer;
public class MspDevice extends SingleMeasurementDevice implements PortHandler.PortController { public class MspDevice extends SingleMeasurementDevice implements PortHandler.PortController {
public static final String MSP_DEVICE_TYPE = "msp"; public static final String MSP_DEVICE_TYPE = "msp";
// private static final String PEAK_SET_PATH = "peakJump.peak";
private static final int TIMEOUT = 200; private static final int TIMEOUT = 200;
// private boolean connected = false;
// private boolean selected = false;
// private boolean controlled = false;
// private boolean storing = false;
private TcpPortHandler handler; private TcpPortHandler handler;
//listener //listener

3
numass-control/msp/src/main/resources/config/devices.xml
View File

@ -18,7 +18,8 @@ limitations under the License.
<config> <config>
<storage path="D:/temp/test" type = "numass"/> <storage path="D:/temp/test" type = "numass"/>
<device type="msp" name="msp"> <device type="msp" name="msp">
<connection ip="127.0.0.1" port="10014"/> <!--<connection ip="127.0.0.1" port="10014"/>-->
<connection ip="192.168.111.11" port="10014"/>
<peakJump> <peakJump>
<peak mass="2"/> <peak mass="2"/>
<peak mass="3"/> <peak mass="3"/>

4
numass-control/vac/src/main/resources/config/devices.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<config> <config>
<storage path="D:/temp/test"/> <!--<storage path="D:/temp/test"/>-->
<device type="numass:vac"> <device type="numass:vac">
<sensor name="P1" color="red" port="com::/dev/ttyUSB0" sensorType="mks"/> <sensor name="P1" color="red" port="com::/dev/ttyUSB0" sensorType="mks"/>
<sensor name="P2" color="blue" port="tcp::192.168.111.32:4002" sensorType="CM32"/> <sensor name="P2" color="blue" port="tcp::192.168.111.32:4002" sensorType="CM32"/>
<sensor name="P3" color="green" port="tcp::192.168.111.32:4003" sensorType="CM32"/> <sensor name="P3" color="green" port="tcp::192.168.111.32:4003" sensorType="CM32"/>
<sensor name="Px" color="black" port="tcp::192.168.111.33:4003" sensorType="meradat" address="1"/> <sensor name="Px" color="black" port="tcp::192.168.111.33:4003" sensorType="meradat" address="1"/>
<sensor name="Baratron" color="cyan" port="tcp::192.168.111.33:4004" sensorType="baratron"/> <sensor name="Baratron" color="cyan" port="tcp::192.168.111.33:4004" sensorType="baratron"/>
<sensor name="collector" color="magenta" port="tcp::192.168.111.33:4003" sensorType="meradat" address="5"/> <sensor name="Collector" color="magenta" port="tcp::192.168.111.33:4003" sensorType="meradat" address="5"/>
</device> </device>
</config> </config>

80
numass-control/vac/src/main/resources/fxml/VacCollector.fxml
View File

@ -1,52 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<?import java.net.URL?> <?import java.net.URL?>
<BorderPane fx:id="root" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111" <BorderPane fx:id="root" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="inr.numass.readvac.fx.VacCollectorView">
xmlns:fx="http://javafx.com/fxml/1"
fx:controller="inr.numass.readvac.fx.VacCollectorView">
<stylesheets> <stylesheets>
<URL value="@/styles/vacstyles.css"/> <URL value="@/styles/vacstyles.css" />
</stylesheets> </stylesheets>
<center> <right>
<HBox> <ScrollPane fitToHeight="true" fitToWidth="true" hbarPolicy="NEVER" minWidth="250.0" BorderPane.alignment="CENTER">
<VBox alignment="TOP_CENTER" HBox.hgrow="ALWAYS"> <content>
<ToolBar> <VBox fx:id="vacBoxHolder" minWidth="200.0" spacing="2.0" />
<ToggleButton fx:id="startStopButton" mnemonicParsing="false" </content>
onAction="#onStartStopToggle" text="Measure"/> </ScrollPane>
<ToggleButton fx:id="storeButton" mnemonicParsing="false" onAction="#onStoreToggle" </right>
text="Store"/> <center>
<Separator orientation="VERTICAL"/> <VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER">
<Label text="Interval: "/> <ToolBar>
<ChoiceBox fx:id="intervalSelector" prefWidth="150.0"/> <ToggleButton fx:id="startStopButton" mnemonicParsing="false" onAction="#onStartStopToggle" text="Measure" />
<Separator orientation="VERTICAL"/> <ToggleButton fx:id="storeButton" mnemonicParsing="false" onAction="#onStoreToggle" text="Store" />
<Pane HBox.hgrow="ALWAYS"/> <Separator orientation="VERTICAL" />
<Separator orientation="VERTICAL"/> <Label text="Interval: " />
<ToggleButton fx:id="logButton" mnemonicParsing="false" text="Console"/> <ChoiceBox fx:id="intervalSelector" prefWidth="150.0" />
</ToolBar> <Separator orientation="VERTICAL" />
<AnchorPane fx:id="plotHolder" VBox.vgrow="ALWAYS"/> <Pane HBox.hgrow="ALWAYS" />
<HBox styleClass="beveled"> <Separator orientation="VERTICAL" />
<Label alignment="CENTER_RIGHT" text="Last update: "> <ToggleButton fx:id="logButton" mnemonicParsing="false" text="Console" />
<font> </ToolBar>
<Font size="24.0"/> <AnchorPane fx:id="plotHolder" VBox.vgrow="ALWAYS" />
</font> <HBox styleClass="beveled">
</Label> <Label alignment="CENTER_RIGHT" text="Last update: ">
<Label fx:id="timeLabel" text="08.02.2016 15:57" HBox.hgrow="ALWAYS"> <font>
<font> <Font size="24.0" />
<Font size="24.0"/> </font>
</font> </Label>
</Label> <Label fx:id="timeLabel" text="08.02.2016 15:57" HBox.hgrow="ALWAYS">
</HBox> <font>
</VBox> <Font size="24.0" />
<Separator orientation="VERTICAL"/> </font>
<VBox fx:id="vacBoxHolder" minWidth="200.0" spacing="2.0"> </Label>
<HBox.margin> </HBox>
<Insets bottom="2.0" left="2.0" right="2.0" top="2.0"/> </VBox>
</HBox.margin> </center>
</VBox>
</HBox>
</center>
</BorderPane> </BorderPane>

1
numass-core/src/main/resources/META-INF/services/hep.dataforge.storage.api.StorageType
View File

@ -0,0 +1 @@
inr.numass.storage.NumassStorageFactory