Download as
Browse Code »

Commit 8ce535ac4f4125093f1c850dc97508efb5b56218

Authored by vhosouza
1 parent 774d3b01
Exists in usp-navegador

ENH: Restructuring InVesalius Navigator spatial tracker communication.

Showing 4 changed files with 492 additions and 74 deletions   Show diff stats
invesalius/.idea/workspace.xml
  Diff comments   View file @8ce535a
... ... @@ -2,25 +2,10 @@
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="NEW" beforePath="" afterPath="$PROJECT_DIR$/data/corregistration.py" />
6   - <change type="DELETED" beforePath="D:\repository\invesalius3\invesalius\data\co_registration.py" afterPath="" />
7   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/bases.py" afterPath="$PROJECT_DIR$/data/bases.py" />
8 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/constants.py" afterPath="$PROJECT_DIR$/constants.py" />
9   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/control.py" afterPath="$PROJECT_DIR$/control.py" />
10   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/default_viewers.py" afterPath="$PROJECT_DIR$/gui/default_viewers.py" />
11   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/dialogs.py" afterPath="$PROJECT_DIR$/gui/dialogs.py" />
12   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/net/dicom.py" afterPath="$PROJECT_DIR$/net/dicom.py" />
13   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/reader/dicom_reader.py" afterPath="$PROJECT_DIR$/reader/dicom_reader.py" />
14   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/frame.py" afterPath="$PROJECT_DIR$/gui/frame.py" />
15   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/imagedata_utils.py" afterPath="$PROJECT_DIR$/data/imagedata_utils.py" />
16   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/measures.py" afterPath="$PROJECT_DIR$/data/measures.py" />
17   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/task_importer.py" afterPath="$PROJECT_DIR$/gui/task_importer.py" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/coordinates.py" afterPath="$PROJECT_DIR$/data/coordinates.py" />
18 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/task_navigator.py" afterPath="$PROJECT_DIR$/gui/task_navigator.py" />
19   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/task_slice.py" afterPath="$PROJECT_DIR$/gui/task_slice.py" />
20   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/task_surface.py" afterPath="$PROJECT_DIR$/gui/task_surface.py" />
21   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/viewer_slice.py" afterPath="$PROJECT_DIR$/data/viewer_slice.py" />
22   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/viewer_volume.py" afterPath="$PROJECT_DIR$/data/viewer_volume.py" />
23   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/vtk_utils.py" afterPath="$PROJECT_DIR$/data/vtk_utils.py" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
24 9 </list>
25 10 <ignored path="invesalius.iws" />
26 11 <ignored path=".idea/workspace.xml" />
... ... @@ -48,8 +33,8 @@
48 33 <file leaf-file-name="coordinates.py" pinned="false" current-in-tab="true">
49 34 <entry file="file://$PROJECT_DIR$/data/coordinates.py">
50 35 <provider selected="true" editor-type-id="text-editor">
51   - <state vertical-scroll-proportion="0.635514" vertical-offset="2703" max-vertical-offset="4743">
52   - <caret line="179" column="0" selection-start-line="179" selection-start-column="0" selection-end-line="179" selection-end-column="0" />
  36 + <state vertical-scroll-proportion="0.0" vertical-offset="612" max-vertical-offset="5423">
  37 + <caret line="36" column="28" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" />
53 38 <folding>
54 39 <element signature="e#0#10#0" expanded="true" />
55 40 </folding>
... ... @@ -57,10 +42,85 @@
57 42 </provider>
58 43 </entry>
59 44 </file>
  45 + <file leaf-file-name="task_navigator.py" pinned="false" current-in-tab="false">
  46 + <entry file="file://$PROJECT_DIR$/gui/task_navigator.py">
  47 + <provider selected="true" editor-type-id="text-editor">
  48 + <state vertical-scroll-proportion="0.0" vertical-offset="7890" max-vertical-offset="14637">
  49 + <caret line="494" column="28" selection-start-line="494" selection-start-column="28" selection-end-line="494" selection-end-column="28" />
  50 + <folding />
  51 + </state>
  52 + </provider>
  53 + </entry>
  54 + </file>
  55 + <file leaf-file-name="constants.py" pinned="false" current-in-tab="false">
  56 + <entry file="file://$PROJECT_DIR$/constants.py">
  57 + <provider selected="true" editor-type-id="text-editor">
  58 + <state vertical-scroll-proportion="0.0" vertical-offset="9462" max-vertical-offset="10064">
  59 + <caret line="576" column="10" selection-start-line="576" selection-start-column="10" selection-end-line="576" selection-end-column="10" />
  60 + <folding />
  61 + </state>
  62 + </provider>
  63 + </entry>
  64 + </file>
  65 + <file leaf-file-name="slice_.py" pinned="false" current-in-tab="false">
  66 + <entry file="file://$PROJECT_DIR$/data/slice_.py">
  67 + <provider selected="true" editor-type-id="text-editor">
  68 + <state vertical-scroll-proportion="0.0" vertical-offset="1326" max-vertical-offset="22457">
  69 + <caret line="37" column="7" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
  70 + <folding>
  71 + <element signature="e#1007#1016#0" expanded="true" />
  72 + <marker date="1425508292698" expanded="true" signature="9428:9461" placeholder="Select first..." />
  73 + </folding>
  74 + </state>
  75 + </provider>
  76 + </entry>
  77 + </file>
  78 + <file leaf-file-name="task_slice.py" pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/gui/task_slice.py">
  80 + <provider selected="true" editor-type-id="text-editor">
  81 + <state vertical-scroll-proportion="0.0" vertical-offset="9656" max-vertical-offset="14365">
  82 + <caret line="608" column="59" selection-start-line="608" selection-start-column="59" selection-end-line="608" selection-end-column="59" />
  83 + <folding />
  84 + </state>
  85 + </provider>
  86 + </entry>
  87 + </file>
  88 + <file leaf-file-name="control.py" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/control.py">
  90 + <provider selected="true" editor-type-id="text-editor">
  91 + <state vertical-scroll-proportion="0.0" vertical-offset="10258" max-vertical-offset="11475">
  92 + <caret line="639" column="26" selection-start-line="639" selection-start-column="26" selection-end-line="639" selection-end-column="26" />
  93 + <folding />
  94 + </state>
  95 + </provider>
  96 + </entry>
  97 + </file>
  98 + <file leaf-file-name="project.py" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/project.py">
  100 + <provider selected="true" editor-type-id="text-editor">
  101 + <state vertical-scroll-proportion="0.0" vertical-offset="305" max-vertical-offset="6409">
  102 + <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
  103 + <folding>
  104 + <element signature="e#1008#1023#0" expanded="true" />
  105 + </folding>
  106 + </state>
  107 + </provider>
  108 + </entry>
  109 + </file>
  110 + <file leaf-file-name="presets.py" pinned="false" current-in-tab="false">
  111 + <entry file="file://$PROJECT_DIR$/presets.py">
  112 + <provider selected="true" editor-type-id="text-editor">
  113 + <state vertical-scroll-proportion="0.0" vertical-offset="258" max-vertical-offset="3213">
  114 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  115 + <folding />
  116 + </state>
  117 + </provider>
  118 + </entry>
  119 + </file>
60 120 <file leaf-file-name="corregistration.py" pinned="false" current-in-tab="false">
61 121 <entry file="file://$PROJECT_DIR$/data/corregistration.py">
62 122 <provider selected="true" editor-type-id="text-editor">
63   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1054">
  123 + <state vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1071">
64 124 <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
65 125 <folding />
66 126 </state>
... ... @@ -70,10 +130,11 @@
70 130 <file leaf-file-name="viewer_slice.py" pinned="false" current-in-tab="false">
71 131 <entry file="file://$PROJECT_DIR$/data/viewer_slice.py">
72 132 <provider selected="true" editor-type-id="text-editor">
73   - <state vertical-scroll-proportion="0.0" vertical-offset="251" max-vertical-offset="23817">
74   - <caret line="37" column="37" selection-start-line="34" selection-start-column="0" selection-end-line="37" selection-end-column="37" />
  133 + <state vertical-scroll-proportion="0.0" vertical-offset="11012" max-vertical-offset="22423">
  134 + <caret line="676" column="27" selection-start-line="676" selection-start-column="27" selection-end-line="676" selection-end-column="27" />
75 135 <folding>
76 136 <element signature="e#1054#1070#0" expanded="true" />
  137 + <marker date="1425490600613" expanded="true" signature="46428:46559" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
77 138 </folding>
78 139 </state>
79 140 </provider>
... ... @@ -89,6 +150,8 @@
89 150 <list>
90 151 <option value="$PROJECT_DIR$/data/bases.py" />
91 152 <option value="$PROJECT_DIR$/data/co_registration.py" />
  153 + <option value="$PROJECT_DIR$/gui/task_navigator.py" />
  154 + <option value="$PROJECT_DIR$/constants.py" />
92 155 <option value="$PROJECT_DIR$/data/coordinates.py" />
93 156 </list>
94 157 </option>
... ... @@ -144,30 +207,17 @@
144 207 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
145 208 </PATH_ELEMENT>
146 209 </PATH>
147   - <PATH>
148   - <PATH_ELEMENT>
149   - <option name="myItemId" value="invesalius" />
150   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
151   - </PATH_ELEMENT>
152   - <PATH_ELEMENT>
153   - <option name="myItemId" value="invesalius" />
154   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
155   - </PATH_ELEMENT>
156   - <PATH_ELEMENT>
157   - <option name="myItemId" value="data" />
158   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
159   - </PATH_ELEMENT>
160   - </PATH>
161 210 </subPane>
162 211 </pane>
163 212 </panes>
164 213 </component>
165 214 <component name="PropertiesComponent">
166 215 <property name="WebServerToolWindowFactoryState" value="false" />
167   - <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
  216 + <property name="options.lastSelected" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
168 217 <property name="options.splitter.main.proportions" value="0.3" />
169 218 <property name="options.splitter.details.proportions" value="0.2" />
170 219 <property name="FullScreen" value="false" />
  220 + <property name="last_opened_file_path" value="$USER_HOME$/AppData/Local/GitHub/PortableGit_c2ba306e536fdf878271f7fe636a147ff37326ad/cmd/git.exe" />
171 221 </component>
172 222 <component name="PyConsoleOptionsProvider">
173 223 <option name="myPythonConsoleState">
... ... @@ -355,6 +405,12 @@
355 405 <method />
356 406 </configuration>
357 407 <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
  408 + <node-options />
  409 + <gulpfile />
  410 + <tasks />
  411 + <arguments />
  412 + <pass-parent-envs>true</pass-parent-envs>
  413 + <envs />
358 414 <method />
359 415 </configuration>
360 416 <list size="0" />
... ... @@ -393,27 +449,27 @@
393 449 </todo-panel>
394 450 </component>
395 451 <component name="ToolWindowManager">
396   - <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
  452 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
397 453 <editor active="false" />
398 454 <layout>
399   - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3372973" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
400   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18017058" sideWeight="0.49945945" order="0" side_tool="false" content_ui="combo" />
401   - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
402   - <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="-1" side_tool="true" content_ui="tabs" />
403   - <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="-1" side_tool="false" content_ui="tabs" />
404   - <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="-1" side_tool="false" content_ui="tabs" />
405   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
406   - <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32864866" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
407   - <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="-1" side_tool="false" content_ui="tabs" />
  455 + <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" />
  456 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1359275" sideWeight="0.49945945" order="0" side_tool="false" content_ui="combo" />
  457 + <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" />
  458 + <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" />
  459 + <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" />
  460 + <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" />
  461 + <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2882288" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  462 + <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" />
408 463 <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" />
409   - <window_info id="Terminal" 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" />
410   - <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="-1" side_tool="true" content_ui="tabs" />
  464 + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32864866" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  465 + <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" />
411 466 <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" />
412   - <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" />
413 467 <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" />
414 468 <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" />
415 469 <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" />
416 470 <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" />
  471 + <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" />
  472 + <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" />
417 473 <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" />
418 474 <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" />
419 475 </layout>
... ... @@ -436,16 +492,271 @@
436 492 </component>
437 493 <component name="XDebuggerManager">
438 494 <breakpoint-manager>
439   - <option name="time" value="1" />
  495 + <breakpoints>
  496 + <line-breakpoint enabled="true" type="python-line">
  497 + <url>file://$PROJECT_DIR$/project.py</url>
  498 + <line>19</line>
  499 + <option name="timeStamp" value="1" />
  500 + </line-breakpoint>
  501 + </breakpoints>
  502 + <option name="time" value="2" />
440 503 </breakpoint-manager>
441 504 <watches-manager />
442 505 </component>
443 506 <component name="editorHistoryManager">
  507 + <entry file="file://$PROJECT_DIR$/data/coordinates.py">
  508 + <provider selected="true" editor-type-id="text-editor">
  509 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="5423">
  510 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  511 + <folding>
  512 + <element signature="e#0#10#0" expanded="true" />
  513 + </folding>
  514 + </state>
  515 + </provider>
  516 + </entry>
  517 + <entry file="file://$PROJECT_DIR$/gui/task_navigator.py">
  518 + <provider selected="true" editor-type-id="text-editor">
  519 + <state vertical-scroll-proportion="0.0" vertical-offset="7890" max-vertical-offset="14637">
  520 + <caret line="494" column="28" selection-start-line="494" selection-start-column="28" selection-end-line="494" selection-end-column="28" />
  521 + <folding />
  522 + </state>
  523 + </provider>
  524 + </entry>
  525 + <entry file="file://$PROJECT_DIR$/constants.py">
  526 + <provider selected="true" editor-type-id="text-editor">
  527 + <state vertical-scroll-proportion="0.0" vertical-offset="9462" max-vertical-offset="10064">
  528 + <caret line="576" column="10" selection-start-line="576" selection-start-column="10" selection-end-line="576" selection-end-column="10" />
  529 + <folding />
  530 + </state>
  531 + </provider>
  532 + </entry>
  533 + <entry file="file://$PROJECT_DIR$/data/slice_.py">
  534 + <provider selected="true" editor-type-id="text-editor">
  535 + <state vertical-scroll-proportion="0.0" vertical-offset="1326" max-vertical-offset="22457">
  536 + <caret line="37" column="7" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
  537 + <folding>
  538 + <element signature="e#1007#1016#0" expanded="true" />
  539 + <marker date="1425508292698" expanded="true" signature="9428:9461" placeholder="Select first..." />
  540 + </folding>
  541 + </state>
  542 + </provider>
  543 + </entry>
  544 + <entry file="file://$PROJECT_DIR$/gui/task_slice.py">
  545 + <provider selected="true" editor-type-id="text-editor">
  546 + <state vertical-scroll-proportion="0.0" vertical-offset="9656" max-vertical-offset="14365">
  547 + <caret line="608" column="59" selection-start-line="608" selection-start-column="59" selection-end-line="608" selection-end-column="59" />
  548 + <folding />
  549 + </state>
  550 + </provider>
  551 + </entry>
  552 + <entry file="file://$PROJECT_DIR$/control.py">
  553 + <provider selected="true" editor-type-id="text-editor">
  554 + <state vertical-scroll-proportion="0.0" vertical-offset="10258" max-vertical-offset="11475">
  555 + <caret line="639" column="26" selection-start-line="639" selection-start-column="26" selection-end-line="639" selection-end-column="26" />
  556 + <folding />
  557 + </state>
  558 + </provider>
  559 + </entry>
  560 + <entry file="file://$PROJECT_DIR$/project.py">
  561 + <provider selected="true" editor-type-id="text-editor">
  562 + <state vertical-scroll-proportion="0.0" vertical-offset="305" max-vertical-offset="6409">
  563 + <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
  564 + <folding>
  565 + <element signature="e#1008#1023#0" expanded="true" />
  566 + </folding>
  567 + </state>
  568 + </provider>
  569 + </entry>
  570 + <entry file="file://$PROJECT_DIR$/presets.py">
  571 + <provider selected="true" editor-type-id="text-editor">
  572 + <state vertical-scroll-proportion="0.0" vertical-offset="258" max-vertical-offset="3213">
  573 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  574 + <folding />
  575 + </state>
  576 + </provider>
  577 + </entry>
  578 + <entry file="file://$PROJECT_DIR$/data/corregistration.py">
  579 + <provider selected="true" editor-type-id="text-editor">
  580 + <state vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1071">
  581 + <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
  582 + <folding />
  583 + </state>
  584 + </provider>
  585 + </entry>
  586 + <entry file="file://$PROJECT_DIR$/data/viewer_slice.py">
  587 + <provider selected="true" editor-type-id="text-editor">
  588 + <state vertical-scroll-proportion="0.0" vertical-offset="11012" max-vertical-offset="22423">
  589 + <caret line="676" column="27" selection-start-line="676" selection-start-column="27" selection-end-line="676" selection-end-column="27" />
  590 + <folding>
  591 + <element signature="e#1054#1070#0" expanded="true" />
  592 + <marker date="1425490600613" expanded="true" signature="46428:46559" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
  593 + </folding>
  594 + </state>
  595 + </provider>
  596 + </entry>
  597 + <entry file="file://$PROJECT_DIR$/data/coordinates.py">
  598 + <provider selected="true" editor-type-id="text-editor">
  599 + <state vertical-scroll-proportion="0.0" vertical-offset="289" max-vertical-offset="4743">
  600 + <caret line="17" column="12" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
  601 + <folding>
  602 + <element signature="e#0#10#0" expanded="true" />
  603 + </folding>
  604 + </state>
  605 + </provider>
  606 + </entry>
  607 + <entry file="file://$PROJECT_DIR$/gui/task_navigator.py">
  608 + <provider selected="true" editor-type-id="text-editor">
  609 + <state vertical-scroll-proportion="0.0" vertical-offset="2856" max-vertical-offset="14620">
  610 + <caret line="202" column="50" selection-start-line="202" selection-start-column="50" selection-end-line="202" selection-end-column="50" />
  611 + <folding />
  612 + </state>
  613 + </provider>
  614 + </entry>
  615 + <entry file="file://$PROJECT_DIR$/constants.py">
  616 + <provider selected="true" editor-type-id="text-editor">
  617 + <state vertical-scroll-proportion="0.0" vertical-offset="7360" max-vertical-offset="10030">
  618 + <caret line="575" column="10" selection-start-line="575" selection-start-column="10" selection-end-line="575" selection-end-column="10" />
  619 + <folding />
  620 + </state>
  621 + </provider>
  622 + </entry>
  623 + <entry file="file://$PROJECT_DIR$/data/slice_.py">
  624 + <provider selected="true" editor-type-id="text-editor">
  625 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22185">
  626 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  627 + <folding>
  628 + <element signature="e#1007#1016#0" expanded="true" />
  629 + <marker date="1425508292698" expanded="true" signature="9428:9461" placeholder="Select first..." />
  630 + </folding>
  631 + </state>
  632 + </provider>
  633 + </entry>
  634 + <entry file="file://$PROJECT_DIR$/data/corregistration.py">
  635 + <provider selected="true" editor-type-id="text-editor">
  636 + <state vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1071">
  637 + <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
  638 + <folding />
  639 + </state>
  640 + </provider>
  641 + </entry>
  642 + <entry file="file://$PROJECT_DIR$/data/viewer_slice.py">
  643 + <provider selected="true" editor-type-id="text-editor">
  644 + <state vertical-scroll-proportion="0.0" vertical-offset="11012" max-vertical-offset="22423">
  645 + <caret line="676" column="27" selection-start-line="676" selection-start-column="27" selection-end-line="676" selection-end-column="27" />
  646 + <folding>
  647 + <element signature="e#1054#1070#0" expanded="true" />
  648 + <marker date="1425490600613" expanded="true" signature="46428:46559" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
  649 + </folding>
  650 + </state>
  651 + </provider>
  652 + </entry>
  653 + <entry file="file://$PROJECT_DIR$/data/coordinates.py">
  654 + <provider selected="true" editor-type-id="text-editor">
  655 + <state vertical-scroll-proportion="0.0" vertical-offset="289" max-vertical-offset="4743">
  656 + <caret line="17" column="12" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
  657 + <folding>
  658 + <element signature="e#0#10#0" expanded="true" />
  659 + </folding>
  660 + </state>
  661 + </provider>
  662 + </entry>
  663 + <entry file="file://$PROJECT_DIR$/gui/task_navigator.py">
  664 + <provider selected="true" editor-type-id="text-editor">
  665 + <state vertical-scroll-proportion="0.0" vertical-offset="2856" max-vertical-offset="14620">
  666 + <caret line="202" column="50" selection-start-line="202" selection-start-column="50" selection-end-line="202" selection-end-column="50" />
  667 + <folding />
  668 + </state>
  669 + </provider>
  670 + </entry>
  671 + <entry file="file://$PROJECT_DIR$/constants.py">
  672 + <provider selected="true" editor-type-id="text-editor">
  673 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="10030">
  674 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  675 + <folding />
  676 + </state>
  677 + </provider>
  678 + </entry>
  679 + <entry file="file://$PROJECT_DIR$/data/corregistration.py">
  680 + <provider selected="true" editor-type-id="text-editor">
  681 + <state vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1071">
  682 + <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
  683 + <folding />
  684 + </state>
  685 + </provider>
  686 + </entry>
  687 + <entry file="file://$PROJECT_DIR$/data/viewer_slice.py">
  688 + <provider selected="true" editor-type-id="text-editor">
  689 + <state vertical-scroll-proportion="0.0" vertical-offset="11012" max-vertical-offset="22423">
  690 + <caret line="676" column="27" selection-start-line="676" selection-start-column="27" selection-end-line="676" selection-end-column="27" />
  691 + <folding>
  692 + <element signature="e#1054#1070#0" expanded="true" />
  693 + <marker date="1425490600613" expanded="true" signature="46428:46559" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
  694 + </folding>
  695 + </state>
  696 + </provider>
  697 + </entry>
  698 + <entry file="file://$PROJECT_DIR$/data/coordinates.py">
  699 + <provider selected="true" editor-type-id="text-editor">
  700 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4743">
  701 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  702 + <folding>
  703 + <element signature="e#0#10#0" expanded="true" />
  704 + </folding>
  705 + </state>
  706 + </provider>
  707 + </entry>
  708 + <entry file="file://$PROJECT_DIR$/data/corregistration.py">
  709 + <provider selected="true" editor-type-id="text-editor">
  710 + <state vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1071">
  711 + <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
  712 + <folding />
  713 + </state>
  714 + </provider>
  715 + </entry>
  716 + <entry file="file://$PROJECT_DIR$/data/viewer_slice.py">
  717 + <provider selected="true" editor-type-id="text-editor">
  718 + <state vertical-scroll-proportion="0.0" vertical-offset="149" max-vertical-offset="22423">
  719 + <caret line="31" column="9" selection-start-line="34" selection-start-column="0" selection-end-line="37" selection-end-column="37" />
  720 + <folding>
  721 + <element signature="e#1054#1070#0" expanded="true" />
  722 + <marker date="1425490600613" expanded="true" signature="46428:46559" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
  723 + </folding>
  724 + </state>
  725 + </provider>
  726 + </entry>
  727 + <entry file="file://$PROJECT_DIR$/data/coordinates.py">
  728 + <provider selected="true" editor-type-id="text-editor">
  729 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4743">
  730 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  731 + <folding>
  732 + <element signature="e#0#10#0" expanded="true" />
  733 + </folding>
  734 + </state>
  735 + </provider>
  736 + </entry>
  737 + <entry file="file://$PROJECT_DIR$/data/corregistration.py">
  738 + <provider selected="true" editor-type-id="text-editor">
  739 + <state vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1054">
  740 + <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
  741 + <folding />
  742 + </state>
  743 + </provider>
  744 + </entry>
  745 + <entry file="file://$PROJECT_DIR$/data/viewer_slice.py">
  746 + <provider selected="true" editor-type-id="text-editor">
  747 + <state vertical-scroll-proportion="0.0" vertical-offset="251" max-vertical-offset="23817">
  748 + <caret line="37" column="37" selection-start-line="34" selection-start-column="0" selection-end-line="37" selection-end-column="37" />
  749 + <folding>
  750 + <element signature="e#1054#1070#0" expanded="true" />
  751 + <marker date="1425490600613" expanded="true" signature="46428:46559" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
  752 + </folding>
  753 + </state>
  754 + </provider>
  755 + </entry>
444 756 <entry file="file://C:/Python26/Lib/threading.py">
445 757 <provider selected="true" editor-type-id="text-editor">
446 758 <state vertical-scroll-proportion="0.0" vertical-offset="7606" max-vertical-offset="16609">
447 759 <caret line="575" column="8" selection-start-line="575" selection-start-column="8" selection-end-line="575" selection-end-column="8" />
448   - <folding />
449 760 </state>
450 761 </provider>
451 762 </entry>
... ... @@ -453,9 +764,6 @@
453 764 <provider selected="true" editor-type-id="text-editor">
454 765 <state vertical-scroll-proportion="0.51602024" vertical-offset="0" max-vertical-offset="1581">
455 766 <caret line="18" column="61" selection-start-line="18" selection-start-column="61" selection-end-line="18" selection-end-column="61" />
456   - <folding>
457   - <element signature="e#0#21#0" expanded="false" />
458   - </folding>
459 767 </state>
460 768 </provider>
461 769 </entry>
... ... @@ -463,7 +771,6 @@
463 771 <provider selected="true" editor-type-id="text-editor">
464 772 <state vertical-scroll-proportion="-0.68802696" vertical-offset="408" max-vertical-offset="14586">
465 773 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
466   - <folding />
467 774 </state>
468 775 </provider>
469 776 </entry>
... ... @@ -471,32 +778,100 @@
471 778 <provider selected="true" editor-type-id="text-editor">
472 779 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22746">
473 780 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  781 + </state>
  782 + </provider>
  783 + </entry>
  784 + <entry file="file://$PROJECT_DIR$/data/corregistration.py">
  785 + <provider selected="true" editor-type-id="text-editor">
  786 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1054">
  787 + <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
474 788 <folding />
475 789 </state>
476 790 </provider>
477 791 </entry>
478 792 <entry file="file://$PROJECT_DIR$/data/viewer_slice.py">
479 793 <provider selected="true" editor-type-id="text-editor">
480   - <state vertical-scroll-proportion="0.0" vertical-offset="251" max-vertical-offset="23817">
481   - <caret line="37" column="37" selection-start-line="34" selection-start-column="0" selection-end-line="37" selection-end-column="37" />
  794 + <state vertical-scroll-proportion="0.0" vertical-offset="11012" max-vertical-offset="22423">
  795 + <caret line="676" column="27" selection-start-line="676" selection-start-column="27" selection-end-line="676" selection-end-column="27" />
482 796 <folding>
483 797 <element signature="e#1054#1070#0" expanded="true" />
  798 + <marker date="1425490600613" expanded="true" signature="46428:46559" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
484 799 </folding>
485 800 </state>
486 801 </provider>
487 802 </entry>
488   - <entry file="file://$PROJECT_DIR$/data/corregistration.py">
  803 + <entry file="file://$PROJECT_DIR$/gui/task_tools.py">
489 804 <provider selected="true" editor-type-id="text-editor">
490   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1054">
491   - <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="9" />
  805 + <state vertical-scroll-proportion="-2.9241147" vertical-offset="1734" max-vertical-offset="2397">
  806 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  807 + </state>
  808 + </provider>
  809 + </entry>
  810 + <entry file="file://$PROJECT_DIR$/data/slice_.py">
  811 + <provider selected="true" editor-type-id="text-editor">
  812 + <state vertical-scroll-proportion="0.0" vertical-offset="1326" max-vertical-offset="22457">
  813 + <caret line="37" column="7" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
  814 + <folding>
  815 + <element signature="e#1007#1016#0" expanded="true" />
  816 + <marker date="1425508292698" expanded="true" signature="9428:9461" placeholder="Select first..." />
  817 + </folding>
  818 + </state>
  819 + </provider>
  820 + </entry>
  821 + <entry file="file://$PROJECT_DIR$/control.py">
  822 + <provider selected="true" editor-type-id="text-editor">
  823 + <state vertical-scroll-proportion="0.0" vertical-offset="10258" max-vertical-offset="11475">
  824 + <caret line="639" column="26" selection-start-line="639" selection-start-column="26" selection-end-line="639" selection-end-column="26" />
  825 + <folding />
  826 + </state>
  827 + </provider>
  828 + </entry>
  829 + <entry file="file://$PROJECT_DIR$/project.py">
  830 + <provider selected="true" editor-type-id="text-editor">
  831 + <state vertical-scroll-proportion="0.0" vertical-offset="305" max-vertical-offset="6409">
  832 + <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
  833 + <folding>
  834 + <element signature="e#1008#1023#0" expanded="true" />
  835 + </folding>
  836 + </state>
  837 + </provider>
  838 + </entry>
  839 + <entry file="file://$PROJECT_DIR$/presets.py">
  840 + <provider selected="true" editor-type-id="text-editor">
  841 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3213">
  842 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  843 + <folding />
  844 + </state>
  845 + </provider>
  846 + </entry>
  847 + <entry file="file://$PROJECT_DIR$/gui/task_slice.py">
  848 + <provider selected="true" editor-type-id="text-editor">
  849 + <state vertical-scroll-proportion="0.0" vertical-offset="9656" max-vertical-offset="14365">
  850 + <caret line="608" column="59" selection-start-line="608" selection-start-column="59" selection-end-line="608" selection-end-column="59" />
  851 + <folding />
  852 + </state>
  853 + </provider>
  854 + </entry>
  855 + <entry file="file://$PROJECT_DIR$/gui/task_navigator.py">
  856 + <provider selected="true" editor-type-id="text-editor">
  857 + <state vertical-scroll-proportion="0.0" vertical-offset="7890" max-vertical-offset="14637">
  858 + <caret line="494" column="28" selection-start-line="494" selection-start-column="28" selection-end-line="494" selection-end-column="28" />
  859 + <folding />
  860 + </state>
  861 + </provider>
  862 + </entry>
  863 + <entry file="file://$PROJECT_DIR$/constants.py">
  864 + <provider selected="true" editor-type-id="text-editor">
  865 + <state vertical-scroll-proportion="0.0" vertical-offset="9462" max-vertical-offset="10064">
  866 + <caret line="576" column="10" selection-start-line="576" selection-start-column="10" selection-end-line="576" selection-end-column="10" />
492 867 <folding />
493 868 </state>
494 869 </provider>
495 870 </entry>
496 871 <entry file="file://$PROJECT_DIR$/data/coordinates.py">
497 872 <provider selected="true" editor-type-id="text-editor">
498   - <state vertical-scroll-proportion="0.635514" vertical-offset="2703" max-vertical-offset="4743">
499   - <caret line="179" column="0" selection-start-line="179" selection-start-column="0" selection-end-line="179" selection-end-column="0" />
  873 + <state vertical-scroll-proportion="0.0" vertical-offset="612" max-vertical-offset="5423">
  874 + <caret line="36" column="28" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" />
500 875 <folding>
501 876 <element signature="e#0#10#0" expanded="true" />
502 877 </folding>
... ...
invesalius/constants.py
  Diff comments   View file @8ce535a
... ... @@ -570,14 +570,16 @@ PROJECTION_MIP_SIZE=2
570 570 #This constantes were created by Victor Hugo for the Neuronavigator task
571 571 MARKER_SIZE = 4
572 572  
573   -ISOTRAKII = 0
574   -PATRIOT = 1
575   -MTC = 2
576   -ZEBRIS = 3
577   -#PATRIOT = 4
578   -DEFAULT_TRACKER = ISOTRAKII
579   -#TRACKER = [_("Polhemus PATRIOT"), _("Polhemus PATRIOT"), _("Polhemus ISOTRAK II"), _("Claron MicronTracker"), _("Zebris CMS20")]
580   -TRACKER = [_("Polhemus ISOTRAK II"), _("Polhemus PATRIOT"), _("Claron MicronTracker"), _("Zebris CMS20")]
  573 +MTC = 0
  574 +FASTRAK = 1
  575 +ISOTRAKII = 2
  576 +PATRIOT = 3
  577 +ZEBRIS = 4
  578 +DEFAULT_TRACKER = PATRIOT
  579 +#TRACKER = [_("Polhemus PATRIOT"), _("Polhemus PATRIOT"),
  580 +# _("Polhemus ISOTRAK II"), _("Claron MicronTracker"), _("Zebris CMS20")]
  581 +TRACKER = [_("Claron MicronTracker S40"), _("Polhemus FASTRAK"),
  582 + _("Polhemus ISOTRAK II"), _("Polhemus PATRIOT"), _("Zebris CMS20")]
581 583  
582 584  
583 585 SINGLE_REF = 0
... ...
invesalius/data/coordinates.py
  Diff comments   View file @8ce535a
... ... @@ -14,7 +14,47 @@ try:
14 14 except ImportError:
15 15 print 'The ClaronTracker library is not installed'
16 16  
17   -
  17 +
  18 +class Tracker:
  19 + def __init__(self, trck_id):
  20 +
  21 + self.trck_init = None
  22 + print "This is the tracker selected!"
  23 +
  24 + if trck_id == 0:
  25 + trck_init = self.ClaronTracker()
  26 + elif trck_id == 1:
  27 + trck_init = self.PlhFastrak()
  28 + elif trck_id == 2:
  29 + trck_init = self.PlhIsotrakII()
  30 + elif trck_id == 3:
  31 + trck_init = self.PlhPatriot()
  32 + elif trck_id == 4:
  33 + trck_init = self.ZebrisCMS20()
  34 +
  35 + self.trck_init = trck_init
  36 +
  37 + def ClaronTracker(self):
  38 + print "CLARON"
  39 + return 0
  40 +
  41 + def PlhFastrak(self):
  42 + print "FASTRAK"
  43 + return 1
  44 +
  45 + def PlhIsotrakII(self):
  46 + print "ISOTRAKII"
  47 + return 2
  48 +
  49 + def PlhPatriot(self):
  50 + print "PATRIOT"
  51 + return 3
  52 +
  53 + def ZebrisCMS20(self):
  54 + print "ZEBRIS"
  55 + return 4
  56 +
  57 +
18 58 class Coordinates:
19 59 def __init__(self, trck_init, trck, ref_mode):
20 60 # Module to get coordinates from spatial trackers
... ...
invesalius/gui/task_navigator.py
  Diff comments   View file @8ce535a
... ... @@ -490,8 +490,9 @@ class NeuronavigationTools(wx.Panel):
490 490 self.correg.stop()
491 491  
492 492 def OnChoiceTracker(self, evt):
493   - self.tracker_id = evt.GetSelection()
494   -
  493 + trck_id = evt.GetSelection()
  494 +
  495 + dco.Tracker(trck_id)
495 496 if self.tracker_id == 0:
496 497 self.trk_init = dtrk.Tracker_Init().PolhemusISO_init()
497 498 print self.trk_init
... ...