Changeset 533


Ignore:
Timestamp:
10/13/05 15:53:33 (15 years ago)
Author:
curtis
Message:

Some more task tweaks; update bugs list.

Location:
trunk/loci/visbio
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/visbio/VisBio.java

    r532 r533  
    4646 
    4747  /** Application version. */ 
    48   public static final String VERSION = "v3.15"; 
     48  public static final String VERSION = "v3.11a"; 
    4949 
    5050  /** Application author. */ 
     
    5252 
    5353  /** Application build date. */ 
    54   public static final String DATE = "?? October 2005"; 
     54  public static final String DATE = "13 October 2005"; 
    5555 
    5656  /** Port to use for communicating between application instances. */ 
  • trunk/loci/visbio/bugs.txt

    r501 r533  
    4040    selected, for example, the mappings of Red->#1, Green->Full, Blue->Full 
    4141    are not reset, but the mode does reset to RGB, resulting in lots of cyan. 
     42 
    4243 
    4344State engine 
     
    106107    (use same strategy), because otherwise state might not restore correctly. 
    107108 
    108 [M] Eliminate obsolete control panel logic in favor of one master VisBio window 
    109     with data, displays and tasks information (for v3.10). 
    110  
    111109[L] Command+? Macintosh Help shortcut does not function. 
    112110 
     
    117115 
    118116 
    119 Open Microscopy Environment 
    120 --------------------------- 
    121  
    122 [M] Create a command-line upload utility for use doing generic client-side 
    123     uploads--use loci.visbio.ome.ImageUploader.main(String[]) for this. 
    124  
    125 [L] Upload to OME works, but produces a bunch of annoying messages on the 
    126     error stream anyway. 
    127  
    128  
    129117Java Web Start 
    130118-------------- 
  • trunk/loci/visbio/data/ExportPane.java

    r531 r533  
    252252            // save data to file 
    253253            String filename = sb.toString(); 
    254             task.setStatus(count++, max, "Exporting file " + filename); 
     254            String fname = new File(filename).getName(); 
     255            task.setStatus(count++, max, "Exporting " + fname); 
    255256            saver.save(filename, data, false); 
    256257          } 
  • trunk/loci/visbio/ome/ImageUploader.java

    r495 r533  
    135135      // upload each original file into the repository, using the MEX 
    136136      for (int i=0; i<files.length; i++) { 
    137         notifyListeners(new TaskEvent(i, files.length, 
    138           "Uploading file '" + files[i].getName() + "'...")); 
     137        notifyListeners(new TaskEvent(i, 2 * files.length, 
     138          "Uploading '" + files[i].getName() + "'...")); 
    139139        OriginalFile fileAttr = pf.uploadFile(rep, of, files[i]); 
    140140      } 
     
    145145 
    146146      // create a new Image object for the multidimensional image 
    147       notifyListeners(new TaskEvent(0, 1, "Creating image entry...")); 
     147      notifyListeners(new TaskEvent(1, 2, "Creating image entry...")); 
    148148      Image image = (Image) df.createNew(Image.class); 
    149149      image.setName(data.getName()); 
     
    187187 
    188188      // get a MEX for the image's metadata 
    189       notifyListeners(new TaskEvent(0, 1, "Creating pixels file...")); 
     189      notifyListeners(new TaskEvent(1, 2, "Creating pixels file...")); 
    190190      ModuleExecution ii = im.getImageImportMEX(image); 
    191191      ii.setExperimenter(user); 
     
    196196 
    197197      // extract image pixels from each plane 
    198       int count = 0; 
    199198      int numImages = sizeZ * sizeC * sizeT; 
     199      int count = numImages; 
    200200      byte[] buf = new byte[sizeX * sizeY * bpp]; 
    201201      for (int t=0; t<sizeT; t++) { 
    202202        for (int z=0; z<sizeZ; z++) { 
    203203          for (int c=0; c<sizeC; c+=range) { 
    204             notifyListeners(new TaskEvent(count, numImages, 
    205               "Uploading image " + (count + 1) + "/" + numImages + 
    206               " (t=" + t + ", z=" + z + ", c=" + c + ")...")); 
     204            notifyListeners(new TaskEvent(count, 2 * numImages, 
     205              "Uploading T" + t + " Z" + z + " C" + c + "...")); 
    207206 
    208207            // convert rasterized C value to multidimensional position 
     
    220219            for (int r=0; r<range; r++) { 
    221220              if (r > 0) { 
    222                 notifyListeners(new TaskEvent(count, numImages, 
    223                   "Uploading image " + (count + 1) + "/" + numImages + 
    224                   " (t=" + t + ", z=" + z + ", c=" + c + ")...")); 
     221                notifyListeners(new TaskEvent(count, 2 * numImages, 
     222                  "Uploading T" + t + " Z" + z + " C" + (c + r) + "...")); 
    225223              } 
    226224              count++; 
  • trunk/loci/visbio/ome/OMEManager.java

    r531 r533  
    107107      public void run() { 
    108108        uploader.upload(data, server, user, password, bytesPerPix, isFloat); 
     109        task.setCompleted(); 
    109110      } 
    110111    }).start(); 
Note: See TracChangeset for help on using the changeset viewer.