Skip to content

Commit df90e64

Browse files
committed
Updated scanning range to work in macros
1 parent 1dfadfa commit df90e64

8 files changed

Lines changed: 57 additions & 38 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ hs_err_pid*
3838
/Python Scripts/figures/*
3939
/Python Scripts/test/results/*
4040
/test_path/*
41+
/Python Scripts/figures/*
958 Bytes
Loading

Python Scripts/figures/figure 2.svg

Lines changed: 32 additions & 30 deletions
Loading

Python Scripts/gaussian_order.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,11 @@ def run(argument_string = "", max_neighbourhood=None, filter_edges=None, promine
391391

392392
if args.IDE: # change defaults if needed
393393
args.testing = 0
394-
args.show_graph = True
395-
args.core_path = r""
396-
#args.filenames = "all"
397-
args.filenames = ["window100_coronal_top_A_crop", "window300_coronal_top_A_crop"]
394+
args.show_graph = False
395+
args.core_path = r"D:\Data\2025_KatjaDeadstopPaper\results\input"
396+
args.filenames = "all"
397+
absolute=True
398+
#args.filenames = ["window100_coronal_top_A_crop", "window300_coronal_top_A_crop"]
398399

399400

400401
if max_neighbourhood is not None:

RFT.iml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module version="4">
3+
<component name="AdditionalModuleElements">
4+
<content url="file://$MODULE_DIR$" dumb="true">
5+
<excludeFolder url="file://$MODULE_DIR$/Matlab" />
6+
<excludeFolder url="file://$MODULE_DIR$/Python Scripts" />
7+
<excludeFolder url="file://$MODULE_DIR$/Test Images" />
8+
<excludeFolder url="file://$MODULE_DIR$/test_path" />
9+
</content>
10+
</component>
11+
</module>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<parent>
1010
<groupId>org.scijava</groupId>
1111
<artifactId>pom-scijava</artifactId>
12-
<version>39.0.0</version>
12+
<version>40.0.0</version>
1313
</parent>
1414

1515
<groupId>com.wurgobes</groupId>
1616
<artifactId>RFT</artifactId>
17-
<version>1.0</version>
17+
<version>1.1</version>
1818

1919

2020
<name>Rotated Fourier Transform</name>

src/main/java/com/wurgobes/RFT/RFT.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ public void runVector(RFTParameters params){
196196
if(params.window % 2 == 0)
197197
params.window += 1;
198198

199-
setupImage();
199+
if(!params.scanning_range)
200+
setupImage();
201+
200202
//Non stack version for now
201203
if(false && imp.hasImageStack()){
202204
ImageStack input = imp.getStack();
@@ -286,6 +288,8 @@ public void AngleGraph(RFTParameters params){
286288
}
287289

288290
public void scanWindow(RFTParameters params){
291+
setupImage();
292+
logService.info("Performing scan: " + params.start + ":" + params.step + ":" + params.end + " on " + imp.getTitle());
289293
params.scanning_range = Boolean.TRUE;
290294
ImageStack angle_stack = null;
291295
for(int i = params.start; i <= params.end; i+=params.step){

src/main/java/com/wurgobes/RFT/gui_components/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public class Constants {
99
static public String softname = "RFT";
10-
static public String version = "1.0";
10+
static public String version = "1.1";
1111
static public String date = "1st October 2024";
1212
static public String author = "Martijn Gobes";
1313
static public String link = "https://github.com/HohlbeinLab/AnalyseDirectionality";

0 commit comments

Comments
 (0)