From 5570afea77c9bb9b5cc34f93f6b3bf85b8c868f3 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 18 May 2017 13:58:01 +0300
Subject: [PATCH] msp fix

---
 .../inr/numass/control/msp/MspDevice.java     |  5 --
 .../msp/src/main/resources/config/devices.xml |  3 +-
 .../vac/src/main/resources/config/devices.xml |  4 +-
 .../src/main/resources/fxml/VacCollector.fxml | 80 +++++++++----------
 .../hep.dataforge.storage.api.StorageType     |  1 +
 5 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java b/numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java
index 95b02d13..4bd1729e 100644
--- a/numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java
+++ b/numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java
@@ -59,12 +59,7 @@ import java.util.function.Consumer;
 public class MspDevice extends SingleMeasurementDevice implements PortHandler.PortController {
     public static final String MSP_DEVICE_TYPE = "msp";
 
-    //    private static final String PEAK_SET_PATH = "peakJump.peak";
     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;
     //listener
diff --git a/numass-control/msp/src/main/resources/config/devices.xml b/numass-control/msp/src/main/resources/config/devices.xml
index dc0731ce..0197d597 100644
--- a/numass-control/msp/src/main/resources/config/devices.xml
+++ b/numass-control/msp/src/main/resources/config/devices.xml
@@ -18,7 +18,8 @@ limitations under the License.
 <config>
     <storage path="D:/temp/test" type = "numass"/>
     <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>
             <peak mass="2"/>
             <peak mass="3"/>
diff --git a/numass-control/vac/src/main/resources/config/devices.xml b/numass-control/vac/src/main/resources/config/devices.xml
index 6363e0c0..15f73677 100644
--- a/numass-control/vac/src/main/resources/config/devices.xml
+++ b/numass-control/vac/src/main/resources/config/devices.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config>
-    <storage path="D:/temp/test"/>
+    <!--<storage path="D:/temp/test"/>-->
     <device type="numass:vac">
         <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="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="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>
 </config>
diff --git a/numass-control/vac/src/main/resources/fxml/VacCollector.fxml b/numass-control/vac/src/main/resources/fxml/VacCollector.fxml
index d4d6154f..baad4a00 100644
--- a/numass-control/vac/src/main/resources/fxml/VacCollector.fxml
+++ b/numass-control/vac/src/main/resources/fxml/VacCollector.fxml
@@ -1,52 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
 <?import java.net.URL?>
-<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">
+<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">
     <stylesheets>
-        <URL value="@/styles/vacstyles.css"/>
+        <URL value="@/styles/vacstyles.css" />
     </stylesheets>
-    <center>
-        <HBox>
-            <VBox alignment="TOP_CENTER" HBox.hgrow="ALWAYS">
-                <ToolBar>
-                    <ToggleButton fx:id="startStopButton" mnemonicParsing="false"
-                                  onAction="#onStartStopToggle" text="Measure"/>
-                    <ToggleButton fx:id="storeButton" mnemonicParsing="false" onAction="#onStoreToggle"
-                                  text="Store"/>
-                    <Separator orientation="VERTICAL"/>
-                    <Label text="Interval: "/>
-                    <ChoiceBox fx:id="intervalSelector" prefWidth="150.0"/>
-                    <Separator orientation="VERTICAL"/>
-                    <Pane HBox.hgrow="ALWAYS"/>
-                    <Separator orientation="VERTICAL"/>
-                    <ToggleButton fx:id="logButton" mnemonicParsing="false" text="Console"/>
-                </ToolBar>
-                <AnchorPane fx:id="plotHolder" VBox.vgrow="ALWAYS"/>
-                <HBox styleClass="beveled">
-                    <Label alignment="CENTER_RIGHT" text="Last update: ">
-                        <font>
-                            <Font size="24.0"/>
-                        </font>
-                    </Label>
-                    <Label fx:id="timeLabel" text="08.02.2016 15:57" HBox.hgrow="ALWAYS">
-                        <font>
-                            <Font size="24.0"/>
-                        </font>
-                    </Label>
-                </HBox>
-            </VBox>
-            <Separator orientation="VERTICAL"/>
-            <VBox fx:id="vacBoxHolder" minWidth="200.0" spacing="2.0">
-                <HBox.margin>
-                    <Insets bottom="2.0" left="2.0" right="2.0" top="2.0"/>
-                </HBox.margin>
-            </VBox>
-        </HBox>
-    </center>
+   <right>
+      <ScrollPane fitToHeight="true" fitToWidth="true" hbarPolicy="NEVER" minWidth="250.0" BorderPane.alignment="CENTER">
+         <content>
+               <VBox fx:id="vacBoxHolder" minWidth="200.0" spacing="2.0" />
+         </content>
+      </ScrollPane>
+   </right>
+   <center>
+         <VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER">
+             <ToolBar>
+                 <ToggleButton fx:id="startStopButton" mnemonicParsing="false" onAction="#onStartStopToggle" text="Measure" />
+                 <ToggleButton fx:id="storeButton" mnemonicParsing="false" onAction="#onStoreToggle" text="Store" />
+                 <Separator orientation="VERTICAL" />
+                 <Label text="Interval: " />
+                 <ChoiceBox fx:id="intervalSelector" prefWidth="150.0" />
+                 <Separator orientation="VERTICAL" />
+                 <Pane HBox.hgrow="ALWAYS" />
+                 <Separator orientation="VERTICAL" />
+                 <ToggleButton fx:id="logButton" mnemonicParsing="false" text="Console" />
+             </ToolBar>
+             <AnchorPane fx:id="plotHolder" VBox.vgrow="ALWAYS" />
+             <HBox styleClass="beveled">
+                 <Label alignment="CENTER_RIGHT" text="Last update: ">
+                     <font>
+                         <Font size="24.0" />
+                     </font>
+                 </Label>
+                 <Label fx:id="timeLabel" text="08.02.2016 15:57" HBox.hgrow="ALWAYS">
+                     <font>
+                         <Font size="24.0" />
+                     </font>
+                 </Label>
+             </HBox>
+         </VBox>
+   </center>
 </BorderPane>
diff --git a/numass-core/src/main/resources/META-INF/services/hep.dataforge.storage.api.StorageType b/numass-core/src/main/resources/META-INF/services/hep.dataforge.storage.api.StorageType
index e69de29b..bc0b8354 100644
--- a/numass-core/src/main/resources/META-INF/services/hep.dataforge.storage.api.StorageType
+++ b/numass-core/src/main/resources/META-INF/services/hep.dataforge.storage.api.StorageType
@@ -0,0 +1 @@
+inr.numass.storage.NumassStorageFactory
\ No newline at end of file