Skip to content

Commit 226fc49

Browse files
ekatrukhaekatrukha
committed
fix save file dialogs
1 parent 30ca8e2 commit 226fc49

6 files changed

Lines changed: 60 additions & 41 deletions

File tree

‎src/main/java/bigtrace/BigTrace.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,7 @@ public void run(String arg)
230230
initSourcesCanvas(0.25 * Math.min(btData.nDimIni[1][0], Math.min(btData.nDimIni[1][1],btData.nDimIni[1][2])));
231231
if(!btMacro.bMacroMode)
232232
{
233-
//not sure we really need it, but anyway
234-
javax.swing.SwingUtilities.invokeLater(new Runnable() {
235-
@Override
236-
public void run() {
237-
createAndShowGUI();
238-
}
239-
});
233+
javax.swing.SwingUtilities.invokeLater( () -> createAndShowGUI());
240234
}
241235
else
242236
{

‎src/main/java/bigtrace/BigTraceControlPanel.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import java.beans.PropertyChangeEvent;
1717
import java.beans.PropertyChangeListener;
1818
import java.net.URL;
19+
import java.nio.file.Path;
20+
import java.nio.file.Paths;
1921
import java.text.DecimalFormat;
2022
import java.text.DecimalFormatSymbols;
2123

@@ -429,9 +431,11 @@ public void itemStateChanged(ItemEvent e) {
429431
public void dialSaveView()
430432
{
431433
String filename;
432-
433-
filename = bt.btData.sFileNameFullImg + "_btview";
434-
SaveDialog sd = new SaveDialog("Save View/settings ", filename, ".csv");
434+
Path pathIn = Paths.get(bt.btData.sFileNameFullImg);
435+
String sFolder = pathIn.getParent().toString();
436+
String fileNamePrefix = pathIn.getFileName().toString();
437+
filename = fileNamePrefix + "_btview";
438+
SaveDialog sd = new SaveDialog("Save View/settings ", sFolder, filename, ".csv");
435439

436440
String path = sd.getDirectory();
437441
if (path == null)

‎src/main/java/bigtrace/animation/AnimationPanel.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import java.awt.event.MouseAdapter;
1818
import java.awt.event.MouseEvent;
1919
import java.net.URL;
20+
import java.nio.file.Path;
21+
import java.nio.file.Paths;
2022
import java.util.ArrayList;
2123
import java.util.Arrays;
2224
import java.util.Hashtable;
@@ -867,9 +869,12 @@ void dialStorylineSave()
867869
if(listModel.size()>0)
868870
{
869871
String filename;
872+
Path pathIn = Paths.get(bt.btData.sFileNameFullImg);
873+
String sFolder = pathIn.getParent().toString();
874+
String fileNamePrefix = pathIn.getFileName().toString();
875+
filename = fileNamePrefix + "_btstory";
870876

871-
filename = bt.btData.sFileNameFullImg + "_btstory";
872-
SaveDialog sd = new SaveDialog("Save storyline ", filename, ".csv");
877+
SaveDialog sd = new SaveDialog("Save storyline ", sFolder, filename, ".csv");
873878
String path = sd.getDirectory();
874879
if (path == null)
875880
return;

‎src/main/java/bigtrace/measure/RoiMeasure3D.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import java.io.FileWriter;
1414
import java.io.IOException;
1515
import java.net.URL;
16+
import java.nio.file.Path;
17+
import java.nio.file.Paths;
1618
import java.text.DecimalFormat;
1719
import java.text.DecimalFormatSymbols;
1820
import java.util.ArrayList;
@@ -592,9 +594,11 @@ void measureROIs(final ArrayList<Roi3D> rois, final boolean resetTable)
592594
void measureAllProfiles()
593595
{
594596
String filename;
595-
596-
filename = bt.btData.sFileNameFullImg + "_int_profiles";
597-
SaveDialog sd = new SaveDialog("Save ROI Plot Profiles ", filename, ".csv");
597+
Path pathIn = Paths.get(bt.btData.sFileNameFullImg);
598+
String sFolder = pathIn.getParent().toString();
599+
String fileNamePrefix = pathIn.getFileName().toString();
600+
filename = fileNamePrefix + "_int_profiles";
601+
SaveDialog sd = new SaveDialog("Save ROI Plot Profiles ", sFolder, filename, ".csv");
598602
String path = sd.getDirectory();
599603
if (path == null)
600604
return;
@@ -613,9 +617,11 @@ void measureAllCoalignment()
613617
{
614618
String filename;
615619
int j,k;
616-
617-
filename = bt.btData.sFileNameFullImg + "_coalign";
618-
SaveDialog sd = new SaveDialog("Save ROI Plot Profiles ", filename, ".csv");
620+
Path pathIn = Paths.get(bt.btData.sFileNameFullImg);
621+
String sFolder = pathIn.getParent().toString();
622+
String fileNamePrefix = pathIn.getFileName().toString();
623+
filename = fileNamePrefix + "_coalign";
624+
SaveDialog sd = new SaveDialog("Save ROI coalignment profiles ", sFolder, filename, ".csv");
619625
String path = sd.getDirectory();
620626
if (path == null)
621627
return;

‎src/main/java/bigtrace/rois/Roi3DGroupManager.java‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import java.io.FileReader;
1414
import java.io.FileWriter;
1515
import java.io.IOException;
16+
import java.nio.file.Path;
17+
import java.nio.file.Paths;
1618
import java.text.DecimalFormat;
1719
import java.text.DecimalFormatSymbols;
1820
import java.util.ArrayList;
@@ -442,14 +444,18 @@ public void actionPerformed( ActionEvent e )
442444
public void dialogSaveGroups()
443445
{
444446
String filename;
445-
//int nGroupN, nGroup;
446447

447-
filename = roiManager.bt.btData.sFileNameFullImg + "_btgroups";
448-
SaveDialog sd = new SaveDialog("Save ROIs ", filename, ".csv");
448+
Path pathIn = Paths.get(roiManager.bt.btData.sFileNameFullImg);
449+
String sFolder = pathIn.getParent().toString();
450+
String fileNamePrefix = pathIn.getFileName().toString();
451+
452+
filename = fileNamePrefix + "_btgroups";
453+
SaveDialog sd = new SaveDialog("Save ROIs ", sFolder, filename, ".csv");
449454
String path = sd.getDirectory();
450-
if (path==null)
455+
456+
if (path == null)
451457
return;
452-
filename = path+sd.getFileName();
458+
filename = path + sd.getFileName();
453459

454460

455461
final File file = new File(filename);

‎src/main/java/bigtrace/rois/RoiManager3DDialogs.java‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import java.awt.Color;
44
import java.awt.GridBagConstraints;
55
import java.awt.GridBagLayout;
6-
6+
import java.nio.file.Path;
7+
import java.nio.file.Paths;
78
import java.text.DecimalFormat;
89
import java.text.DecimalFormatSymbols;
910

@@ -520,35 +521,38 @@ public void diagSaveROIs()
520521

521522
String filename = "";
522523
SaveDialog sd;
523-
String path = "";
524-
524+
525+
Path pathIn = Paths.get(bt.btData.sFileNameFullImg);
526+
String sFolder = pathIn.getParent().toString();
527+
String fileNamePrefix = pathIn.getFileName().toString();
528+
String pathOut = "";
525529
switch (nSaveMode)
526530
{
527531
case 1:
528-
filename = bt.btData.sFileNameFullImg + "_traces";
529-
sd = new SaveDialog("Export ROIs ", filename, ".csv");
530-
path = sd.getDirectory();
531-
if (path == null)
532+
filename = fileNamePrefix + "_traces";
533+
sd = new SaveDialog("Export ROIs ", sFolder, filename, ".csv");
534+
pathOut = sd.getDirectory();
535+
if (pathOut == null)
532536
return;
533-
filename = path + sd.getFileName();
537+
filename = pathOut + sd.getFileName();
534538
break;
535539
case 2:
536-
filename = bt.btData.sFileNameFullImg + "_traces";
537-
sd = new SaveDialog("Export ROIs to SWC ", filename, ".swc");
538-
path = sd.getDirectory();
539-
if (path == null)
540+
filename = fileNamePrefix + "_traces";
541+
sd = new SaveDialog("Export ROIs to SWC ", sFolder, filename, ".swc");
542+
pathOut = sd.getDirectory();
543+
if (pathOut == null)
540544
return;
541545
break;
542546
default:
543-
filename = bt.btData.sFileNameFullImg + "_btrois";
544-
sd = new SaveDialog("Save ROIs ", filename, ".csv");
545-
path = sd.getDirectory();
546-
if (path == null)
547+
filename = fileNamePrefix + "_btrois";
548+
sd = new SaveDialog("Save ROIs ", sFolder, filename, ".csv");
549+
pathOut = sd.getDirectory();
550+
if (pathOut == null)
547551
return;
548-
filename = path + sd.getFileName();
552+
filename = pathOut + sd.getFileName();
549553
break;
550554
}
551-
filename = path + sd.getFileName();
555+
filename = pathOut + sd.getFileName();
552556
ROIsIO.saveROIs( filename, nSaveMode, bt );
553557
}
554558

0 commit comments

Comments
 (0)