Skip to content
This repository was archived by the owner on Sep 1, 2024. It is now read-only.

Commit 0bc964a

Browse files
committed
Note to self on mimics
1 parent 62c0273 commit 0bc964a

5 files changed

Lines changed: 9 additions & 5 deletions

File tree

eu.dariolucia.reatmetric.driver.spacecraft/src/main/java/eu/dariolucia/reatmetric/driver/spacecraft/SpacecraftDriver.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
* Support for PUS services is limited to Service 1 and Service 11, both with limitations</li>
8181
* </ul>
8282
*
83-
*
8483
*/
8584
public class SpacecraftDriver implements IDriver {
8685

eu.dariolucia.reatmetric.persist/src/main/java/eu/dariolucia/reatmetric/persist/services/AbstractDataItemArchive.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ public abstract class AbstractDataItemArchive<T extends AbstractDataItem, K exte
4141
protected static final int MAX_STORAGE_QUEUE = 10000; // items
4242
protected static final int STORAGE_QUEUE_FLUSH_LIMIT = MAX_STORAGE_QUEUE - 100; // size for flush
4343
protected static final int MAX_LATENCY_TIME = 1000; // milliseconds
44-
// TODO: this constant is fundamental: if there are many items with the same generation time, then if LOOK_AHEAD_SPAN is too small,
45-
// the retrieval won't work anymore
4644
protected static final int LOOK_AHEAD_SPAN = 100; // items to look ahead
4745

4846
protected static final Instant MINIMUM_TIME = Instant.EPOCH;

eu.dariolucia.reatmetric.ui/src/main/java/eu/dariolucia/reatmetric/ui/controller/MainViewController.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import java.util.logging.Logger;
4646

4747
/**
48+
* TODO: add mimics support
4849
*
4950
* @author dario
5051
*/
@@ -69,6 +70,8 @@ public class MainViewController implements Initializable, IReatmetricServiceList
6970
@FXML
7071
private RadioMenuItem rawDataTgl;
7172
@FXML
73+
private RadioMenuItem mimicsTgl;
74+
@FXML
7275
private StackPane perspectiveStackPane;
7376

7477
@FXML
@@ -237,6 +240,7 @@ public void initialize(URL url, ResourceBundle rb) {
237240

238241
this.perspectiveMap.put(this.alarmsTgl, "alarmPerspective");
239242
this.perspectiveMap.put(this.rawDataTgl, "rawDataPerspective");
243+
this.perspectiveMap.put(this.mimicsTgl, "mimicsPerspective");
240244
this.perspectiveMap.put(this.parameterTgl, "monitoringPerspective");
241245
this.perspectiveMap.put(this.parameterLogTgl, "parameterLogPerspective");
242246
this.perspectiveMap.put(this.eventTgl, "eventPerspective");
@@ -291,6 +295,7 @@ private void disableMainViewItems() {
291295
this.alarmsTgl.setDisable(true);
292296
this.rawDataTgl.setDisable(true);
293297
this.parameterTgl.setDisable(true);
298+
this.mimicsTgl.setDisable(true);
294299
this.parameterLogTgl.setDisable(true);
295300
this.eventTgl.setDisable(true);
296301
this.userDisplaysTgl.setDisable(true);
@@ -309,6 +314,7 @@ private void enableMainViewItems() {
309314
this.alarmsTgl.setDisable(false);
310315
this.rawDataTgl.setDisable(false);
311316
this.parameterTgl.setDisable(false);
317+
this.mimicsTgl.setDisable(false);
312318
this.parameterLogTgl.setDisable(false);
313319
this.eventTgl.setDisable(false);
314320
this.userDisplaysTgl.setDisable(false);

eu.dariolucia.reatmetric.ui/src/main/java/eu/dariolucia/reatmetric/ui/controller/UserDisplayViewController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private void forwardParameterDataItems(List<ParameterData> t) {
148148
}
149149

150150
protected String doGetComponentId() {
151-
return "UserDisplayView";
151+
return "ChartDisplayView";
152152
}
153153

154154
@FXML

eu.dariolucia.reatmetric.ui/src/main/resources/eu/dariolucia/reatmetric/ui/fxml/MainView.fxml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
<RadioMenuItem fx:id="eventTgl" disable="true" mnemonicParsing="false" onAction="#menubarViewAction" text="Event Log" toggleGroup="$perspectiveGroup" />
5757
<RadioMenuItem fx:id="rawDataTgl" disable="true" mnemonicParsing="false" onAction="#menubarViewAction" text="Raw Data Log" toggleGroup="$perspectiveGroup" />
5858
<RadioMenuItem fx:id="alarmsTgl" disable="true" mnemonicParsing="false" onAction="#menubarViewAction" text="Alarm Log" toggleGroup="$perspectiveGroup" />
59-
<RadioMenuItem fx:id="userDisplaysTgl" disable="true" mnemonicParsing="false" onAction="#menubarViewAction" text="User Displays" toggleGroup="$perspectiveGroup" />
59+
<RadioMenuItem fx:id="userDisplaysTgl" disable="true" mnemonicParsing="false" onAction="#menubarViewAction" text="Chart Displays" toggleGroup="$perspectiveGroup" />
60+
<RadioMenuItem fx:id="mimicsTgl" disable="true" mnemonicParsing="false" onAction="#menubarViewAction" text="Mimics Displays" toggleGroup="$perspectiveGroup" />
6061
</items>
6162
</Menu>
6263
<Menu mnemonicParsing="false" text="Help">

0 commit comments

Comments
 (0)