• Views
  • Iteration Report
  • My Iteration Report
  •  
OMERO.server
  • Login
  • Help/Guide
  • About Trac
  • Preferences
  • Wiki
  • Timeline
  • Roadmap
  • Browse Source
  • View Tickets
  • Search

Context Navigation

  • ← Previous Change
  • Next Change →

Changeset 1028 for branches/bioformats-omero

Show
Ignore:
Timestamp:
10/11/06 10:27:20 (2 years ago)
Author:
TheBrain
Message:

Updated Importer to work with new loci files, also added new graphics path.

Location:
branches/bioformats-omero/src/ome/formats
Files:
1 removed
3 modified

  • importer/FileQueueHandler.java (modified) (1 diff)
  • importer/ImportHandler.java (modified) (8 diffs)
  • importer/Main.java (modified) (1 diff)
  • testclient (deleted)

Legend:

Unmodified
Added
Removed

  • branches/bioformats-omero/src/ome/formats/importer/FileQueueHandler.java

    r1021 r1028  
    7474    {         
    7575        this.viewer = viewer; 
    76         try 
    77         { 
    78             reader = new ChannelSeparator(new ImageReader()); 
    79             reader.setChannelStatCalculationStatus(true); 
    80         } catch(FormatException e) 
    81         { 
    82             throw new RuntimeException(e); 
    83         } 
    84          
    85  
     76        reader = new ChannelSeparator(new ImageReader()); 
     77        reader.setChannelStatCalculationStatus(true); 
     78      
    8679        setLayout(new BorderLayout()); 
    8780        fileChooser = new FileQueueChooser(); 

  • branches/bioformats-omero/src/ome/formats/importer/ImportHandler.java

    r1020 r1028  
    3030package ome.formats.importer; 
    3131 
    32 import java.beans.PropertyChangeEvent; 
    33 import java.beans.PropertyChangeListener; 
    3432import java.io.File; 
    35 import java.lang.reflect.Field; 
    3633import java.text.SimpleDateFormat; 
    3734import java.util.Date; 
    3835 
    39 import javax.swing.JTable; 
    40 import javax.swing.ProgressMonitor; 
    41  
    4236import loci.formats.IFormatReader; 
    4337import ome.formats.OMEROMetadataStore; 
    44 import ome.formats.importer.FileQueueTable.SelectionListener; 
    4538 
    4639import org.apache.commons.logging.Log; 
    … …  
    10093        Date date = null; 
    10194 
    102         //monitor = new ProgressMonitor(viewer, null, null, 0, 0); 
    103  
    10495        // record initial timestamp and record total running time for the import 
    10596        timestampIn = System.currentTimeMillis(); 
    … …  
    114105         
    115106        FileAndDatasetContainer[] fads = library.getFilesAndDatasets(); 
    116         //qTable.importBtn.setEnabled(false); 
    117107        qTable.importBtn.setText("Cancel"); 
    118108        qTable.importing = true; 
    … …  
    136126            } 
    137127        } 
    138         //qTable.importBtn.setEnabled(true); 
    139128        qTable.importBtn.setText("Import");  
    140129        qTable.importBtn.setEnabled(true); 
    … …  
    186175                (index +1) + " of " + total); 
    187176        viewer.statusBar.setProgressValue(index); 
    188          
    189         //monitor.setNote("<html>Importing the following file [" + (index + 1) 
    190         //        + " of " + total + "] into your OMERO server: <br><br>'" 
    191         //        + shortName + "'<br><br></html>"); 
    192         //monitor.setMaximum(count); 
    193         //resetProgressMonitor(); 
    194         //monitor.setProgress(monitor.getMinimum()); 
    195177 
    196178        viewer.appendToOutput("> [" + index + "] Importing metadata for " 
    … …  
    215197                if (i < qTable.getMaximum())  
    216198                {    
    217                     //monitor.setProgress(i); 
    218199                    qTable.setProgress(i); 
    219200                } 
    220                 //if ((i % 10) == 0 || i == 1) viewer.appendToOutput(i + ""); 
    221                 //else 
    222                 //    viewer.appendToOutput("."); 
    223201            } 
    224202        }); 
    225         //viewer.appendToOutput("\n"); 
    226203 
    227204        viewer.appendToOutputLn("> Successfully stored with pixels id \"" 
    … …  
    230207                + "] Image imported successfully!"); 
    231208 
    232         //System.err.println(qTable.table.getRowCount()); 
    233209        qTable.setProgressDone(index); 
    234210         
    … …  
    250226        viewer.waitCursor(false); 
    251227    } 
    252  
    253 //    /** 
    254 //     * *cough* Nasty hack to get around the private "lastDisp" field semantics 
    255 //     * (field visibility) of the progress monitor. *cough* 
    256 //     */ 
    257 //    private void resetProgressMonitor() 
    258 //    { 
    259 //        try 
    260 //        { 
    261 //            Class klass = monitor.getClass(); 
    262 //            Field[] fields = klass.getDeclaredFields(); 
    263 //            
    264 //            for (Field field : fields) 
    265 //            { 
    266 //                if (field.getName().equals("lastDisp")) 
    267 //                { 
    268 //                    field.setAccessible(true); 
    269 //                    field.setInt(monitor, 0); 
    270 //                }                
    271 //            } 
    272 //        } catch (Exception e) 
    273 //        { 
    274 //            e.printStackTrace(); 
    275 //            // Eat it. 
    276 //        } 
    277 //    } 
    278228} 

  • branches/bioformats-omero/src/ome/formats/importer/Main.java

    r1023 r1028  
    7272    /** The data of the last release date. */ 
    7373    public static String        releaseDate       
    74          = "2006-10-03 11:34:47 +0100 (Tue, 03 Oct 2006)"; 
     74         = "2006-10-09 14:26:41 +0100 (Mon, 09 Oct 2006)"; 
    7575 
    7676    /** The repository revision. */ 

Download in other formats:

  • Unified Diff
  • Zip Archive
Trac Powered

Powered by Trac 0.11
By Edgewall Software.

Visit the Trac open source project at
http://trac.edgewall.org/