Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vecs
FIJI Public
Commits
760f7c38
Commit
760f7c38
authored
Jan 07, 2016
by
Christian Fibich
Committed by
Stefan Tauner
May 04, 2018
Browse files
Download-GUI tst file load bugfix
parent
ed68a903
Changes
2
Hide whitespace changes
Inline
Side-by-side
bin/Tk/FIJITestsViewer.pm
View file @
760f7c38
...
...
@@ -180,7 +180,7 @@ sub tests {
$self
->
{'
original_tests
'}
->
{'
tests
'}
=
clone
(
$self
->
{'
tests
'}
->
{'
tests
'});
$self
->
traceVariable
(
$self
->
{'
tests
'}
->
{'
design
'},
'
w
'
=>
[
\
&_watch_settings
,
$self
]);
$self
->
traceVariable
(
$self
->
{'
tests
'}
->
{'
tests
'},
'
w
'
=>
[
\
&_watch_settings
,
$self
]);
$self
->
{'
Downloader
'}
=
FIJI::
Downloader
->
new
(
undef
,
$self
->
{'
tests
'},
undef
,
$self
->
{'
settings
'});
$self
->
{'
Downloader
'}
=
FIJI::
Downloader
->
new
(
undef
,
undef
,
$self
->
{'
tests
'},
undef
,
$self
->
{'
settings
'});
$self
->
update
();
}
return
$self
->
{'
tests
'};
...
...
bin/fiji_download_gui.pl
View file @
760f7c38
...
...
@@ -262,7 +262,8 @@ sub main {
my
$filename
=
$tests_filename
;
my
$fr
=
$mw
;
if
(
-
e
$filename
)
{
my
$tmp_tests
=
FIJI::
Tests
->
new
('
setup
',
$self
->
{'
settings
'}
->
{'
design
'}
->
{'
CFGS_PER_MSG
'},
$self
->
{'
settings
'}
->
{'
design
'}
->
{'
FIU_NUM
'},
$filename
,);
# the mode 'GUI' is not defined in any ->phases_opt lists in TESTCONSTMAP and TESTPATMAP, thus all possible parameters have to be present.
my
$tmp_tests
=
FIJI::
Tests
->
new
('
GUI
',
$self
->
{'
settings
'}
->
{'
design
'}
->
{'
CFGS_PER_MSG
'},
$self
->
{'
settings
'}
->
{'
design
'}
->
{'
FIU_NUM
'},
$filename
,);
if
(
!
ref
(
$tmp_tests
))
{
my
$msg
=
"
Tests file
$filename
could not be loaded correctly:
$tmp_tests
";
$logger
->
error
(
$msg
);
...
...
@@ -550,7 +551,7 @@ sub _open_tests_file {
return
;
}
my
$tmp_tests
=
(
defined
$self
->
{'
tests
'})
?
\
%
{
Clone::
clone
(
$self
->
{'
tests
'})}
:
undef
;
$tmp_tests
=
FIJI::
Tests
->
new
('
manual
',
$self
->
{'
settings
'}
->
{'
design
'}
->
{'
CFGS_PER_MSG
'},
$self
->
{'
settings
'}
->
{'
design
'}
->
{'
FIU_NUM
'},
$filename
,
$tmp_tests
);
$tmp_tests
=
FIJI::
Tests
->
new
('
GUI
',
$self
->
{'
settings
'}
->
{'
design
'}
->
{'
CFGS_PER_MSG
'},
$self
->
{'
settings
'}
->
{'
design
'}
->
{'
FIU_NUM
'},
$filename
,
$tmp_tests
);
if
(
!
ref
(
$tmp_tests
))
{
my
$msg
=
"
tests file
$filename
could not be loaded correctly:
$tmp_tests
";
$logger
->
error
(
$msg
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment