ULOG loading speed improvements, Minor enhancements

Author: ecmnet

MAVGCL/src/main/java/com/comino/flight/log/ulog/MavLinkULOGHandler.java

@@ -240,21 +240,20 @@ private void requestLog(final int id) {
 
 		requestDataPackages(id, 0, total_package_count * LOG_PACKAG_DATA_LENGTH );
 
-		worker = wq.addCyclicTask("LP",15,() -> {
+		worker = wq.addCyclicTask("LP",100,() -> {
 
-			if((System.currentTimeMillis() - last_package_tms) < 5 )
+			if((System.currentTimeMillis() - last_package_tms) < 10 )
 				return;
 
 			if (++retry > 1000) {
 				cancelLoading();
 				return;
 			}
 
-
 			filehandler.setName("loading log "+log_id+" ("+speed+"kb/s)");
 
 			int c = 0;
-			while(searchForNextUnreadPackage() && c++ < 5) 
+			while(searchForNextUnreadPackage() && c++ < 10) 
 				requestDataPackages(id,chunk_offset * LOG_PACKAG_DATA_LENGTH, chunk_size  * LOG_PACKAG_DATA_LENGTH);
 
 		});

MAVGCL/src/main/java/com/comino/flight/log/ulog/dialog/ULogSelectionDialog.java

@@ -108,9 +108,9 @@ public ULogSelectionDialog(Map<Integer,msg_log_entry> list) {
 		colName.setCellValueFactory( new PropertyValueFactory<TabData, String>("name"));
 		colName.setSortType(TableColumn.SortType.DESCENDING);
 
-		TableColumn<TabData, Integer> colSize= new TableColumn<TabData, Integer>("Size");
+		TableColumn<TabData, String> colSize= new TableColumn<TabData, String>("Size");
 		colSize.setMinWidth(25); 
-		colSize.setCellValueFactory( new PropertyValueFactory<TabData, Integer>("size"));
+		colSize.setCellValueFactory( new PropertyValueFactory<TabData, String>("size"));
 
 		table.getColumns().addAll(colId,colName,colSize);
 
@@ -165,12 +165,20 @@ public class TabData {
 
 		private int    id;
 		private String name;
-		private int    size;
+		private String size;
 
 		public TabData(msg_log_entry e) {
+			
 			id   = e.id;
 			name = date_f.format(e.time_utc*1000);
-			size = (int)(e.size / 1024);
+			
+			float s = e.size / 1024f;
+			if(s < 1024)
+			    size = String.format("%#.0fkb", s);
+			else
+				size = String.format("%#.1fMb", s/1024f);
+				
+
 		}
 
 		public int getId() {
@@ -179,7 +187,7 @@ public int getId() {
 		public String getName() {
 			return name;
 		}
-		public int getSize() {
+		public String getSize() {
 			return size;
 		}
 		public void setId(int id) {
@@ -188,7 +196,7 @@ public void setId(int id) {
 		public void setName(String name) {
 			this.name = name;
 		}
-		public void setSize(int size) {
+		public void setSize(String size) {
 			this.size = size;
 		}