Commit 073cce11 authored by Stephane Dallongeville's avatar Stephane Dallongeville
Browse files

merged

parent a4e34e47
...@@ -83,7 +83,7 @@ public class DeformationProfiler extends PluginTrackManagerProcessor implements ...@@ -83,7 +83,7 @@ public class DeformationProfiler extends PluginTrackManagerProcessor implements
} }
} }
private JComboBox<Descriptors> jComboDescriptors = new JComboBox<Descriptors>(Descriptors.values()); private JComboBox jComboDescriptors = new JComboBox(Descriptors.values());
private JButton jButtonSaveToVTK = new JButton("Export meshes to VTK files"); private JButton jButtonSaveToVTK = new JButton("Export meshes to VTK files");
...@@ -1102,10 +1102,11 @@ public class DeformationProfiler extends PluginTrackManagerProcessor implements ...@@ -1102,10 +1102,11 @@ public class DeformationProfiler extends PluginTrackManagerProcessor implements
return new Matrix(diag); return new Matrix(diag);
} }
private static Matrix ones(int m, int n) { private static Matrix ones(int m, int n)
double[][] array = new double[m][n]; {
for (double[] row : array) double[][] array = new double[m][n];
Arrays.fill(row, 1.0); for (double[] row : array)
return new Matrix(array, m, n); Arrays.fill(row, 1.0);
}>>>>>>>f5df793f8888f26b414aeecdb3fbc0732db1e1dc return new Matrix(array, m, n);
}
} }
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