Skip to content
Snippets Groups Projects
Verified Commit 878cb6de authored by philippe.verley_ird.fr's avatar philippe.verley_ird.fr Committed by philippe.verley_ird.fr
Browse files

Fixed voxel file manual cropping.

parent 24c15c80
No related branches found
No related tags found
No related merge requests found
......@@ -382,6 +382,17 @@ public class VoxelSpaceInfos {
return result;
}
@Override
public String toString() {
StringBuilder columns = new StringBuilder();
for (String column : this.getColumnNames()) {
columns.append(column).append(" ");
}
return headerToString() + "\n" + columns.toString().trim();
}
public String getVersion() {
if (null == buildVersion) {
......
......@@ -7,11 +7,12 @@ package fr.amap.lidar.amapvox.gui;
import com.google.common.io.Files;
import fr.amap.commons.javafx.io.FileChooserContext;
import fr.amap.lidar.amapvox.commons.RawVoxel;
import fr.amap.lidar.amapvox.commons.Voxel;
import fr.amap.lidar.amapvox.commons.VoxelSpace;
import fr.amap.lidar.amapvox.commons.VoxelSpaceInfos;
import fr.amap.lidar.amapvox.voxelisation.postproc.VoxelSpaceUtil;
import fr.amap.lidar.amapvox.voxreader.VoxelFileReader;
import fr.amap.lidar.amapvox.voxreader.VoxelFileRawReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
......@@ -19,7 +20,6 @@ import java.io.IOException;
import java.net.URL;
import java.util.Iterator;
import java.util.ResourceBundle;
import java.util.logging.Level;
import javafx.beans.binding.Bindings;
import javafx.beans.binding.BooleanBinding;
import javafx.event.ActionEvent;
......@@ -124,7 +124,7 @@ public class VoxelSpaceCroppingFrameController implements Initializable {
textfieldInputVoxelFile.setText(voxelFile.getAbsolutePath());
VoxelFileReader reader = new VoxelFileReader(voxelFile);
VoxelFileRawReader reader = new VoxelFileRawReader(voxelFile, false);
VoxelSpaceInfos infos = reader.getVoxelSpaceInfos();
spinnerEnterIMin.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(0, infos.getSplit().x - 1, 0, 1));
......@@ -136,7 +136,6 @@ public class VoxelSpaceCroppingFrameController implements Initializable {
spinnerEnterKMax.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(0, infos.getSplit().z - 1, infos.getSplit().z - 1, 1));
this.voxelFile = voxelFile;
}
@FXML
......@@ -193,7 +192,7 @@ public class VoxelSpaceCroppingFrameController implements Initializable {
private void manualCrop(File voxelFile, File outputFile) {
try {
VoxelFileReader reader = new VoxelFileReader(voxelFile, true);
VoxelFileRawReader reader = new VoxelFileRawReader(voxelFile, true);
VoxelSpaceInfos infos = reader.getVoxelSpaceInfos();
int iMin = Integer.valueOf(spinnerEnterIMin.getEditor().getText());
......@@ -226,11 +225,11 @@ public class VoxelSpaceCroppingFrameController implements Initializable {
try (BufferedWriter writer = new BufferedWriter(new FileWriter(tmpFile))) {
writer.write(infos.toString() + "\n");
Iterator<Voxel> iterator = reader.iterator();
Iterator<RawVoxel> iterator = reader.iterator();
while (iterator.hasNext()) {
Voxel voxel = iterator.next();
RawVoxel voxel = iterator.next();
if (voxel.i >= iMin && voxel.i <= iMax
&& voxel.j >= jMin && voxel.j <= jMax
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment