Elodie Bourrec / Emir_Osp

Commit 7dd4dc3d2e6ed98e65bef112be8f1b9f6ce95dbd

Authored by Elodie Bourrec
1 parent b51add44
Exists in master

Changed titles in mask/slit properties panel 

When writing a local catalog objects, get the 5th columnr (properties).
When loading a local obects cat, in the 5th Col, separator as Tab (instead of / )
Showing 4 changed files with 11 additions and 9 deletions   Show diff stats
Inline Side-by-side
src/osp/Writer.java
  Diff comments   View file @7dd4dc3
... ... @@ -703,6 +703,8 @@ public boolean writeLocalCatalog(Image im, String filename)
703 703 ffw.write(sk.getObjWorldCenter().getDec().toString());
704 704 ffw.write("\t");
705 705 ffw.write(String.valueOf(sk.getPriority()));
  706 + ffw.write("\t");
  707 + ffw.write(String.valueOf(sk.getProperty()));
706 708 ffw.write("\n");
707 709  
708 710 }
... ...
src/osp/ui/OSPE_LoadLocalObjectsCat.java
  Diff comments   View file @7dd4dc3
... ... @@ -104,7 +104,7 @@ public boolean loadLocalObjectsCat(File catFile)
104 104 while (lineBreaker.hasNext() && i<5)
105 105 {
106 106 tab[i] = lineBreaker.next();
107   - temp=temp+" / "+tab[i];
  107 + temp=temp+"\\t"+tab[i];
108 108 i++;
109 109 }
110 110  
... ...
src/osp/ui/OSPE_MaskPropPanel.java
  Diff comments   View file @7dd4dc3
... ... @@ -38,7 +38,7 @@ public class OSPE_MaskPropPanel extends PropertiesPanel {
38 38 private static final long serialVersionUID = 1L;
39 39  
40 40 /** Name of the panel */
41   - private String title = "Selected Mask Properties";
  41 + private String title = " Mask Properties ";
42 42 /** Number of the "alpha" field */
43 43 public static final int alphaC = 0;
44 44 /** Number of the "delta" field */
... ...
src/osp/ui/OSPE_SlitPropPanel.java
  Diff comments   View file @7dd4dc3
... ... @@ -21,7 +21,7 @@ public class OSPE_SlitPropPanel extends PropertiesPanel
21 21 {
22 22 private static final long serialVersionUID = 1L;
23 23 /** Title of the properties panel. */
24   - private static String title = "Selected Slit Properties";
  24 + private static String title = " Slit Properties ";
25 25 /** Number of the "position" field */
26 26 public static final int posit = 0;
27 27 /** Number of the "width" field */
... ... @@ -33,9 +33,9 @@ public class OSPE_SlitPropPanel extends PropertiesPanel
33 33 /** Number of the "lambda max" field */
34 34 public static final int lMax = 4;
35 35 /** Number of the "length" field */
36   - public static final int length = 5;
  36 + //public static final int length = 5;
37 37 /** Number of the "object position" field */
38   - public static final int posObj = 6;
  38 +// public static final int posObj = 6;
39 39 /** The visu panel - parent */
40 40 private OSPE_VisuPanel visualPanel;
41 41 /** The field of view */
... ... @@ -99,10 +99,10 @@ public class OSPE_SlitPropPanel extends PropertiesPanel
99 99 getJComponent(lambda).setEnabled(false);
100 100 addTextField(lMax, "lambdaMax");
101 101 getJComponent(lMax).setEnabled(false);
102   - addTextField(length, "length");
103   - getJComponent(length).setEnabled(false);
104   - addTextField(posObj, "Object Pos");
105   - getJComponent(posObj).setEnabled(false);
  102 +// addTextField(length, "length");
  103 +// getJComponent(length).setEnabled(false);
  104 +// addTextField(posObj, "Object Pos");
  105 +// getJComponent(posObj).setEnabled(false);
106 106  
107 107 } // End OSPE_SlitPropPanel constructor
108 108  
... ...