fix: batchMode

Author: berdal84

src/main/java/com/berdal84/mageek/MColorPreset.java

@@ -103,6 +103,12 @@ final MColor getMetaColorAt(int _index)
     {
         return colors[_index];
     }
+    
+    final void setMetaColorAt(int _index, MColor _color)
+    {
+        colors[_index] = _color;
+    }
+
 
     final String getIJColorStringAt(int _index)
     {

src/main/java/com/berdal84/mageek/Mageek.java

@@ -197,12 +197,13 @@ public void run()
         gui.setAvailableZProjection(ZProjector.METHODS);
         gui.setZProjection(ZProjector.METHODS[ZProjector.AVG_METHOD]);
         gui.setVisible(true);
-        gui.setAlwaysOnTop(false);        
+        gui.setAlwaysOnTop(false);
+        gui.setBatchMode(batchMode);
 
         gui.addBrowseBtnListener((ActionEvent evt)->
         {
                 gui.setStatus("Browsing folder ...");
-
+                gui.setProgress(0);
                 askSourceDirectoryToUser();
 
                 if (sourceFolder != null)
@@ -213,8 +214,6 @@ public void run()
                                     sourceFolder.toString()
                             )
                     );
-                    gui.setProgress(10);
-
                     gui.setSourceDirectory(sourceFolder.toString());
 
                     scannedFiles = FileHelper.getFiles(sourceFolder, true);
@@ -226,7 +225,6 @@ public void run()
                 else
                 {
                     gui.setStatus("Browsing aborted.");
-                    gui.setProgress(0);
                     gui.clearFileList();
                 }
         });
@@ -335,7 +333,15 @@ public void windowDeactivated(WindowEvent e)
 
             if ( !presetName.equals("Custom") )
             {
-                gui.setColorPreset( colorPresets.get(presetName), true);  
+                MColorPreset presetSelected = colorPresets.get(presetName);
+                gui.setColorPreset( presetSelected, true);
+                
+                // We choose a unique event for color item selection changed
+                // We need to update the selectedColorPreset entirely
+                for( int i=0; i < 4; i++ )
+                {
+                    selectedColors.setMetaColorAt(i, presetSelected.getMetaColorAt(i) );
+                }
             }
         });
 
@@ -418,6 +424,10 @@ private void processFiles()
                             int channel = 0;
                             for (ImagePlus channelImg : allChannels)
                             {
+                                if( !batchMode )
+                                {
+                                    channelImg.show();
+                                }
 
                                 if ( channelImg.getNSlices() > 1 )
                                 {
@@ -440,9 +450,23 @@ private void processFiles()
                                 );
 
                                 ImagePlus out = new ImagePlus("out", p.createImage());
+                                
+                                if( !batchMode )
+                                {
+                                    channelImg.close();
+                                    out.show();
+                                }
+                                
                                 FileSaver saver = new FileSaver(out);
                                 saver.saveAsTiff(outputPath);
                                 channel++;
+                                
+                                                                
+                                if( !batchMode )
+                                {
+                                    out.close();
+                                    
+                                }
                             }
                             serie++;
                         }
@@ -462,31 +486,6 @@ private void processFiles()
             }
 
             gui.setStatus("Processing DONE");
-            
-           if ( !batchMode && !allImages.isEmpty() )
-           {
-               DialogPrompt.Result response =
-                    ui.showDialog(
-                        "Would you like to open the images?",
-                        MessageType.QUESTION_MESSAGE,
-                        OptionType.YES_NO_OPTION
-                   );
-               
-               if( response.equals( DialogPrompt.Result.YES_OPTION ) )
-               {
-                   allImages.forEach( (ImagePlus[] imgs )->
-                   {
-                       for(ImagePlus img : imgs )
-                       {
-                           img.show();
-                       }
-                   });
-               }
-           }
-           else
-           {
-               gui.setStatus("No images were loaded :(");
-           }
         }
         else
         {

src/main/java/com/berdal84/mageek/MageekFrame.form

@@ -493,13 +493,9 @@
         </Component>
         <Component class="javax.swing.JCheckBox" name="batchCheckBox">
           <Properties>
-            <Property name="selected" type="boolean" value="true"/>
             <Property name="text" type="java.lang.String" value="Batch Mode"/>
             <Property name="toolTipText" type="java.lang.String" value="Enable by default, will process the images in background (faster)."/>
           </Properties>
-          <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="batchCheckBoxActionPerformed"/>
-          </Events>
         </Component>
       </SubComponents>
     </Container>

src/main/java/com/berdal84/mageek/MageekFrame.java

@@ -226,16 +226,8 @@ public void valueChanged(javax.swing.event.ListSelectionEvent evt)
         jLabel9.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
         jLabel9.setText("Channel 4");
 
-        batchCheckBox.setSelected(true);
         batchCheckBox.setText("Batch Mode");
         batchCheckBox.setToolTipText("Enable by default, will process the images in background (faster).");
-        batchCheckBox.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
-                batchCheckBoxActionPerformed(evt);
-            }
-        });
 
         javax.swing.GroupLayout colorPanelLayout = new javax.swing.GroupLayout(colorPanel);
         colorPanel.setLayout(colorPanelLayout);
@@ -354,10 +346,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt)
         pack();
     }// </editor-fold>//GEN-END:initComponents
 
-    private void batchCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_batchCheckBoxActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_batchCheckBoxActionPerformed
-
     private void extensionListValueChanged(javax.swing.event.ListSelectionEvent evt)//GEN-FIRST:event_extensionListValueChanged
     {//GEN-HEADEREND:event_extensionListValueChanged
 
@@ -616,5 +604,10 @@ String getSelectedIJColorStringAt(int i)
     {
         return (String) colorComboBoxes.get(i).getSelectedItem();
     }
+
+    void setBatchMode(boolean batchMode)
+    {
+        batchCheckBox.setSelected(batchMode);
+    }
 
 };