Smaller naming changes

joda01 · Dec 4, 2022 · cb7e2fe · cb7e2fe
1 parent 224fdd3
commit cb7e2fe
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/bin/EVAnalyzer.jar b/bin/EVAnalyzer.jar
diff --git a/src/org/danmayr/imagej/algorithm/FileProcessor.java b/src/org/danmayr/imagej/algorithm/FileProcessor.java
@@ -29,12 +29,12 @@ public class FileProcessor extends Thread {
     Dialog mDialog;
     boolean mStopping = false;
     AnalyseSettings mAnalyseSettings;
-    boolean mDemo = false;
+    boolean mtestRun = false;
 
-    public FileProcessor(final Dialog dialog, final AnalyseSettings analyseSettings, boolean demo) {
+    public FileProcessor(final Dialog dialog, final AnalyseSettings analyseSettings, boolean testRun) {
         mDialog = dialog;
         mAnalyseSettings = analyseSettings;
-        mDemo = demo;
+        mtestRun = testRun;
     }
 
     /**
@@ -79,7 +79,7 @@ public void run() {
         //
         // Now we let to select which files should be analyzed
         //
-        if (true == mDemo) {
+        if (true == mtestRun) {
             DialogSelectImages d = new DialogSelectImages(this.mDialog);
             mFoundFiles = d.show(mFoundFiles);
             mDialog.setProgressBarMaxSize(mFoundFiles.size(), "analyzing ...");

diff --git a/src/org/danmayr/imagej/gui/Dialog.java b/src/org/danmayr/imagej/gui/Dialog.java
@@ -68,7 +68,7 @@ public class Dialog extends JFrame {
     private JButton mbInputFolder;
     private JButton mbOutputFolder;
     private JButton mbStart;
-    private JButton mbStartDemo;
+    private JButton mStartTestRun;
     private JButton mCancle;
 
     private JButton mClose;
@@ -1563,16 +1563,16 @@ public void actionPerformed(java.awt.event.ActionEvent e) {
         mMenu.add(mbStart);
 
         ////////////////////////////////////////////////////
-        mbStartDemo = new JButton();
-        mbStartDemo = new JButton(new ImageIcon(getClass().getResource("icons8-eye-16.png")));
-        mbStartDemo.addActionListener(new java.awt.event.ActionListener() {
+        mStartTestRun = new JButton();
+        mStartTestRun = new JButton(new ImageIcon(getClass().getResource("icons8-eye-16.png")));
+        mStartTestRun.addActionListener(new java.awt.event.ActionListener() {
             // Beim Drücken des Menüpunktes wird actionPerformed aufgerufen
             public void actionPerformed(java.awt.event.ActionEvent e) {
                 startAnalyse(getAnalyzeSettings(true, true), true);
             }
         });
-        mbStartDemo.setText("Run Preview (Alpha)");
-        mMenu.add(mbStartDemo);
+        mStartTestRun.setText("Test Run (Alpha)");
+        mMenu.add(mStartTestRun);
 
         ////////////////////////////////////////////////////
         mOpenResult = new JButton();
@@ -1696,7 +1696,7 @@ synchronized public void incrementProgressBarValue(String lable) {
     // \param[in] forAnalysis set to true if you want to get the settings prepared
     // for analysis
     //
-    AnalyseSettings getAnalyzeSettings(boolean forAnalysis, boolean demoMode) {
+    AnalyseSettings getAnalyzeSettings(boolean forAnalysis, boolean testMode) {
         String error = "";
         AnalyseSettings sett = new AnalyseSettings();
 
@@ -1713,8 +1713,8 @@ AnalyseSettings getAnalyzeSettings(boolean forAnalysis, boolean demoMode) {
             DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH.mm.ss");
             LocalDateTime now = LocalDateTime.now();
             String outputFolder = dtf.format(now);
-            if (true == demoMode) {
-                outputFolder = "preview";
+            if (true == testMode) {
+                outputFolder = "test_runs";
             }
 
             sett.mOutputFolder = mOutputFolder.getText() + java.io.File.separator + outputFolder;
@@ -1780,7 +1780,7 @@ void loadAnalyzeSettings(AnalyseSettings sett) {
     ///
     /// Start analyzing
     ///
-    public void startAnalyse(AnalyseSettings sett, boolean demo) {
+    public void startAnalyse(AnalyseSettings sett, boolean testRun) {
         if (null != sett) {
             // Creeate folder if not exists
             final File parentFile = new File(sett.getOutputFolder());
@@ -1792,11 +1792,11 @@ public void startAnalyse(AnalyseSettings sett, boolean demo) {
                 sett.saveSettings(sett.getOutputFolder() + java.io.File.separator + "settings.json",
                         "auto-save", "-");
                 mbStart.setEnabled(false);
-                mbStartDemo.setEnabled(false);
+                mStartTestRun.setEnabled(false);
                 mCancle.setEnabled(true);
                 mOpenResult.setEnabled(false);
                 tabbedPane.setSelectedIndex(2);
-                mActAnalyzer = new FileProcessor(this, sett, demo);
+                mActAnalyzer = new FileProcessor(this, sett, testRun);
                 mActAnalyzer.start();
             } else {
                 IJ.log("Cannnot create directory: " + parentFile);
@@ -1822,7 +1822,7 @@ public void finishedAnalyse(String nameOfGeneratedReportFile) {
         mProgressbar.setValue(mProgressbar.getMaximum());
 
         mbStart.setEnabled(true);
-        mbStartDemo.setEnabled(true);
+        mStartTestRun.setEnabled(true);
         mCancle.setEnabled(false);
 
         if (nameOfGeneratedReportFile.length() > 0) {

diff --git a/src/org/danmayr/imagej/gui/DialogSelectImages.java b/src/org/danmayr/imagej/gui/DialogSelectImages.java
@@ -35,6 +35,7 @@ public DialogSelectImages(JFrame root) {
         this.setSize(400, 300);
         this.setModal(true);
         this.setLocationRelativeTo(root);
+        this.setTitle("Test Run");
 
         GridBagLayout layout = new GridBagLayout();
         this.setLayout(layout);