Changeset 7597 for trunk/projects

Timestamp:

01/27/11 14:50:08 (9 years ago)

Author:

aivar

Message:

Fixed null pointer exception when library not found.

Location:

trunk/projects/slim-plugin/src/main/java/loci/slim

Files:

• SLIMProcessor.java (modified) (1 diff)
• analysis/plugins/Display.java (modified) (1 diff)
• colorizer/DataColorizerUI.java (modified) (1 diff)

trunk/projects/slim-plugin/src/main/java/loci/slim/SLIMProcessor.java

@@ -1032 +1032 @@
             double lifetime = data[i].getParams()[1];
 
+            //TODO quick fix
+            if (lifetime < 0.0) {
+                System.out.println("negative lifetime " + lifetime + " at " + pixel.getX() + " " + pixel.getY());
+                return;
+            }
+
             //TODO debugging:
             //if (lifetime > 2 * m_param[1]) {

trunk/projects/slim-plugin/src/main/java/loci/slim/analysis/plugins/Display.java

@@ -451 +451 @@
 
         private Converter(boolean min, double value) {
-            MathContext context = new MathContext(2, min ? RoundingMode.FLOOR : RoundingMode.CEILING);
-            BigDecimal bigDecimalValue = BigDecimal.valueOf(value).round(context);
-            m_value = bigDecimalValue.doubleValue();
-            m_text = bigDecimalValue.toEngineeringString();
+            try {
+                MathContext context = new MathContext(2, min ? RoundingMode.FLOOR : RoundingMode.CEILING);
+                BigDecimal bigDecimalValue = BigDecimal.valueOf(value).round(context);
+                m_value = bigDecimalValue.doubleValue();
+                m_text = bigDecimalValue.toEngineeringString();
+            }
+            catch (NumberFormatException e) {
+                System.out.println("NumberFormatException " + e.getMessage());
+                m_value = 0.0;
+                m_text = "0.0";
+            }
         }
 

trunk/projects/slim-plugin/src/main/java/loci/slim/colorizer/DataColorizerUI.java

@@ -70 +70 @@
 
         m_frame = new JFrame("Colorize");
-        m_frame.setDefaultCloseOperation(m_frame.EXIT_ON_CLOSE);
+        //TODO closes the entire plugin:
+        //m_frame.setDefaultCloseOperation(m_frame.EXIT_ON_CLOSE);
         m_frame.setResizable(false);
         m_frame.getContentPane().add(m_histogram, BorderLayout.NORTH);