Download as
Browse Code »

Commit 2daa07c7ced513275bf9615e003350538bbc9380

Authored by vhosouza
1 parent ede9d099
Exists in usp-navegador

ENH: Updating navigation tools.

Showing 5 changed files with 352 additions and 328 deletions   Show diff stats
invesalius/.idea/dictionaries/Victor.xml
  Diff comments   View file @2daa07c
... ... @@ -5,6 +5,7 @@
5 5 <w>corregistration</w>
6 6 <w>fiducial</w>
7 7 <w>neuronavigation</w>
  8 + <w>neuronavigator</w>
8 9 <w>trck</w>
9 10 </words>
10 11 </dictionary>
... ...
invesalius/.idea/workspace.xml
  Diff comments   View file @2daa07c
... ... @@ -2,10 +2,11 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="1c49d80e-bb12-444a-b5f1-49d733261d55" name="Default" comment="">
5   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/coordinates.py" afterPath="$PROJECT_DIR$/data/coordinates.py" />
6   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/dialogs.py" afterPath="$PROJECT_DIR$/gui/dialogs.py" />
  5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dictionaries/Victor.xml" afterPath="$PROJECT_DIR$/.idea/dictionaries/Victor.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/constants.py" afterPath="$PROJECT_DIR$/constants.py" />
7 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/task_navigator.py" afterPath="$PROJECT_DIR$/gui/task_navigator.py" />
8 8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/trackers.py" afterPath="$PROJECT_DIR$/data/trackers.py" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
9 10 </list>
10 11 <ignored path="invesalius.iws" />
11 12 <ignored path=".idea/workspace.xml" />
... ... @@ -29,120 +30,105 @@
29 30 <favorites_list name="invesalius" />
30 31 </component>
31 32 <component name="FileEditorManager">
32   - <leaf>
33   - <file leaf-file-name="coordinates.py" pinned="false" current-in-tab="false">
34   - <entry file="file://$PROJECT_DIR$/data/coordinates.py">
35   - <provider selected="true" editor-type-id="text-editor">
36   - <state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="4964">
37   - <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
38   - <folding>
39   - <element signature="e#2#20#0" expanded="true" />
40   - <element signature="e#7877#9444#0" expanded="false" />
41   - </folding>
42   - </state>
43   - </provider>
44   - </entry>
45   - </file>
46   - <file leaf-file-name="trackers.py" pinned="false" current-in-tab="true">
47   - <entry file="file://$PROJECT_DIR$/data/trackers.py">
48   - <provider selected="true" editor-type-id="text-editor">
49   - <state vertical-scroll-proportion="0.18106312" vertical-offset="894" max-vertical-offset="3128">
50   - <caret line="59" column="24" selection-start-line="59" selection-start-column="24" selection-end-line="59" selection-end-column="24" />
51   - <folding>
52   - <element signature="e#0#20#0" expanded="true" />
53   - </folding>
54   - </state>
55   - </provider>
56   - </entry>
57   - </file>
58   - <file leaf-file-name="dialogs.py" pinned="false" current-in-tab="false">
59   - <entry file="file://$PROJECT_DIR$/gui/dialogs.py">
60   - <provider selected="true" editor-type-id="text-editor">
61   - <state vertical-scroll-proportion="0.0" vertical-offset="10846" max-vertical-offset="45050">
62   - <caret line="663" column="54" selection-start-line="663" selection-start-column="54" selection-end-line="663" selection-end-column="54" />
63   - <folding>
64   - <element signature="e#1053#1062#0" expanded="true" />
65   - </folding>
66   - </state>
67   - </provider>
68   - </entry>
69   - </file>
70   - <file leaf-file-name="task_navigator.py" pinned="false" current-in-tab="false">
71   - <entry file="file://$PROJECT_DIR$/gui/task_navigator.py">
72   - <provider selected="true" editor-type-id="text-editor">
73   - <state vertical-scroll-proportion="0.0" vertical-offset="6768" max-vertical-offset="14671">
74   - <caret line="495" column="43" selection-start-line="495" selection-start-column="43" selection-end-line="495" selection-end-column="43" />
75   - <folding />
76   - </state>
77   - </provider>
78   - </entry>
79   - </file>
80   - <file leaf-file-name="constants.py" pinned="false" current-in-tab="false">
81   - <entry file="file://$PROJECT_DIR$/constants.py">
82   - <provider selected="true" editor-type-id="text-editor">
83   - <state vertical-scroll-proportion="0.0" vertical-offset="9309" max-vertical-offset="10064">
84   - <caret line="576" column="10" selection-start-line="576" selection-start-column="10" selection-end-line="576" selection-end-column="10" />
85   - <folding />
86   - </state>
87   - </provider>
88   - </entry>
89   - </file>
90   - <file leaf-file-name="slice_.py" pinned="false" current-in-tab="false">
91   - <entry file="file://$PROJECT_DIR$/data/slice_.py">
92   - <provider selected="true" editor-type-id="text-editor">
93   - <state vertical-scroll-proportion="0.0" vertical-offset="1326" max-vertical-offset="22457">
94   - <caret line="37" column="7" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
95   - <folding>
96   - <element signature="e#1007#1016#0" expanded="true" />
97   - <marker date="1425508292698" expanded="true" signature="9428:9461" placeholder="Select first..." />
98   - </folding>
99   - </state>
100   - </provider>
101   - </entry>
102   - </file>
103   - <file leaf-file-name="task_slice.py" pinned="false" current-in-tab="false">
104   - <entry file="file://$PROJECT_DIR$/gui/task_slice.py">
105   - <provider selected="true" editor-type-id="text-editor">
106   - <state vertical-scroll-proportion="0.0" vertical-offset="9656" max-vertical-offset="14365">
107   - <caret line="608" column="59" selection-start-line="608" selection-start-column="59" selection-end-line="608" selection-end-column="59" />
108   - <folding />
109   - </state>
110   - </provider>
111   - </entry>
112   - </file>
113   - <file leaf-file-name="control.py" pinned="false" current-in-tab="false">
114   - <entry file="file://$PROJECT_DIR$/control.py">
115   - <provider selected="true" editor-type-id="text-editor">
116   - <state vertical-scroll-proportion="0.0" vertical-offset="10258" max-vertical-offset="11475">
117   - <caret line="639" column="26" selection-start-line="639" selection-start-column="26" selection-end-line="639" selection-end-column="26" />
118   - <folding />
119   - </state>
120   - </provider>
121   - </entry>
122   - </file>
123   - <file leaf-file-name="project.py" pinned="false" current-in-tab="false">
124   - <entry file="file://$PROJECT_DIR$/project.py">
125   - <provider selected="true" editor-type-id="text-editor">
126   - <state vertical-scroll-proportion="0.0" vertical-offset="305" max-vertical-offset="6409">
127   - <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
128   - <folding>
129   - <element signature="e#1008#1023#0" expanded="true" />
130   - </folding>
131   - </state>
132   - </provider>
133   - </entry>
134   - </file>
135   - <file leaf-file-name="presets.py" pinned="false" current-in-tab="false">
136   - <entry file="file://$PROJECT_DIR$/presets.py">
137   - <provider selected="true" editor-type-id="text-editor">
138   - <state vertical-scroll-proportion="0.0" vertical-offset="258" max-vertical-offset="3213">
139   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
140   - <folding />
141   - </state>
142   - </provider>
143   - </entry>
144   - </file>
145   - </leaf>
  33 + <splitter split-orientation="horizontal" split-proportion="0.5">
  34 + <split-first>
  35 + <leaf>
  36 + <file leaf-file-name="coordinates.py" pinned="false" current-in-tab="false">
  37 + <entry file="file://$PROJECT_DIR$/data/coordinates.py">
  38 + <provider selected="true" editor-type-id="text-editor">
  39 + <state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="4964">
  40 + <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
  41 + <folding>
  42 + <element signature="e#2#20#0" expanded="true" />
  43 + <element signature="e#7877#9444#0" expanded="false" />
  44 + </folding>
  45 + </state>
  46 + </provider>
  47 + </entry>
  48 + </file>
  49 + <file leaf-file-name="trackers.py" pinned="false" current-in-tab="false">
  50 + <entry file="file://$PROJECT_DIR$/data/trackers.py">
  51 + <provider selected="true" editor-type-id="text-editor">
  52 + <state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="3383">
  53 + <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
  54 + <folding>
  55 + <element signature="e#0#20#0" expanded="true" />
  56 + </folding>
  57 + </state>
  58 + </provider>
  59 + </entry>
  60 + </file>
  61 + <file leaf-file-name="dialogs.py" pinned="false" current-in-tab="false">
  62 + <entry file="file://$PROJECT_DIR$/gui/dialogs.py">
  63 + <provider selected="true" editor-type-id="text-editor">
  64 + <state vertical-scroll-proportion="0.0" vertical-offset="10846" max-vertical-offset="45050">
  65 + <caret line="663" column="54" selection-start-line="663" selection-start-column="54" selection-end-line="663" selection-end-column="54" />
  66 + <folding>
  67 + <element signature="e#1053#1062#0" expanded="true" />
  68 + </folding>
  69 + </state>
  70 + </provider>
  71 + </entry>
  72 + </file>
  73 + <file leaf-file-name="task_navigator.py" pinned="false" current-in-tab="true">
  74 + <entry file="file://$PROJECT_DIR$/gui/task_navigator.py">
  75 + <provider selected="true" editor-type-id="text-editor">
  76 + <state vertical-scroll-proportion="0.6247848" vertical-offset="1524" max-vertical-offset="14892">
  77 + <caret line="111" column="21" selection-start-line="111" selection-start-column="21" selection-end-line="111" selection-end-column="21" />
  78 + <folding>
  79 + <element signature="e#1007#1017#0" expanded="true" />
  80 + </folding>
  81 + </state>
  82 + </provider>
  83 + </entry>
  84 + </file>
  85 + <file leaf-file-name="constants.py" pinned="false" current-in-tab="false">
  86 + <entry file="file://$PROJECT_DIR$/constants.py">
  87 + <provider selected="true" editor-type-id="text-editor">
  88 + <state vertical-scroll-proportion="0.0" vertical-offset="9520" max-vertical-offset="10115">
  89 + <caret line="592" column="5" selection-start-line="592" selection-start-column="5" selection-end-line="592" selection-end-column="5" />
  90 + <folding />
  91 + </state>
  92 + </provider>
  93 + </entry>
  94 + </file>
  95 + <file leaf-file-name="viewer_volume.py" pinned="false" current-in-tab="false">
  96 + <entry file="file://$PROJECT_DIR$/data/viewer_volume.py">
  97 + <provider selected="true" editor-type-id="text-editor">
  98 + <state vertical-scroll-proportion="0.0" vertical-offset="15243" max-vertical-offset="23001">
  99 + <caret line="24" column="10" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="10" />
  100 + <folding />
  101 + </state>
  102 + </provider>
  103 + </entry>
  104 + </file>
  105 + <file leaf-file-name="measures.py" pinned="false" current-in-tab="false">
  106 + <entry file="file://$PROJECT_DIR$/data/measures.py">
  107 + <provider selected="true" editor-type-id="text-editor">
  108 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="12206">
  109 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  110 + <folding />
  111 + </state>
  112 + </provider>
  113 + </entry>
  114 + </file>
  115 + </leaf>
  116 + </split-first>
  117 + <split-second>
  118 + <leaf>
  119 + <file leaf-file-name="task_surface.py" pinned="false" current-in-tab="true">
  120 + <entry file="file://$PROJECT_DIR$/gui/task_surface.py">
  121 + <provider selected="true" editor-type-id="text-editor">
  122 + <state vertical-scroll-proportion="0.7607573" vertical-offset="2805" max-vertical-offset="9877">
  123 + <caret line="204" column="0" selection-start-line="204" selection-start-column="0" selection-end-line="204" selection-end-column="0" />
  124 + <folding />
  125 + </state>
  126 + </provider>
  127 + </entry>
  128 + </file>
  129 + </leaf>
  130 + </split-second>
  131 + </splitter>
146 132 </component>
147 133 <component name="Git.Settings">
148 134 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
... ... @@ -152,11 +138,11 @@
152 138 <list>
153 139 <option value="$PROJECT_DIR$/data/bases.py" />
154 140 <option value="$PROJECT_DIR$/data/co_registration.py" />
155   - <option value="$PROJECT_DIR$/constants.py" />
156   - <option value="$PROJECT_DIR$/gui/task_navigator.py" />
157 141 <option value="$PROJECT_DIR$/data/coordinates.py" />
158 142 <option value="$PROJECT_DIR$/gui/dialogs.py" />
159 143 <option value="$PROJECT_DIR$/data/trackers.py" />
  144 + <option value="$PROJECT_DIR$/constants.py" />
  145 + <option value="$PROJECT_DIR$/gui/task_navigator.py" />
160 146 </list>
161 147 </option>
162 148 </component>
... ... @@ -164,8 +150,10 @@
164 150 <detection-done>true</detection-done>
165 151 </component>
166 152 <component name="ProjectFrameBounds">
167   - <option name="width" value="960" />
168   - <option name="height" value="1040" />
  153 + <option name="x" value="-8" />
  154 + <option name="y" value="-8" />
  155 + <option name="width" value="1936" />
  156 + <option name="height" value="1056" />
169 157 </component>
170 158 <component name="ProjectLevelVcsManager" settingsEditedManually="true">
171 159 <OptionsSetting value="true" id="Add" />
... ... @@ -190,7 +178,6 @@
190 178 <sortByType />
191 179 </navigator>
192 180 <panes>
193   - <pane id="Scope" />
194 181 <pane id="ProjectPane">
195 182 <subPane>
196 183 <PATH>
... ... @@ -225,6 +212,7 @@
225 212 </PATH>
226 213 </subPane>
227 214 </pane>
  215 + <pane id="Scope" />
228 216 </panes>
229 217 </component>
230 218 <component name="PropertiesComponent">
... ... @@ -465,27 +453,27 @@
465 453 </todo-panel>
466 454 </component>
467 455 <component name="ToolWindowManager">
468   - <frame x="0" y="0" width="960" height="1040" extended-state="0" />
  456 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="0" />
469 457 <editor active="false" />
470 458 <layout>
471   - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33553356" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
472   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2822222" sideWeight="0.49945945" order="0" side_tool="false" content_ui="combo" />
473   - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20352036" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  459 + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33513513" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  460 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14978679" sideWeight="0.49932158" order="0" side_tool="false" content_ui="combo" />
  461 + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20324324" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
474 462 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
475 463 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
476 464 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
477   - <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29262927" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  465 + <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28756756" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
478 466 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
479 467 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
480   - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3278328" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
481   - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25586355" sideWeight="0.50054055" order="2" side_tool="true" content_ui="tabs" />
  468 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32756758" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  469 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.14818764" sideWeight="0.5006784" order="2" side_tool="true" content_ui="tabs" />
482 470 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
483 471 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
484 472 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
485 473 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
486 474 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
487 475 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
488   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32972974" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  476 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
489 477 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
490 478 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
491 479 </layout>
... ... @@ -524,12 +512,29 @@
524 512 <line>85</line>
525 513 <option name="timeStamp" value="3" />
526 514 </line-breakpoint>
  515 + <line-breakpoint enabled="true" type="python-line">
  516 + <url>file://$PROJECT_DIR$/data/viewer_volume.py</url>
  517 + <line>22</line>
  518 + <option name="timeStamp" value="4" />
  519 + </line-breakpoint>
  520 + <line-breakpoint enabled="true" type="python-line">
  521 + <url>file://$PROJECT_DIR$/data/converters.py</url>
  522 + <line>19</line>
  523 + <option name="timeStamp" value="5" />
  524 + </line-breakpoint>
527 525 </breakpoints>
528   - <option name="time" value="4" />
  526 + <option name="time" value="6" />
529 527 </breakpoint-manager>
530 528 <watches-manager />
531 529 </component>
532 530 <component name="editorHistoryManager">
  531 + <entry file="file://$PROJECT_DIR$/presets.py">
  532 + <provider selected="true" editor-type-id="text-editor">
  533 + <state vertical-scroll-proportion="0.0" vertical-offset="258" max-vertical-offset="3213">
  534 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  535 + </state>
  536 + </provider>
  537 + </entry>
533 538 <entry file="file://$PROJECT_DIR$/data/coordinates.py">
534 539 <provider selected="true" editor-type-id="text-editor">
535 540 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="5423">
... ... @@ -545,7 +550,9 @@
545 550 <provider selected="true" editor-type-id="text-editor">
546 551 <state vertical-scroll-proportion="0.0" vertical-offset="7890" max-vertical-offset="14637">
547 552 <caret line="494" column="28" selection-start-line="494" selection-start-column="28" selection-end-line="494" selection-end-column="28" />
548   - <folding />
  553 + <folding>
  554 + <element signature="e#1007#1017#0" expanded="true" />
  555 + </folding>
549 556 </state>
550 557 </provider>
551 558 </entry>
... ... @@ -561,10 +568,6 @@
561 568 <provider selected="true" editor-type-id="text-editor">
562 569 <state vertical-scroll-proportion="0.0" vertical-offset="1326" max-vertical-offset="22457">
563 570 <caret line="37" column="7" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
564   - <folding>
565   - <element signature="e#1007#1016#0" expanded="true" />
566   - <marker date="1425508292698" expanded="true" signature="9428:9461" placeholder="Select first..." />
567   - </folding>
568 571 </state>
569 572 </provider>
570 573 </entry>
... ... @@ -572,7 +575,6 @@
572 575 <provider selected="true" editor-type-id="text-editor">
573 576 <state vertical-scroll-proportion="0.0" vertical-offset="9656" max-vertical-offset="14365">
574 577 <caret line="608" column="59" selection-start-line="608" selection-start-column="59" selection-end-line="608" selection-end-column="59" />
575   - <folding />
576 578 </state>
577 579 </provider>
578 580 </entry>
... ... @@ -580,7 +582,6 @@
580 582 <provider selected="true" editor-type-id="text-editor">
581 583 <state vertical-scroll-proportion="0.0" vertical-offset="10258" max-vertical-offset="11475">
582 584 <caret line="639" column="26" selection-start-line="639" selection-start-column="26" selection-end-line="639" selection-end-column="26" />
583   - <folding />
584 585 </state>
585 586 </provider>
586 587 </entry>
... ... @@ -589,7 +590,7 @@
589 590 <state vertical-scroll-proportion="0.0" vertical-offset="305" max-vertical-offset="6409">
590 591 <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
591 592 <folding>
592   - <element signature="e#1008#1023#0" expanded="true" />
  593 + <element signature="e#1008#1023#0" expanded="false" />
593 594 </folding>
594 595 </state>
595 596 </provider>
... ... @@ -598,7 +599,6 @@
598 599 <provider selected="true" editor-type-id="text-editor">
599 600 <state vertical-scroll-proportion="0.0" vertical-offset="258" max-vertical-offset="3213">
600 601 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
601   - <folding />
602 602 </state>
603 603 </provider>
604 604 </entry>
... ... @@ -606,7 +606,6 @@
606 606 <provider selected="true" editor-type-id="text-editor">
607 607 <state vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1071">
608 608 <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
609   - <folding />
610 609 </state>
611 610 </provider>
612 611 </entry>
... ... @@ -614,10 +613,6 @@
614 613 <provider selected="true" editor-type-id="text-editor">
615 614 <state vertical-scroll-proportion="0.0" vertical-offset="11012" max-vertical-offset="22423">
616 615 <caret line="676" column="27" selection-start-line="676" selection-start-column="27" selection-end-line="676" selection-end-column="27" />
617   - <folding>
618   - <element signature="e#1054#1070#0" expanded="false" />
619   - <marker date="1425490600613" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
620   - </folding>
621 616 </state>
622 617 </provider>
623 618 </entry>
... ... @@ -636,7 +631,9 @@
636 631 <provider selected="true" editor-type-id="text-editor">
637 632 <state vertical-scroll-proportion="0.0" vertical-offset="2856" max-vertical-offset="14620">
638 633 <caret line="202" column="50" selection-start-line="202" selection-start-column="50" selection-end-line="202" selection-end-column="50" />
639   - <folding />
  634 + <folding>
  635 + <element signature="e#1007#1017#0" expanded="true" />
  636 + </folding>
640 637 </state>
641 638 </provider>
642 639 </entry>
... ... @@ -652,10 +649,6 @@
652 649 <provider selected="true" editor-type-id="text-editor">
653 650 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22185">
654 651 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
655   - <folding>
656   - <element signature="e#1007#1016#0" expanded="true" />
657   - <marker date="1425508292698" expanded="true" signature="9428:9461" placeholder="Select first..." />
658   - </folding>
659 652 </state>
660 653 </provider>
661 654 </entry>
... ... @@ -663,7 +656,6 @@
663 656 <provider selected="true" editor-type-id="text-editor">
664 657 <state vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1071">
665 658 <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
666   - <folding />
667 659 </state>
668 660 </provider>
669 661 </entry>
... ... @@ -671,10 +663,6 @@
671 663 <provider selected="true" editor-type-id="text-editor">
672 664 <state vertical-scroll-proportion="0.0" vertical-offset="11012" max-vertical-offset="22423">
673 665 <caret line="676" column="27" selection-start-line="676" selection-start-column="27" selection-end-line="676" selection-end-column="27" />
674   - <folding>
675   - <element signature="e#1054#1070#0" expanded="false" />
676   - <marker date="1425490600613" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
677   - </folding>
678 666 </state>
679 667 </provider>
680 668 </entry>
... ... @@ -693,7 +681,9 @@
693 681 <provider selected="true" editor-type-id="text-editor">
694 682 <state vertical-scroll-proportion="0.0" vertical-offset="2856" max-vertical-offset="14620">
695 683 <caret line="202" column="50" selection-start-line="202" selection-start-column="50" selection-end-line="202" selection-end-column="50" />
696   - <folding />
  684 + <folding>
  685 + <element signature="e#1007#1017#0" expanded="true" />
  686 + </folding>
697 687 </state>
698 688 </provider>
699 689 </entry>
... ... @@ -709,7 +699,6 @@
709 699 <provider selected="true" editor-type-id="text-editor">
710 700 <state vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1071">
711 701 <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
712   - <folding />
713 702 </state>
714 703 </provider>
715 704 </entry>
... ... @@ -717,10 +706,6 @@
717 706 <provider selected="true" editor-type-id="text-editor">
718 707 <state vertical-scroll-proportion="0.0" vertical-offset="11012" max-vertical-offset="22423">
719 708 <caret line="676" column="27" selection-start-line="676" selection-start-column="27" selection-end-line="676" selection-end-column="27" />
720   - <folding>
721   - <element signature="e#1054#1070#0" expanded="false" />
722   - <marker date="1425490600613" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
723   - </folding>
724 709 </state>
725 710 </provider>
726 711 </entry>
... ... @@ -739,7 +724,6 @@
739 724 <provider selected="true" editor-type-id="text-editor">
740 725 <state vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1071">
741 726 <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
742   - <folding />
743 727 </state>
744 728 </provider>
745 729 </entry>
... ... @@ -747,10 +731,6 @@
747 731 <provider selected="true" editor-type-id="text-editor">
748 732 <state vertical-scroll-proportion="0.0" vertical-offset="149" max-vertical-offset="22423">
749 733 <caret line="31" column="9" selection-start-line="34" selection-start-column="0" selection-end-line="37" selection-end-column="37" />
750   - <folding>
751   - <element signature="e#1054#1070#0" expanded="false" />
752   - <marker date="1425490600613" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
753   - </folding>
754 734 </state>
755 735 </provider>
756 736 </entry>
... ... @@ -769,7 +749,6 @@
769 749 <provider selected="true" editor-type-id="text-editor">
770 750 <state vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1054">
771 751 <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
772   - <folding />
773 752 </state>
774 753 </provider>
775 754 </entry>
... ... @@ -777,10 +756,6 @@
777 756 <provider selected="true" editor-type-id="text-editor">
778 757 <state vertical-scroll-proportion="0.0" vertical-offset="251" max-vertical-offset="23817">
779 758 <caret line="37" column="37" selection-start-line="34" selection-start-column="0" selection-end-line="37" selection-end-column="37" />
780   - <folding>
781   - <element signature="e#1054#1070#0" expanded="false" />
782   - <marker date="1425490600613" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
783   - </folding>
784 759 </state>
785 760 </provider>
786 761 </entry>
... ... @@ -805,127 +780,163 @@
805 780 </state>
806 781 </provider>
807 782 </entry>
808   - <entry file="file://$PROJECT_DIR$/data/viewer_volume.py">
  783 + <entry file="file://$PROJECT_DIR$/data/corregistration.py">
  784 + <provider selected="true" editor-type-id="text-editor">
  785 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1054">
  786 + <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
  787 + </state>
  788 + </provider>
  789 + </entry>
  790 + <entry file="file://$PROJECT_DIR$/gui/task_tools.py">
809 791 <provider selected="true" editor-type-id="text-editor">
810   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22746">
  792 + <state vertical-scroll-proportion="-2.9241147" vertical-offset="1734" max-vertical-offset="2397">
811 793 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
812 794 </state>
813 795 </provider>
814 796 </entry>
815   - <entry file="file://$PROJECT_DIR$/data/corregistration.py">
  797 + <entry file="file://$PROJECT_DIR$/data/coordinates.py">
816 798 <provider selected="true" editor-type-id="text-editor">
817   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1054">
818   - <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
819   - <folding />
  799 + <state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="4964">
  800 + <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
  801 + <folding>
  802 + <element signature="e#2#20#0" expanded="true" />
  803 + <element signature="e#7877#9444#0" expanded="false" />
  804 + </folding>
820 805 </state>
821 806 </provider>
822 807 </entry>
823   - <entry file="file://$PROJECT_DIR$/data/viewer_slice.py">
  808 + <entry file="file://$PROJECT_DIR$/gui/dialogs.py">
824 809 <provider selected="true" editor-type-id="text-editor">
825   - <state vertical-scroll-proportion="0.0" vertical-offset="11012" max-vertical-offset="22423">
826   - <caret line="676" column="27" selection-start-line="676" selection-start-column="27" selection-end-line="676" selection-end-column="27" />
  810 + <state vertical-scroll-proportion="0.0" vertical-offset="10846" max-vertical-offset="45050">
  811 + <caret line="663" column="54" selection-start-line="663" selection-start-column="54" selection-end-line="663" selection-end-column="54" />
827 812 <folding>
828   - <element signature="e#1054#1070#0" expanded="false" />
829   - <marker date="1425490600613" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
  813 + <element signature="e#1053#1062#0" expanded="true" />
830 814 </folding>
831 815 </state>
832 816 </provider>
833 817 </entry>
834   - <entry file="file://$PROJECT_DIR$/gui/task_tools.py">
  818 + <entry file="file://$PROJECT_DIR$/data/trackers.py">
835 819 <provider selected="true" editor-type-id="text-editor">
836   - <state vertical-scroll-proportion="-2.9241147" vertical-offset="1734" max-vertical-offset="2397">
837   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  820 + <state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="3383">
  821 + <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
  822 + <folding>
  823 + <element signature="e#0#20#0" expanded="true" />
  824 + </folding>
838 825 </state>
839 826 </provider>
840 827 </entry>
841   - <entry file="file://$PROJECT_DIR$/data/slice_.py">
  828 + <entry file="file://$PROJECT_DIR$/project.py">
842 829 <provider selected="true" editor-type-id="text-editor">
843   - <state vertical-scroll-proportion="0.0" vertical-offset="1326" max-vertical-offset="22457">
844   - <caret line="37" column="7" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
  830 + <state vertical-scroll-proportion="0.028619528" vertical-offset="306" max-vertical-offset="6409">
  831 + <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
845 832 <folding>
846   - <element signature="e#1007#1016#0" expanded="true" />
847   - <marker date="1425508292698" expanded="true" signature="9428:9461" placeholder="Select first..." />
  833 + <element signature="e#1008#1023#0" expanded="false" />
848 834 </folding>
849 835 </state>
850 836 </provider>
851 837 </entry>
852 838 <entry file="file://$PROJECT_DIR$/control.py">
853 839 <provider selected="true" editor-type-id="text-editor">
854   - <state vertical-scroll-proportion="0.0" vertical-offset="10258" max-vertical-offset="11475">
855   - <caret line="639" column="26" selection-start-line="639" selection-start-column="26" selection-end-line="639" selection-end-column="26" />
856   - <folding />
  840 + <state vertical-scroll-proportion="-15.114478" vertical-offset="9352" max-vertical-offset="11900">
  841 + <caret line="22" column="11" selection-start-line="22" selection-start-column="11" selection-end-line="22" selection-end-column="11" />
857 842 </state>
858 843 </provider>
859 844 </entry>
860   - <entry file="file://$PROJECT_DIR$/project.py">
  845 + <entry file="file://$PROJECT_DIR$/gui/task_slice.py">
861 846 <provider selected="true" editor-type-id="text-editor">
862   - <state vertical-scroll-proportion="0.0" vertical-offset="305" max-vertical-offset="6409">
863   - <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
864   - <folding>
865   - <element signature="e#1008#1023#0" expanded="true" />
866   - </folding>
  847 + <state vertical-scroll-proportion="17.05724" vertical-offset="204" max-vertical-offset="14637">
  848 + <caret line="608" column="59" selection-start-line="608" selection-start-column="59" selection-end-line="608" selection-end-column="59" />
867 849 </state>
868 850 </provider>
869 851 </entry>
870 852 <entry file="file://$PROJECT_DIR$/presets.py">
871 853 <provider selected="true" editor-type-id="text-editor">
872   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3213">
  854 + <state vertical-scroll-proportion="-0.43265992" vertical-offset="257" max-vertical-offset="3349">
873 855 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
874   - <folding />
875 856 </state>
876 857 </provider>
877 858 </entry>
878   - <entry file="file://$PROJECT_DIR$/gui/task_slice.py">
  859 + <entry file="file://$PROJECT_DIR$/data/viewer_slice.py">
879 860 <provider selected="true" editor-type-id="text-editor">
880   - <state vertical-scroll-proportion="0.0" vertical-offset="9656" max-vertical-offset="14365">
881   - <caret line="608" column="59" selection-start-line="608" selection-start-column="59" selection-end-line="608" selection-end-column="59" />
  861 + <state vertical-scroll-proportion="0.25757575" vertical-offset="255" max-vertical-offset="22423">
  862 + <caret line="24" column="10" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="10" />
  863 + </state>
  864 + </provider>
  865 + </entry>
  866 + <entry file="file://$PROJECT_DIR$/data/viewer_volume.py">
  867 + <provider selected="true" editor-type-id="text-editor">
  868 + <state vertical-scroll-proportion="0.0" vertical-offset="15243" max-vertical-offset="23001">
  869 + <caret line="24" column="10" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="10" />
882 870 <folding />
883 871 </state>
884 872 </provider>
885 873 </entry>
886   - <entry file="file://$PROJECT_DIR$/gui/task_navigator.py">
  874 + <entry file="file://$PROJECT_DIR$/data/converters.py">
887 875 <provider selected="true" editor-type-id="text-editor">
888   - <state vertical-scroll-proportion="0.0" vertical-offset="7839" max-vertical-offset="14671">
889   - <caret line="495" column="43" selection-start-line="495" selection-start-column="43" selection-end-line="495" selection-end-column="43" />
  876 + <state vertical-scroll-proportion="0.026936026" vertical-offset="460" max-vertical-offset="1054">
  877 + <caret line="30" column="33" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" />
890 878 <folding />
891 879 </state>
892 880 </provider>
893 881 </entry>
894   - <entry file="file://$PROJECT_DIR$/constants.py">
  882 + <entry file="file://$PROJECT_DIR$/data/vtk_utils.py">
895 883 <provider selected="true" editor-type-id="text-editor">
896   - <state vertical-scroll-proportion="0.0" vertical-offset="9462" max-vertical-offset="10064">
897   - <caret line="576" column="10" selection-start-line="576" selection-start-column="10" selection-end-line="576" selection-end-column="10" />
  884 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4012">
  885 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  886 + </state>
  887 + </provider>
  888 + </entry>
  889 + <entry file="file://$PROJECT_DIR$/data/volume.py">
  890 + <provider selected="true" editor-type-id="text-editor">
  891 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="13039">
  892 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  893 + </state>
  894 + </provider>
  895 + </entry>
  896 + <entry file="file://$PROJECT_DIR$/data/slice_data.py">
  897 + <provider selected="true" editor-type-id="text-editor">
  898 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3094">
  899 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  900 + </state>
  901 + </provider>
  902 + </entry>
  903 + <entry file="file://$PROJECT_DIR$/data/slice_.py">
  904 + <provider selected="true" editor-type-id="text-editor">
  905 + <state vertical-scroll-proportion="-14.86027" vertical-offset="9184" max-vertical-offset="22457">
  906 + <caret line="21" column="10" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
  907 + </state>
  908 + </provider>
  909 + </entry>
  910 + <entry file="file://$PROJECT_DIR$/data/measures.py">
  911 + <provider selected="true" editor-type-id="text-editor">
  912 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="12206">
  913 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
898 914 <folding />
899 915 </state>
900 916 </provider>
901 917 </entry>
902   - <entry file="file://$PROJECT_DIR$/data/coordinates.py">
  918 + <entry file="file://$PROJECT_DIR$/constants.py">
903 919 <provider selected="true" editor-type-id="text-editor">
904   - <state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="4964">
905   - <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
906   - <folding>
907   - <element signature="e#2#20#0" expanded="true" />
908   - <element signature="e#7877#9444#0" expanded="false" />
909   - </folding>
  920 + <state vertical-scroll-proportion="0.0" vertical-offset="9521" max-vertical-offset="10115">
  921 + <caret line="592" column="5" selection-start-line="592" selection-start-column="5" selection-end-line="592" selection-end-column="5" />
  922 + <folding />
910 923 </state>
911 924 </provider>
912 925 </entry>
913   - <entry file="file://$PROJECT_DIR$/gui/dialogs.py">
  926 + <entry file="file://$PROJECT_DIR$/gui/task_surface.py">
914 927 <provider selected="true" editor-type-id="text-editor">
915   - <state vertical-scroll-proportion="0.0" vertical-offset="10846" max-vertical-offset="45050">
916   - <caret line="663" column="54" selection-start-line="663" selection-start-column="54" selection-end-line="663" selection-end-column="54" />
917   - <folding>
918   - <element signature="e#1053#1062#0" expanded="true" />
919   - </folding>
  928 + <state vertical-scroll-proportion="0.7607573" vertical-offset="2805" max-vertical-offset="9877">
  929 + <caret line="204" column="0" selection-start-line="204" selection-start-column="0" selection-end-line="204" selection-end-column="0" />
  930 + <folding />
920 931 </state>
921 932 </provider>
922 933 </entry>
923   - <entry file="file://$PROJECT_DIR$/data/trackers.py">
  934 + <entry file="file://$PROJECT_DIR$/gui/task_navigator.py">
924 935 <provider selected="true" editor-type-id="text-editor">
925   - <state vertical-scroll-proportion="0.18106312" vertical-offset="894" max-vertical-offset="3128">
926   - <caret line="59" column="24" selection-start-line="59" selection-start-column="24" selection-end-line="59" selection-end-column="24" />
  936 + <state vertical-scroll-proportion="0.6247848" vertical-offset="1524" max-vertical-offset="14892">
  937 + <caret line="111" column="21" selection-start-line="111" selection-start-column="21" selection-end-line="111" selection-end-column="21" />
927 938 <folding>
928   - <element signature="e#0#20#0" expanded="true" />
  939 + <element signature="e#1007#1017#0" expanded="true" />
929 940 </folding>
930 941 </state>
931 942 </provider>
... ...
invesalius/constants.py
  Diff comments   View file @2daa07c
... ... @@ -578,14 +578,17 @@ ZEBRIS = 4
578 578 DEFAULT_TRACKER = PATRIOT
579 579 #TRACKER = [_("Polhemus PATRIOT"), _("Polhemus PATRIOT"),
580 580 # _("Polhemus ISOTRAK II"), _("Claron MicronTracker"), _("Zebris CMS20")]
581   -TRACKER = [_("Claron MicronTracker S40"), _("Polhemus FASTRAK"),
  581 +TRACKER = [_("Claron MicronTracker"), _("Polhemus FASTRAK"),
582 582 _("Polhemus ISOTRAK II"), _("Polhemus PATRIOT"), _("Zebris CMS20")]
583 583  
584 584  
585   -SINGLE_REF = 0
586   -DOUBLE_REF = 1
587   -DEFAULT_REF_MODE = SINGLE_REF
588   -REF_MODE = [_("Single Ref Mode"), _("Double Ref Mode")]
  585 +STATIC_REF = 0
  586 +DYNAMIC_REF = 1
  587 +DEFAULT_REF_MODE = DYNAMIC_REF
  588 +REF_MODE = [_("Static Reference"), _("Dynamic Reference")]
589 589  
590   -OBJECTS = [_("Eigth Coil"),_("Simple Coil")]
  590 +BUTTERFLY_COIL = 0
  591 +CIRCULAR_COIL = 1
  592 +DEFAULT_COIL = BUTTERFLY_COIL
  593 +COILS = [_("Butterfly Coil"),_("Circular Coil")]
591 594 # ------
... ...
invesalius/data/trackers.py
  Diff comments   View file @2daa07c
... ... @@ -8,19 +8,14 @@ import gui.dialogs as dlg
8 8  
9 9 class Tracker:
10 10 def __init__(self, trck_id):
11   - """Initialize spatial trackers for neuronavigation
  11 + """
  12 + Initialize spatial trackers for neuronavigation
12 13  
13 14 :param trck_id: identifier of spatial tracker
14   - :return: initialization variable
  15 + :return: spatial tracker initialization variable
15 16 """
16 17  
17   - trck = {0 : self.ClaronTracker,
18   - 1 : self.PlhFastrak,
19   - 2 : self.PlhIsotrakII,
20   - 3 : self.PlhPatriot,
21   - 4 : self.ZebrisCMS20}
22   -
23   - self.ReturnTracker(trck, trck_id)
  18 + self.ReturnTracker(trck_id)
24 19  
25 20 def ClaronTracker(self):
26 21 trck_init = None
... ... @@ -29,8 +24,8 @@ class Tracker:
29 24 import ClaronTracker
30 25  
31 26 trck_init = ClaronTracker.ClaronTracker()
32   - trck_init.CalibrationDir = "C:\CalibrationFiles"
33   - trck_init.MarkerDir = "C:\Markers"
  27 + trck_init.CalibrationDir = "../objects/mtc_files/CalibrationFiles"
  28 + trck_init.MarkerDir = "../objects/mtc_files/Markers"
34 29 trck_init.NumberFramesProcessed = 10
35 30 trck_init.FramesExtrapolated = 0
36 31 trck_init.Initialize()
... ... @@ -93,11 +88,24 @@ class Tracker:
93 88 return trck_init
94 89  
95 90 def ZebrisCMS20(self):
  91 + trck_init = None
96 92  
97 93 dlg.TrackerNotConnected(4)
98 94 print 'Zebris device not found.'
99 95  
100   - return None
  96 + return trck_init
  97 +
  98 + def DefaultTracker(self):
  99 + trck_init = None
  100 +
  101 + try:
  102 + # import spatial tracker library
  103 + print 'Trying to connect with spatial tracker.'
  104 +
  105 + except ImportError:
  106 + dlg.TrackerNotConnected(5)
  107 +
  108 + return trck_init # spatial tracker initialization variable
101 109  
102 110 def polhemus_serial(self, plh_id):
103 111 trck_init = None
... ... @@ -121,59 +129,66 @@ class Tracker:
121 129  
122 130 return trck_init
123 131  
124   - def ReturnTracker(self, trck, trck_id):
  132 + def ReturnTracker(self, trck_id):
125 133  
126 134 print "Returning"
127 135 print "This is the tracker selected!", trck_id
128 136  
  137 + trck = {0 : self.ClaronTracker,
  138 + 1 : self.PlhFastrak,
  139 + 2 : self.PlhIsotrakII,
  140 + 3 : self.PlhPatriot,
  141 + 4 : self.ZebrisCMS20}
  142 +
129 143 return trck[trck_id]()
130 144  
131   -class Tracker_Init:
132   - def PolhemusISO_init(self):
133   - try:
134   - plh = serial.Serial(0, baudrate = 115200, timeout=0.2)
135   - return plh
136   -
137   - except:
138   - dlg.TrackerNotConnected(1)
139   - raise ValueError('Device not found')
140   -
141   - def Polhemus_init(self):
142   - dev = usb.core.find(idVendor=0x0F44, idProduct=0xEF12)
143   - if dev is None:
144   - dlg.TrackerNotConnected(1)
145   - raise ValueError('Device not found')
146   - try:
147   - cfg = dev.get_active_configuration()
148   - for i in cfg:
149   - for x in i:
150   - x = x
151   - dev.set_configuration()
152   - except usb.core.USBError as e:
153   - sys.exit("Could not set configuration: %s" % str(e))
154   - return dev
155   -
156   - def Claron_init(self):
157   - try:
158   - mtc = ClaronTracker.ClaronTracker()
159   - mtc.CalibrationDir = "C:\CalibrationFiles"
160   - mtc.MarkerDir = "C:\Markers"
161   - mtc.NumberFramesProcessed = 10
162   - mtc.FramesExtrapolated = 0
163   - mtc.Initialize()
164   - if mtc.GetIdentifyingCamera():
165   - print "Camera Identified."
166   - mtc.Run()
167   - else:
168   - dlg.TrackerNotConnected(2)
169   - print "The Claron MicronTracker is not connected!"
170   - return mtc
171   -
172   - except:
173   - dlg.TrackerNotConnected(2)
174   - raise ValueError('Device not found')
175   -
176   -
177   - def Zebris_init(self):
178   - dlg.TrackerNotConnected(3)
179   - return
180 145 \ No newline at end of file
  146 +
  147 +# class Tracker_Init:
  148 +# def PolhemusISO_init(self):
  149 +# try:
  150 +# plh = serial.Serial(0, baudrate = 115200, timeout=0.2)
  151 +# return plh
  152 +#
  153 +# except:
  154 +# dlg.TrackerNotConnected(1)
  155 +# raise ValueError('Device not found')
  156 +#
  157 +# def Polhemus_init(self):
  158 +# dev = usb.core.find(idVendor=0x0F44, idProduct=0xEF12)
  159 +# if dev is None:
  160 +# dlg.TrackerNotConnected(1)
  161 +# raise ValueError('Device not found')
  162 +# try:
  163 +# cfg = dev.get_active_configuration()
  164 +# for i in cfg:
  165 +# for x in i:
  166 +# x = x
  167 +# dev.set_configuration()
  168 +# except usb.core.USBError as e:
  169 +# sys.exit("Could not set configuration: %s" % str(e))
  170 +# return dev
  171 +#
  172 +# def Claron_init(self):
  173 +# try:
  174 +# mtc = ClaronTracker.ClaronTracker()
  175 +# mtc.CalibrationDir = "C:\CalibrationFiles"
  176 +# mtc.MarkerDir = "C:\Markers"
  177 +# mtc.NumberFramesProcessed = 10
  178 +# mtc.FramesExtrapolated = 0
  179 +# mtc.Initialize()
  180 +# if mtc.GetIdentifyingCamera():
  181 +# print "Camera Identified."
  182 +# mtc.Run()
  183 +# else:
  184 +# dlg.TrackerNotConnected(2)
  185 +# print "The Claron MicronTracker is not connected!"
  186 +# return mtc
  187 +#
  188 +# except:
  189 +# dlg.TrackerNotConnected(2)
  190 +# raise ValueError('Device not found')
  191 +#
  192 +#
  193 +# def Zebris_init(self):
  194 +# dlg.TrackerNotConnected(3)
  195 +# return
181 196 \ No newline at end of file
... ...
invesalius/gui/task_navigator.py
  Diff comments   View file @2daa07c
... ... @@ -18,24 +18,19 @@
18 18 #--------------------------------------------------------------------------
19 19 import sys
20 20  
21   -from numpy import *
22   -import serial
  21 +import numpy as np
23 22 import wx
24 23 import wx.lib.masked.numctrl
25   -import wx.lib.platebtn as pbtn
26 24 from wx.lib.pubsub import pub as Publisher
27 25  
28 26 import constants as const
29 27 import data.bases as db
30 28 import data.corregistration as dcr
31   -import data.trackers as dtrk
  29 +import data.trackers as dt
32 30 import data.coordinates as dco
33 31 import gui.dialogs as dlg
34 32 import gui.widgets.foldpanelbar as fpb
35 33 import gui.widgets.colourselect as csel
36   -import gui.widgets.platebtn as pbtn
37   -import project as prj
38   -import utils as utl
39 34  
40 35  
41 36 class TaskPanel(wx.Panel):
... ... @@ -45,7 +40,7 @@ class TaskPanel(wx.Panel):
45 40 inner_panel = InnerTaskPanel(self)
46 41  
47 42 sizer = wx.BoxSizer(wx.HORIZONTAL)
48   - sizer.Add(inner_panel, 1, wx.EXPAND | wx.GROW | wx.BOTTOM | wx.RIGHT |
  43 + sizer.Add(inner_panel, 1, wx.EXPAND|wx.GROW|wx.BOTTOM|wx.RIGHT |
49 44 wx.LEFT, 7)
50 45 sizer.Fit(self)
51 46  
... ... @@ -53,35 +48,31 @@ class TaskPanel(wx.Panel):
53 48 self.Update()
54 49 self.SetAutoLayout(1)
55 50  
  51 +
56 52 class InnerTaskPanel(wx.Panel):
57 53 def __init__(self, parent):
58 54 wx.Panel.__init__(self, parent)
59   - default_colour = self.GetBackgroundColour()
60   - self.SetBackgroundColour(wx.Colour(255,255,255))
  55 + default_color = self.GetBackgroundColour()
  56 + self.SetBackgroundColour(wx.Colour(255, 255, 255))
61 57 self.SetAutoLayout(1)
62 58  
63   - # Neuronavigator Title
64   - text = wx.StaticText(self, -1, 'Choose the tracker, ref mode, select the reference points, coregistrate and neuronavigate',
65   - size = wx.Size(90, 30))
  59 + text_nav = wx.StaticText(self, -1, 'Configure spatial tracker and '
  60 + 'coregistrate for neuronavigation.',
  61 + size=wx.Size(90, 30))
66 62  
67   - # Create horizontal sizers to represent lines in the panel
  63 + # Create horizontal sizer to represent lines in the panel
68 64 line_new = wx.BoxSizer(wx.HORIZONTAL)
69   - line_new.Add(text, 1, wx.EXPAND|wx.GROW| wx.TOP|wx.CENTER, 0)
70   - #line_new.SetDimension(1, 1, width = 25, height = 25)
71   - #line_new.Add(button_new_surface, 0, wx.ALL|wx.EXPAND|wx.GROW, 0)
  65 + line_new.Add(text_nav, 1, wx.EXPAND|wx.GROW|wx.TOP|wx.RIGHT, 4)
72 66  
73   - # Folde panel which contains surface properties and quality
  67 + # Fold panel which contains navigation configurations
74 68 fold_panel = FoldPanel(self)
75   - fold_panel.SetBackgroundColour(default_colour)
76   -
77   - # Button to fold to select region task
78   - line_inutil = wx.StaticText(self, -1, 'Linha sem sentido')
  69 + fold_panel.SetBackgroundColour(default_color)
79 70  
80   - # Add line sizers into main sizer
  71 + # Add line sizer into main sizer
81 72 main_sizer = wx.BoxSizer(wx.VERTICAL)
82   - main_sizer.Add(line_new, 0,wx.GROW|wx.EXPAND|wx.ALIGN_CENTER|wx.TOP, 5)
  73 + main_sizer.Add(line_new, 0,
  74 + wx.GROW|wx.EXPAND|wx.LEFT|wx.RIGHT|wx.TOP, 5)
83 75 main_sizer.Add(fold_panel, 1, wx.GROW|wx.EXPAND|wx.ALL, 5)
84   - main_sizer.Add(line_inutil, 0, wx.ALIGN_RIGHT|wx.RIGHT|wx.BOTTOM, 5)
85 76 main_sizer.Fit(self)
86 77  
87 78 self.SetSizer(main_sizer)
... ... @@ -106,6 +97,7 @@ class FoldPanel(wx.Panel):
106 97 self.Update()
107 98 self.SetAutoLayout(1)
108 99  
  100 +
109 101 class InnerFoldPanel(wx.Panel):
110 102 def __init__(self, parent):
111 103 wx.Panel.__init__(self, parent)
... ... @@ -119,7 +111,7 @@ class InnerFoldPanel(wx.Panel):
119 111 # parent panel. Perhaps we need to insert the item into the sizer also...
120 112 # Study this.
121 113 fold_panel = fpb.FoldPanelBar(self, -1, wx.DefaultPosition,
122   - (10, 300), 0,fpb.FPB_SINGLE_FOLD)
  114 + (10, 320), 0,fpb.FPB_SINGLE_FOLD)
123 115  
124 116 # Fold panel style
125 117 style = fpb.CaptionBarStyle()
... ... @@ -493,7 +485,7 @@ class NeuronavigationTools(wx.Panel):
493 485 trck_id = evt.GetSelection()
494 486  
495 487 # self.trk_init = dco.Tracker().ReturnTracker(trck_id)
496   - self.trk_init = dco.Tracker(trck_id)
  488 + self.trk_init = dt.Tracker(trck_id)
497 489  
498 490 # if self.tracker_id == 0:
499 491 # self.trk_init = dtrk.Tracker_Init().PolhemusISO_init()
... ... @@ -549,7 +541,7 @@ class ObjectWNeuronavigation(wx.Panel):
549 541 self.SetBackgroundColour(default_colour)
550 542  
551 543 self.SetAutoLayout(1)
552   - self.object_id = const.OBJECTS
  544 + self.object_id = const.COILS
553 545 # self.aux_img__INO_ref=0
554 546 self.showObj = None
555 547  
... ... @@ -558,10 +550,12 @@ class ObjectWNeuronavigation(wx.Panel):
558 550 #Line 1
559 551 text_choice = wx.StaticText(self, -1, _("Select the Object:"))
560 552 #Line 2
561   - self.choice_object = wx.ComboBox(self, -1, "Select the Object:", size=(97, 23),
562   - choices = const.OBJECTS, style = wx.CB_DROPDOWN|wx.CB_READONLY|wx.CB_SORT)
563   -# choice_object.SetSelection(0)
564   - self.choice_object.Bind(wx.EVT_COMBOBOX,self.OnChoiseObject)
  553 + choice_object = wx.ComboBox(self, -1, "Select the Object:",
  554 + size=(97, 23),
  555 + choices = const.COILS,
  556 + style = wx.CB_DROPDOWN|wx.CB_READONLY|wx.CB_SORT)
  557 + choice_object.SetSelection(const.DEFAULT_COIL)
  558 + choice_object.Bind(wx.EVT_COMBOBOX, self.OnChoiceObject)
565 559  
566 560 #Line 3
567 561 correg_object= wx.Button(self, -1, label='Corregistrate object', size = wx.Size(125,23))
... ... @@ -582,7 +576,7 @@ class ObjectWNeuronavigation(wx.Panel):
582 576 # name='numCtrl3I', parent=self, integerWidth = 4, fractionWidth = 1)
583 577  
584 578 line2 = wx.FlexGridSizer(rows=1, cols=2, hgap=5, vgap=5)
585   - line2.AddMany([(self.choice_object, 1,wx.EXPAND|wx.LEFT|wx.TOP),
  579 + line2.AddMany([(choice_object, 1,wx.EXPAND|wx.LEFT|wx.TOP),
586 580 (correg_object, 1, wx.GROW|wx.EXPAND|wx.RIGHT|wx.TOP)])
587 581  
588 582 # line3 = wx.FlexGridSizer(rows=1, cols=4, hgap=5, vgap=5)
... ... @@ -626,7 +620,7 @@ class ObjectWNeuronavigation(wx.Panel):
626 620 self.coord3a=pubsub_evt.data[8]
627 621 self.img_inio=pubsub_evt.data[9]
628 622  
629   - def OnChoiseObject(self, evt):
  623 + def OnChoiceObject(self, evt):
630 624 self.object_id = evt.GetSelection()
631 625 self.object_name = self.choice_object.GetValue()
632 626 ## if self.object_name == " Add new object...":
... ...