OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

base: Commit

This repository is a base of Eos.


Commit MetaInfo

Revision07801eaf8c031ba4821afd0e477eb0845e3262a8 (tree)
Zeit2021-11-08 02:48:16
AutorTakuo Yasunaga <yasunaga@bio....>
CommiterTakuo Yasunaga

Log Message

Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
On branch master
Your branch is up to date with 'origin/master'.
Changes to be committed:

modified: src/Tools/Config/Define.inc
modified: src/Tools/mrcImage/mrcImageOpticalFlow/Config/OptionControlFile
modified: src/Tools/mrcImage/mrcImageOpticalFlow/src/init.c
modified: src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.html
modified: src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.pane
modified: src/Tools/mrcImage/mrcImageOpticalFlow/src/usage.c

Changes not staged for commit:

modified: include/eosMATH.h

Ändern Zusammenfassung

Diff

--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -9,3 +9,4 @@ WORLDNAME=Tools
99 WORLDNAME=Tools
1010 WORLDNAME=Tools
1111 WORLDNAME=Tools
12+WORLDNAME=Tools
--- a/src/Tools/mrcImage/mrcImageOpticalFlow/Config/OptionControlFile
+++ b/src/Tools/mrcImage/mrcImageOpticalFlow/Config/OptionControlFile
@@ -3,8 +3,8 @@
33 "-i1","-i[nput]1","Input","Essential","1","1","In1","inFile::mrcImage","NULL"
44 "-i2","-i[nput]2","Input","Essential","1","1","In2","inFile::mrcImage","NULL"
55 "-i3","-i[nput]3","Input","Optional","1","1","In3","inFile::mrcImage","NULL"
6-"-o","-o[utput]","OutputDataFile","Essential","3","1","Vx","outFile::mrcImage","NULL","2","Vy","outFile::mrcImage","NULL","3","Vz","outFile::mrcImage","NULL"
7-"-oF","-o[utput]F","OutputDataFile","Essential","4","1","OutFx","outFile::mrcImage","NULL","2","OutFy","outFile::mrcImage","NULL","3","OutFz","outFile::mrcImage","NULL","4","OutDi","outFile::mrcImage","NULL"
6+"-o","-o[utput]","OutputDataFile","Optional","3","1","Vx","outFile::mrcImage","NULL","2","Vy","outFile::mrcImage","NULL","3","Vz","outFile::mrcImage","NULL"
7+"-oF","-o[utput]F","OutputDataFile","Optional","4","1","OutFx","outFile::mrcImage","NULL","2","OutFy","outFile::mrcImage","NULL","3","OutFz","outFile::mrcImage","NULL","4","OutDi","outFile::mrcImage","NULL"
88 "-oSize","-o[utput]Size","Output:Chimera","Optional","1","1","Size","outFile::mrcImage","NULL"
99 "-oCOMMAND","-o[utput]COMMAND","Output:Chimera","Optional","1","1","OutCOMMAND","outFile::ASCII","NULL"
1010 "-oBILD","-o[utput]BILD","Output:Chimera","Optional","1","1","OutBILD","outFile::ASCII","NULL"
--- a/src/Tools/mrcImage/mrcImageOpticalFlow/src/init.c
+++ b/src/Tools/mrcImage/mrcImageOpticalFlow/src/init.c
@@ -61,65 +61,30 @@ init1(mrcImageOpticalFlowInfo* info)
6161 info->fptIn3 = fileOpen(info->In3, "r");
6262 }
6363
64- if(!info->flagVx) {
65- stringGetFromFile(s, "Vx", stdin, stdout, 0);
66- info->Vx = stringGetNthWord(s, 1, " ,\t");
67- info->flagVx++;
68- }
6964 if(info->flagVx) {
7065 info->fptVx = fileOpen(info->Vx, "w");
7166 }
7267
73- if(!info->flagVy) {
74- stringGetFromFile(s, "Vy", stdin, stdout, 0);
75- info->Vy = stringGetNthWord(s, 1, " ,\t");
76- info->flagVy++;
77- }
7868 if(info->flagVy) {
7969 info->fptVy = fileOpen(info->Vy, "w");
8070 }
8171
82- if(!info->flagVz) {
83- stringGetFromFile(s, "Vz", stdin, stdout, 0);
84- info->Vz = stringGetNthWord(s, 1, " ,\t");
85- info->flagVz++;
86- }
8772 if(info->flagVz) {
8873 info->fptVz = fileOpen(info->Vz, "w");
8974 }
9075
91- if(!info->flagOutFx) {
92- stringGetFromFile(s, "OutFx", stdin, stdout, 0);
93- info->OutFx = stringGetNthWord(s, 1, " ,\t");
94- info->flagOutFx++;
95- }
9676 if(info->flagOutFx) {
9777 info->fptOutFx = fileOpen(info->OutFx, "w");
9878 }
9979
100- if(!info->flagOutFy) {
101- stringGetFromFile(s, "OutFy", stdin, stdout, 0);
102- info->OutFy = stringGetNthWord(s, 1, " ,\t");
103- info->flagOutFy++;
104- }
10580 if(info->flagOutFy) {
10681 info->fptOutFy = fileOpen(info->OutFy, "w");
10782 }
10883
109- if(!info->flagOutFz) {
110- stringGetFromFile(s, "OutFz", stdin, stdout, 0);
111- info->OutFz = stringGetNthWord(s, 1, " ,\t");
112- info->flagOutFz++;
113- }
11484 if(info->flagOutFz) {
11585 info->fptOutFz = fileOpen(info->OutFz, "w");
11686 }
11787
118- if(!info->flagOutDi) {
119- stringGetFromFile(s, "OutDi", stdin, stdout, 0);
120- info->OutDi = stringGetNthWord(s, 1, " ,\t");
121- info->flagOutDi++;
122- }
12388 if(info->flagOutDi) {
12489 info->fptOutDi = fileOpen(info->OutDi, "w");
12590 }
--- a/src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.html
+++ b/src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.html
@@ -13,11 +13,11 @@ Options:
1313 [-i[nput]3 In3 (NULL ).as(inFile::mrcImage ) ] :Optional :Input
1414 [-o[utput] Vx (NULL ).as(outFile::mrcImage )
1515 Vy (NULL ).as(outFile::mrcImage )
16- Vz (NULL ).as(outFile::mrcImage ) ] :Essential :OutputDataFile
16+ Vz (NULL ).as(outFile::mrcImage ) ] :Optional :OutputDataFile
1717 [-o[utput]F OutFx (NULL ).as(outFile::mrcImage )
1818 OutFy (NULL ).as(outFile::mrcImage )
1919 OutFz (NULL ).as(outFile::mrcImage )
20- OutDi (NULL ).as(outFile::mrcImage ) ] :Essential :OutputDataFile
20+ OutDi (NULL ).as(outFile::mrcImage ) ] :Optional :OutputDataFile
2121 [-o[utput]Size Size (NULL ).as(outFile::mrcImage ) ] :Optional :Output:Chimera
2222 [-o[utput]COMMAND OutCOMMAND (NULL ).as(outFile::ASCII ) ] :Optional :Output:Chimera
2323 [-o[utput]BILD OutBILD (NULL ).as(outFile::ASCII ) ] :Optional :Output:Chimera
--- a/src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.pane
+++ b/src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.pane
@@ -10,8 +10,8 @@
1010 -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In1' 'Input' i1
1111 -I 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'In2' 'Input' i2
1212 -I 1 0 1 0 0 1 -1x1+1+4.500000 ' ' 'In3' 'Input' i3
13- -I 1 0 1 1 0 1 -1x1+1+6 ' ' 'NULL' 'Vx' OutputDataFile
14- -I 1 0 1 1 0 1 -1x1+1+7 ' ' 'NULL' 'OutFx' OutputDataFile
13+ -I 1 0 0 1 0 1 -1x1+1+6 ' ' 'NULL' 'Vx' OutputDataFile
14+ -I 1 0 0 1 0 1 -1x1+1+7 ' ' 'NULL' 'OutFx' OutputDataFile
1515 -O 1 0 1 0 0 1 -1x1+1+9.000000 ' ' 'Size' 'Output:Chimera' oSize
1616 -O 1 0 1 0 0 1 -1x1+1+10.500000 ' ' 'OutCOMMAND' 'Output:Chimera' oCOMMAND
1717 -O 1 0 1 0 0 1 -1x1+1+12.000000 ' ' 'OutBILD' 'Output:Chimera' oBILD
--- a/src/Tools/mrcImage/mrcImageOpticalFlow/src/usage.c
+++ b/src/Tools/mrcImage/mrcImageOpticalFlow/src/usage.c
@@ -10,8 +10,8 @@ usage(char* thisProgram)
1010 fprintf(stderr, " [-i[nput]1 In1 (NULL ).as(inFile::mrcImage ) ] :Essential :Input\n");
1111 fprintf(stderr, " [-i[nput]2 In2 (NULL ).as(inFile::mrcImage ) ] :Essential :Input\n");
1212 fprintf(stderr, " [-i[nput]3 In3 (NULL ).as(inFile::mrcImage ) ] :Optional :Input\n");
13- fprintf(stderr, " [-o[utput] Vx (NULL ).as(outFile::mrcImage ) \n Vy (NULL ).as(outFile::mrcImage ) \n Vz (NULL ).as(outFile::mrcImage ) ] :Essential :OutputDataFile\n");
14- fprintf(stderr, " [-o[utput]F OutFx (NULL ).as(outFile::mrcImage ) \n OutFy (NULL ).as(outFile::mrcImage ) \n OutFz (NULL ).as(outFile::mrcImage ) \n OutDi (NULL ).as(outFile::mrcImage ) ] :Essential :OutputDataFile\n");
13+ fprintf(stderr, " [-o[utput] Vx (NULL ).as(outFile::mrcImage ) \n Vy (NULL ).as(outFile::mrcImage ) \n Vz (NULL ).as(outFile::mrcImage ) ] :Optional :OutputDataFile\n");
14+ fprintf(stderr, " [-o[utput]F OutFx (NULL ).as(outFile::mrcImage ) \n OutFy (NULL ).as(outFile::mrcImage ) \n OutFz (NULL ).as(outFile::mrcImage ) \n OutDi (NULL ).as(outFile::mrcImage ) ] :Optional :OutputDataFile\n");
1515 fprintf(stderr, " [-o[utput]Size Size (NULL ).as(outFile::mrcImage ) ] :Optional :Output:Chimera\n");
1616 fprintf(stderr, " [-o[utput]COMMAND OutCOMMAND (NULL ).as(outFile::ASCII ) ] :Optional :Output:Chimera\n");
1717 fprintf(stderr, " [-o[utput]BILD OutBILD (NULL ).as(outFile::ASCII ) ] :Optional :Output:Chimera\n");
Show on old repository browser