Link to ccsds library 0.3.0, added index on parameter table for generation time, graphical updates

Author: dariol83

eu.dariolucia.reatmetric.driver.spacecraft/src/main/java/eu/dariolucia/reatmetric/driver/spacecraft/services/impl/OnboardOperationsSchedulingService.java

@@ -40,6 +40,7 @@
 /**
  * This class implements the ECSS PUS 11 command scheduling service (limited to 11,4 and 11,3 commands).
  * TODO: support for 11,1, 11,2 and status report (minimal capability set) to be implemented
+ * TODO: restore from archived state
  */
 public class OnboardOperationsSchedulingService extends AbstractPacketService<OnboardOperationsSchedulingServiceConfiguration> {
 

eu.dariolucia.reatmetric.persist/src/main/resources/schema.ddl

@@ -102,4 +102,6 @@ CREATE TABLE ACTIVITY_REPORT_DATA_TABLE (
    ActivityOccurrenceId BIGINT REFERENCES ACTIVITY_OCCURRENCE_DATA_TABLE(UniqueId),
    AdditionalData BLOB,
    PRIMARY KEY (UniqueId)
-)
+)
+-- SEPARATOR
+CREATE INDEX PARAMETER_DATA_TABLE_IDX1 ON PARAMETER_DATA_TABLE (GenerationTime ASC)

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

@@ -86,6 +86,10 @@ public class ActivityDataViewController extends AbstractDisplayController implem
     @FXML
     protected Button printBtn;
 
+    // Remove button
+    @FXML
+    protected Button removeBtn;
+
     // Progress indicator for data retrieval
     @FXML
     protected ProgressIndicator progressIndicator;
@@ -459,6 +463,7 @@ protected void selectTimeButtonSelected(ActionEvent e) {
             this.dateTimePopup.getScene().getRoot().getStylesheets().add(getClass().getResource("/eu/dariolucia/reatmetric/ui/fxml/css/MainView.css").toExternalForm());
             this.dateTimePopup.show(this.liveTgl.getScene().getWindow());
         }
+        e.consume();
     }
 
     @FXML
@@ -471,48 +476,55 @@ protected void liveToggleSelected(ActionEvent e) {
             stopSubscription();
             updateSelectTime();
         }
+        e.consume();
     }
 
     @FXML
     protected void goToStart(ActionEvent e) {
         if (isProcessingAvailable()) {
             moveToTime(Instant.EPOCH, RetrievalDirection.TO_FUTURE, 1, this.dataItemFilterController.getSelectedFilter());
         }
+        e.consume();
     }
 
     @FXML
     protected void goBackOne(ActionEvent e) {
         if (isProcessingAvailable()) {
             fetchRecords(1, RetrievalDirection.TO_PAST);
         }
+        e.consume();
     }
 
     @FXML
     protected void goBackFast(ActionEvent e) {
         if (isProcessingAvailable()) {
             fetchRecords(getNumVisibleRow(), RetrievalDirection.TO_PAST);
         }
+        e.consume();
     }
 
     @FXML
     protected void goToEnd(ActionEvent e) {
         if (isProcessingAvailable()) {
             moveToTime(Instant.ofEpochSecond(3600*24*365*1000L), RetrievalDirection.TO_PAST, getNumVisibleRow() * 2, this.dataItemFilterController.getSelectedFilter());
         }
+        e.consume();
     }
 
     @FXML
     protected void goForwardOne(ActionEvent e) {
         if (isProcessingAvailable()) {
             fetchRecords(1, RetrievalDirection.TO_FUTURE);
         }
+        e.consume();
     }
 
     @FXML
     protected void goForwardFast(ActionEvent e) {
         if (isProcessingAvailable()) {
             fetchRecords(getNumVisibleRow(), RetrievalDirection.TO_FUTURE);
         }
+        e.consume();
     }
 
     protected void fetchRecords(int n, RetrievalDirection direction) {
@@ -567,6 +579,7 @@ protected void filterButtonSelected(ActionEvent e) {
             this.filterPopup.getScene().getRoot().getStylesheets().add(getClass().getResource("/eu/dariolucia/reatmetric/ui/fxml/css/MainView.css").toExternalForm());
             this.filterPopup.show(this.displayTitledPane.getScene().getWindow());
         }
+        e.consume();
     }
 
     protected void moveToTime(Instant selectedTime, RetrievalDirection direction, int n, ActivityOccurrenceDataFilter currentFilter) {
@@ -665,9 +678,7 @@ private void markProgressBusy() {
     }
 
     private void markProgressReady() {
-        Platform.runLater(() -> {
-            this.progressIndicator.setVisible(false);
-        });
+        Platform.runLater(() -> this.progressIndicator.setVisible(false));
     }
 
     private boolean isProcessingAvailable() {
@@ -725,7 +736,7 @@ private void onDragDropped(DragEvent event) {
     }
 
     @FXML
-    public void onPurgeMenuItem(ActionEvent actionEvent) {
+    public void onPurgeMenuItem(ActionEvent event) {
         List<TreeItem<ActivityOccurrenceDataWrapper>> selected = this.dataItemTableView.getSelectionModel().getSelectedItems();
         boolean confirm = DialogUtils.confirm("Purge activity occurrences", null, "If you continue, the monitoring of the selected occurrences will stop and the occurrences will be removed " +
                 "from the processing model. Do you want to purge the selected occurrences?");
@@ -743,6 +754,18 @@ public void onPurgeMenuItem(ActionEvent actionEvent) {
                 e.printStackTrace();
             }
         });
+        event.consume();
+    }
+
+    @FXML
+    public void removeButtonSelected(ActionEvent event) {
+        boolean confirm = DialogUtils.confirm("Remove activity occurrences", null, "If you continue, the display will be cleared from the currently displayed activity occurrences. " +
+                "Do you want to continue?");
+        if(!confirm) {
+            return;
+        }
+        this.dataItemTableView.getRoot().getChildren().remove(0, this.dataItemTableView.getRoot().getChildren().size());
+        event.consume();
     }
 
     @Override

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

@@ -66,6 +66,15 @@
                       </ImageView>
                   </graphic>
               </Button>
+               <Button fx:id="removeBtn" mnemonicParsing="false" onAction="#removeButtonSelected">
+                   <graphic>
+                       <ImageView pickOnBounds="true" preserveRatio="true">
+                           <image>
+                               <Image url="@/eu/dariolucia/reatmetric/ui/fxml/images/16px/trash.svg.png" />
+                           </image>
+                       </ImageView>
+                   </graphic>
+               </Button>
            </items>
         </ToolBar>
         <TreeTableView fx:id="dataItemTableView" fixedCellSize="20.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="1.0" onDragDropped="#onDragDropped" onDragEntered="#onDragEntered" onDragExited="#onDragExited" onDragOver="#onDragOver" VBox.vgrow="ALWAYS">

pom.xml

@@ -64,7 +64,7 @@
         <derby.version>10.15.1.3</derby.version>
         <jdbc.version>19.3.0.0</jdbc.version>
         <graalvm.version>19.3.0</graalvm.version>
-        <ccsds.version>0.3.0-SNAPSHOT</ccsds.version>
+        <ccsds.version>0.3.0</ccsds.version>
         <controlsfx.version>11.0.1</controlsfx.version>
         <!-- Maven plugin versions -->
         <maven.jacoco.version>0.8.2</maven.jacoco.version>