Fix order of fields in external files

MRPT · Dec 6, 2023 · 5eb2e89 · 5eb2e89
1 parent 23ed5e4
commit 5eb2e89
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/apps/RawLogViewer/main_show_selected_object.cpp b/apps/RawLogViewer/main_show_selected_object.cpp
@@ -504,7 +504,7 @@ void xRawLogViewerFrame::SelectObjectInTreeView(
 
 		// Get range image as bitmap:
 		// ---------------------------
-		int rangeHeight = 30;
+		int rangeHeight = 40;
 		{
 			mrpt::img::CImage img_range;
 
@@ -520,10 +520,10 @@ void xRawLogViewerFrame::SelectObjectInTreeView(
 
 			rangeHeight = img_range.getHeight();
 			bmp3Dobs_depth->setViewportPosition(
-				30, -2 - rangeHeight, -30, rangeHeight);
+				50, -2 - rangeHeight, -30, rangeHeight);
 		}
 
-		int intensityHeight = 30;
+		int intensityHeight = 40;
 
 		if (!obs->intensityImage.empty())
 		{
@@ -541,7 +541,7 @@ void xRawLogViewerFrame::SelectObjectInTreeView(
 
 			intensityHeight = img_intensity.getHeight();
 			bmp3Dobs_int->setViewportPosition(
-				30, -2 - rangeHeight - 2 - intensityHeight, -30,
+				50, -2 - rangeHeight - 2 - intensityHeight, -30,
 				intensityHeight);
 		}
 

diff --git a/libs/obs/include/mrpt/obs/CObservationRotatingScan.h b/libs/obs/include/mrpt/obs/CObservationRotatingScan.h
@@ -191,7 +191,7 @@ class CObservationRotatingScan : public CObservation
 	}
 
 	/** Write scan data to a plain text, each line has:
-	 *   `x y z intensity range row_idx col_idx`
+	 *   `x y z range intensity row_idx col_idx`
 	 *
 	 * For each point in the organized point cloud.
 	 * Invalid points (e.g. no lidar return) are stored as (x,y,z)=(0,0,0) and

diff --git a/libs/obs/src/CObservationRotatingScan.cpp b/libs/obs/src/CObservationRotatingScan.cpp
@@ -603,7 +603,7 @@ bool RotScan::loadFromTextFile(const std::string& filename)
 		THROW_EXCEPTION_FMT(
 			"Empty point cloud plain text file? `%s`", filename.c_str());
 
-	//  `x y z intensity range row_idx col_idx`
+	//  `x y z range intensity row_idx col_idx`
 	ASSERT_EQUAL_(data.cols(), 7UL);
 
 	ASSERT_GT_(rowCount, 0);
@@ -619,8 +619,8 @@ bool RotScan::loadFromTextFile(const std::string& filename)
 		const size_t c = static_cast<size_t>(data(i, 6));
 
 		organizedPoints(r, c) = {data(i, 0), data(i, 1), data(i, 2)};
-		intensityImage(r, c) = data(i, 3);
-		rangeImage(r, c) = data(i, 4);
+		rangeImage(r, c) = data(i, 3);
+		intensityImage(r, c) = data(i, 4);
 	}
 
 	return true;