Commit 00d8802c authored by Andrey Filippov's avatar Andrey Filippov

uodated PixelMapping to support non-radial parameters, disabled DirectMap

parent ada64adb
...@@ -858,7 +858,9 @@ if (MORE_BUTTONS) { ...@@ -858,7 +858,9 @@ if (MORE_BUTTONS) {
panelPixelMapping.setLayout(new GridLayout(1, 0, 5, 5)); panelPixelMapping.setLayout(new GridLayout(1, 0, 5, 5));
addButton("Load Pixel Mapping",panelPixelMapping); addButton("Load Pixel Mapping",panelPixelMapping);
addButton("List Mapping Parameters",panelPixelMapping,color_report); addButton("List Mapping Parameters",panelPixelMapping,color_report);
addButton("Test Direct Mapping",panelPixelMapping); if (MORE_BUTTONS) {
addButton("Test Direct Mapping",panelPixelMapping); // not yet updated for non-radial
}
addButton("Test Equirectangular Mapping",panelPixelMapping); addButton("Test Equirectangular Mapping",panelPixelMapping);
addButton("Crop Equirectangular Mapping",panelPixelMapping); addButton("Crop Equirectangular Mapping",panelPixelMapping);
addButton("Generate & Save Equirectangular",panelPixelMapping); addButton("Generate & Save Equirectangular",panelPixelMapping);
...@@ -6694,7 +6696,7 @@ if (MORE_BUTTONS) { ...@@ -6694,7 +6696,7 @@ if (MORE_BUTTONS) {
if (label.equals("Test Direct Mapping")) { if (label.equals("Test Direct Mapping")) {
DEBUG_LEVEL=MASTER_DEBUG_LEVEL; DEBUG_LEVEL=MASTER_DEBUG_LEVEL;
if (PIXEL_MAPPING==null) PIXEL_MAPPING=new PixelMapping((String)null,DEBUG_LEVEL); if (PIXEL_MAPPING==null) PIXEL_MAPPING=new PixelMapping((String)null,DEBUG_LEVEL);
GenericDialog gd=new GenericDialog("Select parameters for sensor->equirectangular pixel mapping"); GenericDialog gd=new GenericDialog("Select parameters for sensor->equirectangular pixel mapping *** NOT YET MODIFIED FOR NON-RADIAL !");
gd.addNumericField("Channel number (0..."+PIXEL_MAPPING.sensors.length,0,0); gd.addNumericField("Channel number (0..."+PIXEL_MAPPING.sensors.length,0,0);
gd.addNumericField("Output frame width", 2592,0,4,"output pix"); gd.addNumericField("Output frame width", 2592,0,4,"output pix");
gd.addNumericField("Output frame height", 1936,0,4,"output pix"); gd.addNumericField("Output frame height", 1936,0,4,"output pix");
......
...@@ -9670,7 +9670,8 @@ M * V = B ...@@ -9670,7 +9670,8 @@ M * V = B
gd.addMessage("----------"); gd.addMessage("----------");
gd.addCheckbox("Applying known extrinsic parameters to the same timestamp images", true); gd.addCheckbox("Applying known extrinsic parameters to the same timestamp images", true);
gd.addCheckbox("Use closest (by motor steps) image if none for the same timestamp is enabled", true); gd.addCheckbox("Use closest (by motor steps) image if none for the same timestamp is enabled", true);
gd.addCheckbox("Verticaly center the camera head by calculateing center above horizontal", false); gd.addMessage("==== Note: The following correction will be applied to all subcameras, use selection above to specify which heights should be averaged" );
gd.addCheckbox("Vertically center the camera head by calculateing center above horizontal", false);
// gd.addCheckbox("Update currently disabled images", true); // gd.addCheckbox("Update currently disabled images", true);
WindowTools.addScrollBars(gd); WindowTools.addScrollBars(gd);
gd.showDialog(); gd.showDialog();
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment