Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of https://github.com/qreal/qreal into sbt

Conflicts:
	installer/qrealRobots.xml
	plugins/metaEditor/editor/metaEditor.xml
	plugins/metaEditor/metaEditorSupport/editorGenerator.cpp
	plugins/metaEditor/metaEditorSupport/metaEditorSupportPlugin.cpp
	plugins/plugins.pro
	qrgui/mainwindow/mainWindow.cpp
	qrgui/mainwindow/mainWindow.h
	qrgui/qrgui_ru.qm
	qrgui/qrgui_ru.ts
	qrgui/umllib/nodeElement.cpp
	qrgui/view/propertyEditorView.cpp
	qrkernel/qrkernel.qrc
	qrkernel/settingsManager.cpp
	qrkernel/settingsManager.h
	qrmc/qrmc-lib.pro
	qrmc/templates/edge.template
	qrrepo/commonRepoApi.h
	qrrepo/private/repoApi.cpp
	qrutils/qrutils.pro
  • Loading branch information...
commit 950e56f44fa6bd549de1230ac57de433f732d11e 2 parents 7101b17 + fb5c4d9
MariaTikhonova authored September 15, 2012

Showing 344 changed files with 13,606 additions and 3,863 deletions. Show diff stats Hide diff stats

  1. 22  .travis.yml
  2. 10  installer/Doxyfile
  3. 4  installer/qrealRobots.xml
  4. 344  plugins/blockDiagram/editor/blockDiagramMetamodel.xml
  5. 12  plugins/blockDiagram/visualDebugSupport/interpreter/interpreter.pri
  6. 68  plugins/blockDiagram/visualDebugSupport/interpreter/visualDebugger.cpp
  7. 3  plugins/blockDiagram/visualDebugSupport/interpreter/visualDebugger.h
  8. 14  plugins/blockDiagram/visualDebugSupport/visualDebugSupport.pro
  9. BIN  plugins/blockDiagram/visualDebugSupport/visualDebugSupport_ru.qm
  10. 73  plugins/blockDiagram/visualDebugSupport/visualDebugSupport_ru.ts
  11. 22  plugins/blockDiagram/visualDebugSupport/visualDebuggerPlugin.cpp
  12. 2  plugins/blockDiagram/visualDebugSupport/visualDebuggerPlugin.h
  13. 262  plugins/blockDiagram/visualDebugSupport/visualDebuggerPreferencesPage.ui
  14. 84  plugins/metaEditor/editor/metaEditor.xml
  15. 8  plugins/plugins.pro
  16. 6  plugins/refactoring/editor/editor.pro
  17. BIN  plugins/refactoring/editor/images/iconset1/images/arrow1.png
  18. BIN  plugins/refactoring/editor/images/iconset1/images/arrow2.png
  19. BIN  plugins/refactoring/editor/images/iconset1/images/arrow3.png
  20. BIN  plugins/refactoring/editor/images/iconset1/images/pencil1.png
  21. BIN  plugins/refactoring/editor/images/iconset1/images/yahoowidgetengine_2730.png
  22. 14  plugins/refactoring/editor/refactoringEditor.pro
  23. 223  plugins/refactoring/editor/refactoringEditor.xml
  24. 5  plugins/refactoring/refactoring.pro
  25. BIN  plugins/refactoring/refactoringExamples/AddPrefix.png
  26. BIN  plugins/refactoring/refactoringExamples/AddPrefix.qrs
  27. BIN  plugins/refactoring/refactoringExamples/ChangeAllLinks.png
  28. BIN  plugins/refactoring/refactoringExamples/ChangeAllLinks.qrs
  29. BIN  plugins/refactoring/refactoringExamples/RobotsMakeSubprogram.png
  30. BIN  plugins/refactoring/refactoringExamples/RobotsMakeSubprogram.qrs
  31. BIN  plugins/refactoring/refactoringExamples/block.png
  32. BIN  plugins/refactoring/refactoringExamples/block.qrs
  33. BIN  plugins/refactoring/refactoringSupport/icons/preferences/pencil.png
  34. 6  plugins/refactoring/refactoringSupport/refactoring.qrc
  35. 331  plugins/refactoring/refactoringSupport/refactoringApplier.cpp
  36. 76  plugins/refactoring/refactoringSupport/refactoringApplier.h
  37. 168  plugins/refactoring/refactoringSupport/refactoringFinder.cpp
  38. 49  plugins/refactoring/refactoringSupport/refactoringFinder.h
  39. 513  plugins/refactoring/refactoringSupport/refactoringPlugin.cpp
  40. 159  plugins/refactoring/refactoringSupport/refactoringPlugin.h
  41. 96  plugins/refactoring/refactoringSupport/refactoringPreferencePage.cpp
  42. 37  plugins/refactoring/refactoringSupport/refactoringPreferencePage.h
  43. 165  plugins/refactoring/refactoringSupport/refactoringPreferencePage.ui
  44. 39  plugins/refactoring/refactoringSupport/refactoringSupport.pro
  45. BIN  plugins/refactoring/refactoringSupport/refactoringSupport_ru.qm
  46. 209  plugins/refactoring/refactoringSupport/refactoringSupport_ru.ts
  47. 97  plugins/refactoring/refactoringSupport/refactoringWindow.cpp
  48. 43  plugins/refactoring/refactoringSupport/refactoringWindow.h
  49. 140  plugins/refactoring/refactoringSupport/refactoringWindow.ui
  50. 4  plugins/robots/editor/doc/html/interface.html
  51. 2  plugins/robots/editor/doc/html/programming.html
  52. BIN  plugins/robots/editor/doc/qreal-robots.qch
  53. BIN  plugins/robots/editor/doc/qreal-robots.qhc
  54. 2  plugins/robots/editor/generated/robotsMetamodel.pro
  55. 317  plugins/robots/editor/generated/robotsMetamodel.xml
  56. BIN  plugins/robots/editor/images/iconset1/images/subprogramRobots.png
  57. BIN  plugins/robots/editor/images/iconset1/images/waitForLight.png
  58. BIN  plugins/robots/examples/movingAlongTheLine(twoSensors).qrs
  59. BIN  plugins/robots/examples/movingAlongTheLine.qrs
  60. BIN  plugins/robots/examples/simultaneousSensorReading.qrs
  61. BIN  plugins/robots/examples/touchObstacle.qrs
  62. 2  plugins/robots/robotsGenerator/nxtOSEK/elementGeneratorFactory.cpp
  63. 2  plugins/robots/robotsGenerator/nxtOSEK/elementGeneratorFactory.h
  64. 30  plugins/robots/robotsGenerator/nxtOSEK/generators/abstractElementGenerator.cpp
  65. 7  plugins/robots/robotsGenerator/nxtOSEK/generators/abstractElementGenerator.h
  66. 55  plugins/robots/robotsGenerator/nxtOSEK/generators/functionElementGenerator.cpp
  67. 8  plugins/robots/robotsGenerator/nxtOSEK/generators/functionElementGenerator.h
  68. 204  plugins/robots/robotsGenerator/nxtOSEK/generators/ifElementGenerator.cpp
  69. 23  plugins/robots/robotsGenerator/nxtOSEK/generators/ifElementGenerator.h
  70. 25  plugins/robots/robotsGenerator/nxtOSEK/generators/listsmartline.cpp
  71. 14  plugins/robots/robotsGenerator/nxtOSEK/generators/listsmartline.h
  72. 44  plugins/robots/robotsGenerator/nxtOSEK/generators/loopElementGenerator.cpp
  73. 7  plugins/robots/robotsGenerator/nxtOSEK/generators/loopElementGenerator.h
  74. 62  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElementFactory.cpp
  75. 17  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElementFactory.h
  76. 276  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElementGenerator.cpp
  77. 15  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElementGenerator.h
  78. 58  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/abstractSimpleElementGenerator.cpp
  79. 25  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/abstractSimpleElementGenerator.h
  80. 36  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/balanceGenerator.cpp
  81. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/balanceGenerator.h
  82. 20  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/balanceInitGenerator.cpp
  83. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/balanceInitGenerator.h
  84. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/beepGenerator.cpp
  85. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/beepGenerator.h
  86. 58  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/enginesGenerator.cpp
  87. 24  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/enginesGenerator.h
  88. 19  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/enginesStopGenerator.cpp
  89. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/enginesStopGenerator.h
  90. 20  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/finalNodeGenerator.cpp
  91. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/finalNodeGenerator.h
  92. 73  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/initialBlockGenerator.cpp
  93. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/initialBlockGenerator.h
  94. 20  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/initialNodeGenerator.cpp
  95. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/initialNodeGenerator.h
  96. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/nullificationEncoderGenerator.cpp
  97. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/nullificationEncoderGenerator.h
  98. 19  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/playToneGenerator.cpp
  99. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/playToneGenerator.h
  100. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/timerGenerator.cpp
  101. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/timerGenerator.h
  102. 20  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/variableInitGenerator.cpp
  103. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/variableInitGenerator.h
  104. 57  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/waitForColorBlockGenerator.cpp
  105. 22  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/waitForColorBlockGenerator.h
  106. 43  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/waitForColorIntensityBlockGenerator.cpp
  107. 22  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/waitForColorIntensityBlockGenerator.h
  108. 23  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/waitForEncoderBlockGenerator.cpp
  109. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/waitForEncoderBlockGenerator.h
  110. 42  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/waitForLightBlockGenerator.cpp
  111. 22  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/waitForLightBlockGenerator.h
  112. 40  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/waitForSonarBlockGenerator.cpp
  113. 22  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/waitForSonarBlockGenerator.h
  114. 23  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/waitForTouchSensorBlockGenerator.cpp
  115. 18  plugins/robots/robotsGenerator/nxtOSEK/generators/simpleElements/waitForTouchSensorBlockGenerator.h
  116. 6  plugins/robots/robotsGenerator/nxtOSEK/nxtFlashTool.cpp
  117. 1  plugins/robots/robotsGenerator/nxtOSEK/nxtFlashTool.h
  118. 341  plugins/robots/robotsGenerator/nxtOSEK/nxtOSEKRobotGenerator.cpp
  119. 42  plugins/robots/robotsGenerator/nxtOSEK/nxtOSEKRobotGenerator.h
  120. 42  plugins/robots/robotsGenerator/nxtOSEK/nxtOsek.pri
  121. 24  plugins/robots/robotsGenerator/nxtOSEK/smartLine.h
  122. 38  plugins/robots/robotsGenerator/nxtOSEK/templates/balancer/balancer.h
  123. 32  plugins/robots/robotsGenerator/nxtOSEK/templates/balancer/balancer_types.h
  124. 32  plugins/robots/robotsGenerator/nxtOSEK/templates/balancer/rt_SATURATE.h
  125. 11  plugins/robots/robotsGenerator/nxtOSEK/templates/taskTemplate.oil
  126. 16  plugins/robots/robotsGenerator/nxtOSEK/templates/template.c
  127. 4  plugins/robots/robotsGenerator/nxtOSEK/templates/template.makefile
  128. 14  plugins/robots/robotsGenerator/nxtOSEK/templates/template.oil
  129. 2  plugins/robots/robotsGenerator/robotsGenerator.pro
  130. 29  plugins/robots/robotsGenerator/robotsGenerator.qrc
  131. 27  plugins/robots/robotsGenerator/robotsGeneratorPlugin.cpp
  132. 7  plugins/robots/robotsGenerator/robotsGeneratorPlugin.h
  133. 4  plugins/robots/robotsInterpreter/details/blocks/blocks.pri
  134. 6  plugins/robots/robotsInterpreter/details/blocks/engineCommandBlock.cpp
  135. 4  plugins/robots/robotsInterpreter/details/blocks/engineCommandBlock.h
  136. 11  plugins/robots/robotsInterpreter/details/blocks/enginesBackwardBlock.cpp
  137. 11  plugins/robots/robotsInterpreter/details/blocks/enginesForwardBlock.cpp
  138. 11  plugins/robots/robotsInterpreter/details/blocks/enginesStopBlock.cpp
  139. 35  plugins/robots/robotsInterpreter/details/blocks/initialBlockWithPorts.cpp
  140. 2  plugins/robots/robotsInterpreter/details/blocks/initialBlockWithPorts.h
  141. 11  plugins/robots/robotsInterpreter/details/blocks/loopBlock.cpp
  142. 1  plugins/robots/robotsInterpreter/details/blocks/loopBlock.h
  143. 90  plugins/robots/robotsInterpreter/details/blocks/waitForLightSensorBlock.cpp
  144. 43  plugins/robots/robotsInterpreter/details/blocks/waitForLightSensorBlock.h
  145. 44  plugins/robots/robotsInterpreter/details/blocksFactory.cpp
  146. 22  plugins/robots/robotsInterpreter/details/d2RobotModel/d2Form.ui
  147. 4  plugins/robots/robotsInterpreter/details/d2RobotModel/d2ModelScene.cpp
  148. 94  plugins/robots/robotsInterpreter/details/d2RobotModel/d2ModelWidget.cpp
  149. 7  plugins/robots/robotsInterpreter/details/d2RobotModel/d2ModelWidget.h
  150. 58  plugins/robots/robotsInterpreter/details/d2RobotModel/d2RobotModel.cpp
  151. 9  plugins/robots/robotsInterpreter/details/d2RobotModel/d2RobotModel.h
  152. 10  plugins/robots/robotsInterpreter/details/d2RobotModel/lineItem.cpp
  153. 1  plugins/robots/robotsInterpreter/details/d2RobotModel/robotModelInterface.h
  154. 2  plugins/robots/robotsInterpreter/details/d2RobotModel/sensorsConfiguration.h
  155. 4  plugins/robots/robotsInterpreter/details/robotCommunication/bluetoothRobotCommunicationThread.cpp
  156. 6  plugins/robots/robotsInterpreter/details/robotCommunication/linuxFantom.cpp
  157. 1  plugins/robots/robotsInterpreter/details/robotCommunication/linuxFantom.h
  158. 1  plugins/robots/robotsInterpreter/details/robotCommunication/robotCommunicator.cpp
  159. 40  plugins/robots/robotsInterpreter/details/robotCommunication/usbRobotCommunicationThread.cpp
  160. 4  plugins/robots/robotsInterpreter/details/robotCommunication/usbRobotCommunicationThread.h
  161. 45  plugins/robots/robotsInterpreter/details/robotCommunication/windowsFantom.cpp
  162. 20  plugins/robots/robotsInterpreter/details/robotImplementations/abstractRobotModelImplementation.cpp
  163. 3  plugins/robots/robotsInterpreter/details/robotImplementations/abstractRobotModelImplementation.h
  164. 15  plugins/robots/robotsInterpreter/details/robotImplementations/nullRobotModelImplementation.cpp
  165. 3  plugins/robots/robotsInterpreter/details/robotImplementations/nullRobotModelImplementation.h
  166. 11  plugins/robots/robotsInterpreter/details/robotImplementations/realRobotModelImplementation.cpp
  167. 3  plugins/robots/robotsInterpreter/details/robotImplementations/realRobotModelImplementation.h
  168. 6  plugins/robots/robotsInterpreter/details/robotImplementations/robotImplementations.pri
  169. 18  ...robotsInterpreter/details/robotImplementations/sensorImplementations/bluetoothLightSensorImolementation.cpp
  170. 24  ...s/robotsInterpreter/details/robotImplementations/sensorImplementations/bluetoothLightSensorImplementation.h
  171. 1  ...bots/robotsInterpreter/details/robotImplementations/sensorImplementations/bluetoothSensorImplementation.cpp
  172. 13  ...bots/robotsInterpreter/details/robotImplementations/sensorImplementations/nullLightSensorImplementation.cpp
  173. 27  ...robots/robotsInterpreter/details/robotImplementations/sensorImplementations/nullLightSensorImplementation.h
  174. 13  ...ts/robotsInterpreter/details/robotImplementations/sensorImplementations/unrealLightSensorImplementation.cpp
  175. 24  ...bots/robotsInterpreter/details/robotImplementations/sensorImplementations/unrealLightSensorImplementation.h
  176. 15  plugins/robots/robotsInterpreter/details/robotImplementations/sensorsConfigurer.cpp
  177. 12  plugins/robots/robotsInterpreter/details/robotImplementations/unrealRobotModelImplementation.cpp
  178. 3  plugins/robots/robotsInterpreter/details/robotImplementations/unrealRobotModelImplementation.h
  179. 10  plugins/robots/robotsInterpreter/details/robotParts/lightSensor.cpp
  180. 24  plugins/robots/robotsInterpreter/details/robotParts/lightSensor.h
  181. 15  plugins/robots/robotsInterpreter/details/robotParts/robotModel.cpp
  182. 5  plugins/robots/robotsInterpreter/details/robotParts/robotModel.h
  183. 2  plugins/robots/robotsInterpreter/details/robotParts/robotParts.pri
  184. 2  plugins/robots/robotsInterpreter/details/robotParts/sonarSensor.cpp
  185. 94  plugins/robots/robotsInterpreter/interpreter.cpp
  186. 12  plugins/robots/robotsInterpreter/interpreter.h
  187. 32  plugins/robots/robotsInterpreter/robotsPlugin.cpp
  188. 3  plugins/robots/robotsInterpreter/robotsPlugin.h
  189. 1  plugins/robots/robotsInterpreter/sensorConstants.h
  190. 2  plugins/robots/robotsInterpreter/watchListWindow.cpp
  191. 86  plugins/robots/thirdparty/qextserialport/src/qextserialenumerator_unix.cpp
  192. 259  plugins/robots/thirdparty/qextserialport/src/qextserialenumerator_win.cpp
  193. 14  plugins/testInvocation/testInvocation.pro
  194. 105  plugins/testInvocation/testInvocationPlugin.cpp
  195. 35  plugins/testInvocation/testInvocationPlugin.h
  196. BIN  plugins/visualInterpreter/icons/preferences/bug.png
  197. 451  plugins/visualInterpreter/ruleParser.cpp
  198. 64  plugins/visualInterpreter/ruleParser.h
  199. 30  plugins/visualInterpreter/visualInterpreter.pro
  200. 6  plugins/visualInterpreter/visualInterpreter.qrc
  201. 362  plugins/visualInterpreter/visualInterpreterPlugin.cpp
  202. 93  plugins/visualInterpreter/visualInterpreterPlugin.h
  203. 55  plugins/visualInterpreter/visualInterpreterPreferencePage.ui
  204. 39  plugins/visualInterpreter/visualInterpreterPreferencesPage.cpp
  205. 32  plugins/visualInterpreter/visualInterpreterPreferencesPage.h
  206. 511  plugins/visualInterpreter/visualInterpreterUnit.cpp
  207. 139  plugins/visualInterpreter/visualInterpreterUnit.h
  208. BIN  plugins/visualInterpreter/visualInterpreter_ru.qm
  209. 189  plugins/visualInterpreter/visualInterpreter_ru.ts
  210. 21  qreal.pri
  211. 20  qrealTest.pri
  212. 1  qrealTest.pro
  213. 20  qrgui/dialogs/dialogs.pri
  214. 4  qrgui/dialogs/findReplaceDialog.cpp
  215. 7  qrgui/dialogs/findReplaceDialog.ui
  216. 59  qrgui/dialogs/gesturesShow/gesturesWidget.cpp
  217. 15  qrgui/dialogs/gesturesShow/gesturesWidget.h
  218. 36  qrgui/dialogs/managedClosableDialog.cpp
  219. 24  qrgui/dialogs/managedClosableDialog.h
  220. 109  qrgui/dialogs/preferencesDialog.ui
  221. 10  qrgui/dialogs/preferencesPages/behaviourPage.cpp
  222. 4  qrgui/dialogs/preferencesPages/behaviourPage.ui
  223. 4  qrgui/dialogs/preferencesPages/debuggerPage.ui
  224. 27  qrgui/dialogs/preferencesPages/editorPage.cpp
  225. 3  qrgui/dialogs/preferencesPages/editorPage.h
  226. 43  qrgui/dialogs/preferencesPages/editorPage.ui
  227. 2  qrgui/dialogs/preferencesPages/featuresPage.ui
  228. 2  qrgui/dialogs/preferencesPages/miscellaniousPage.cpp
  229. 2  qrgui/dialogs/preferencesPages/miscellaniousPage.ui
  230. 107  qrgui/dialogs/progressDialog/progressBar.cpp
  231. 45  qrgui/dialogs/progressDialog/progressBar.h
  232. 39  qrgui/dialogs/progressDialog/progressDialog.cpp
  233. 35  qrgui/dialogs/progressDialog/progressDialog.h
  234. 67  qrgui/dialogs/startDialog/listWidget.cpp
  235. 43  qrgui/dialogs/startDialog/listWidget.h
  236. 14  qrgui/dialogs/startDialog/recentProjectsListWidget.cpp
  237. 22  qrgui/dialogs/startDialog/recentProjectsListWidget.h
  238. 75  qrgui/dialogs/startDialog/startDialog.cpp
  239. 37  qrgui/dialogs/startDialog/startDialog.h
  240. 32  qrgui/dialogs/startDialog/suggestToCreateDiagramWidget.cpp
  241. 31  qrgui/dialogs/startDialog/suggestToCreateDiagramWidget.h
  242. 20  qrgui/dialogs/suggestToCreateDiagramDialog.cpp
  243. 20  qrgui/dialogs/suggestToCreateDiagramDialog.h
  244. BIN  qrgui/dotFiles/Pathplan.dll
  245. BIN  qrgui/dotFiles/cdt.dll
  246. 260  qrgui/dotFiles/config6
  247. BIN  qrgui/dotFiles/dot.exe
  248. BIN  qrgui/dotFiles/graph.dll
  249. 7  qrgui/dotFiles/graph1.dot
  250. BIN  qrgui/dotFiles/gvc.dll
  251. BIN  qrgui/dotFiles/gvplugin_core.dll
  252. BIN  qrgui/dotFiles/gvplugin_dot_layout.dll
  253. BIN  qrgui/dotFiles/gvplugin_pango.dll
  254. BIN  qrgui/dotFiles/libexpat.dll
  255. BIN  qrgui/dotFiles/ltdl.dll
  256. BIN  qrgui/dotFiles/qextserialportd.dll
  257. BIN  qrgui/dotFiles/zlib1.dll
  258. 1  qrgui/editorPluginInterface/editorInterface.h
  259. 45  qrgui/editorPluginInterface/elementImpl.h
  260. 7  qrgui/mainTest.cpp
  261. 151  qrgui/mainwindow/dotRunner.cpp
  262. 45  qrgui/mainwindow/dotRunner.h
  263. 27  qrgui/mainwindow/errorReporter.cpp
  264. 12  qrgui/mainwindow/externBrowser.h
  265. 25  qrgui/mainwindow/findManager.cpp
  266. 2  qrgui/mainwindow/findManager.h
  267. 6  qrgui/mainwindow/gesturesPainterInterface.h
  268. 14  qrgui/mainwindow/helpBrowser.cpp
  269. 16  qrgui/mainwindow/linuxExternBrowser.cpp
  270. 9  qrgui/mainwindow/linuxExternBrowser.h
  271. 0  qrgui/mainwindow/macExternBrowser.cpp
  272. 0  qrgui/mainwindow/macExternBrowser.h
  273. 1,160  qrgui/mainwindow/mainWindow.cpp
  274. 133  qrgui/mainwindow/mainWindow.h
  275. 80  qrgui/mainwindow/mainWindow.ui
  276. 27  qrgui/mainwindow/mainWindowInterpretersInterface.h
  277. 46  qrgui/mainwindow/mainwindow.pri
  278. 150  qrgui/mainwindow/miniMap.cpp
  279. 61  qrgui/mainwindow/miniMap.h
  280. 2  qrgui/mainwindow/paletteTree.cpp
  281. 74  qrgui/mainwindow/projectManager/autosaver.cpp
  282. 46  qrgui/mainwindow/projectManager/autosaver.h
  283. 55  qrgui/mainwindow/projectManager/projectManagementInterface.h
  284. 312  qrgui/mainwindow/projectManager/projectManager.cpp
  285. 61  qrgui/mainwindow/projectManager/projectManager.h
  286. 33  qrgui/mainwindow/propertyEditorProxyModel.cpp
  287. 3  qrgui/mainwindow/propertyEditorProxyModel.h
  288. 89  qrgui/mainwindow/referenceList.cpp
  289. 53  qrgui/mainwindow/referenceList.h
  290. 81  qrgui/mainwindow/referenceList.ui
  291. 16  qrgui/mainwindow/shapeEdit/line.cpp
  292. 6  qrgui/mainwindow/shapeEdit/shapeEdit.cpp
  293. 25  qrgui/mainwindow/splashScreen.cpp
  294. 27  qrgui/mainwindow/splashScreen.h
  295. 19  qrgui/mainwindow/tabWidget.cpp
  296. 22  qrgui/mainwindow/tabWidget.h
  297. 13  qrgui/mainwindow/windowsExternBrowser.cpp
  298. 10  qrgui/mainwindow/windowsExternBrowser.h
  299. 2  qrgui/models/details/logicalModel.h
  300. 10  qrgui/models/graphicalModelAssistApi.cpp
  301. 2  qrgui/models/graphicalModelAssistApi.h
  302. 35  qrgui/models/logicalModelAssistApi.cpp
  303. 4  qrgui/models/logicalModelAssistApi.h
  304. 4  qrgui/models/models.h
  305. 18  qrgui/pluginManager/editorManager.cpp
  306. 2  qrgui/pluginManager/editorManager.h
  307. 9  qrgui/pluginManager/toolPluginManager.cpp
  308. 2  qrgui/pluginManager/toolPluginManager.h
  309. 3  qrgui/qrgui.pro
  310. 52  qrgui/qrguiTest.pro
  311. BIN  qrgui/qrgui_ru.qm
  312. 652  qrgui/qrgui_ru.ts
  313. 8  qrgui/toolPluginInterface/pluginConfigurator.h
  314. 1  qrgui/toolPluginInterface/usedInterfaces/graphicalModelAssistInterface.h
  315. 4  qrgui/toolPluginInterface/usedInterfaces/logicalModelAssistInterface.h
  316. 88  qrgui/umllib/edgeElement.cpp
  317. 9  qrgui/umllib/edgeElement.h
  318. 9  qrgui/umllib/element.cpp
  319. 157  qrgui/umllib/element.h
  320. 4  qrgui/umllib/elementTitle.cpp
  321. 8  qrgui/umllib/embedded/linkers/embeddedLinker.cpp
  322. 930  qrgui/umllib/nodeElement.cpp
  323. 170  qrgui/umllib/nodeElement.h
  324. 61  qrgui/umllib/private/borderChecker.cpp
  325. 68  qrgui/umllib/private/borderChecker.h
  326. 61  qrgui/umllib/private/copyHandler.cpp
  327. 55  qrgui/umllib/private/copyHandler.h
  328. 342  qrgui/umllib/private/portHandler.cpp
  329. 190  qrgui/umllib/private/portHandler.h
  330. 233  qrgui/umllib/private/resizeHandler.cpp
  331. 113  qrgui/umllib/private/resizeHandler.h
  332. 16  qrgui/umllib/{ → private}/sceneGridHandler.cpp
  333. 0  qrgui/umllib/{ → private}/sceneGridHandler.h
  334. 73  qrgui/umllib/private/umlPortHandler.cpp
  335. 37  qrgui/umllib/private/umlPortHandler.h
  336. 2  qrgui/umllib/sdfRenderer.cpp
  337. 46  qrgui/umllib/serializationData.cpp
  338. 72  qrgui/umllib/serializationData.h
  339. 80  qrgui/umllib/umlPortHandler.cpp
  340. 22  qrgui/umllib/umlPortHandler.h
  341. 22  qrgui/umllib/umllib.pri
  342. 0  qrgui/unitTests/unitTests.pri
  343. 14  qrgui/view/editorView.cpp
22  .travis.yml
... ...
@@ -0,0 +1,22 @@
  1
+language: cpp
  2
+compiler: gcc
  3
+install:
  4
+  - sudo apt-get update
  5
+  - sudo apt-get install libqt4-dev qt4-qmake qt4-dev-tools
  6
+
  7
+script:
  8
+  - cat /proc/cpuinfo
  9
+  - cat /proc/meminfo
  10
+  - qmake qrealRobots.pro
  11
+  - make -j2 
  12
+  - make distclean
  13
+  - qmake qrealTest.pro CONFIG+=debug
  14
+  - make -j2
  15
+  - ./bin/unittests/qrlibs_unittests
  16
+  - ./bin/unittests/qrgui_unittests
  17
+  - ./bin/unittests/qrxc_unittests
  18
+
  19
+notifications:
  20
+  email:
  21
+    recipients:
  22
+      - qreal-build-reports@googlegroups.com
10  installer/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NUMBER         =
38 38
 # If a relative path is entered, it will be relative to the location 
39 39
 # where doxygen was started. If left blank the current directory will be used.
40 40
 
41  
-OUTPUT_DIRECTORY       = C:\Hudson\jobs\Documentation\workspace\doxygen
  41
+OUTPUT_DIRECTORY       = installer
42 42
 
43 43
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
44 44
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -60,7 +60,7 @@ CREATE_SUBDIRS         = NO
60 60
 # Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, 
61 61
 # Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
62 62
 
63  
-OUTPUT_LANGUAGE        = Russian
  63
+OUTPUT_LANGUAGE        = English
64 64
 
65 65
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
66 66
 # include brief member descriptions after the members that are listed in 
@@ -180,7 +180,7 @@ SEPARATE_MEMBER_PAGES  = NO
180 180
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
181 181
 # Doxygen uses this value to replace tabs by spaces in code fragments.
182 182
 
183  
-TAB_SIZE               = 8
  183
+TAB_SIZE               = 4
184 184
 
185 185
 # This tag can be used to specify a number of aliases that acts 
186 186
 # as commands in the documentation. An alias has the form "name=value". 
@@ -590,7 +590,7 @@ WARN_LOGFILE           =
590 590
 # directories like "/usr/src/myproject". Separate the files or directories 
591 591
 # with spaces.
592 592
 
593  
-INPUT                  = C:\Hudson\jobs\Documentation\workspace\unreal
  593
+INPUT                  = 
594 594
 
595 595
 # This tag can be used to specify the character encoding of the source files 
596 596
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
@@ -1438,7 +1438,7 @@ HIDE_UNDOC_RELATIONS   = YES
1438 1438
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section 
1439 1439
 # have no effect if this option is set to NO (the default)
1440 1440
 
1441  
-HAVE_DOT               = YES
  1441
+HAVE_DOT               = 
1442 1442
 
1443 1443
 # By default doxygen will write a font called FreeSans.ttf to the output 
1444 1444
 # directory and reference it in all dot files that doxygen generates. This 
4  installer/qrealRobots.xml
... ...
@@ -1,7 +1,7 @@
1 1
 <project>
2 2
     <shortName>QRealRobots</shortName>
3 3
     <fullName>QReal Robots</fullName>
4  
-    <version>%version%</version>
  4
+    <version>1.5</version>
5 5
     <licenseFile>%1/installer/gpl-3.0.txt</licenseFile>
6 6
     <leftImage>%1/installer/left.png</leftImage>
7 7
     <logoImage>%1/installer/logo.png</logoImage>
@@ -102,7 +102,7 @@
102 102
                             <origin>%2/QtXml4.dll</origin>
103 103
                         </distributionFile>
104 104
                         <distributionFile>
105  
-                            <origin>%2/../../../../../mingw/bin/libgcc_s_dw2-1.dll</origin>
  105
+                            <origin>%2//../../../../../mingw/bin/libgcc_s_dw2-1.dll</origin>
106 106
                         </distributionFile>
107 107
                         <distributionFile>
108 108
                             <origin>%1/installer/icon.ico</origin>
344  plugins/blockDiagram/editor/blockDiagramMetamodel.xml
... ...
@@ -1,164 +1,184 @@
1 1
   <metamodel xmlns="http://schema.real.com/schema/">
2  
-    <include>../../commonMetamodels/kernelMetamodel.xml</include>
3  
-    <include>../../commonMetamodels/basicBehaviorsMetamodel.xml</include>
4  
-    <include>../../commonMetamodels/basicActionsMetamodel.xml</include>
5  
-    <namespace>UML 2.0</namespace>
6  
-    <diagram displayedName="Block Diagram" nodeName="BlockDiagramNode" name="BlockDiagram">
7  
-      <graphicTypes>
8  
-        <node displayedName="Block Diagram" path="10, 0 : 90, 0 : 90, 100 : 10, 100 : 0, 90 : 0, 10 : 100, 10 : 100, 90 : " name="BlockDiagramNode">
9  
-          <graphics>
10  
-            <picture sizex="200" sizey="200">
11  
-              <line y1="0" x1="20" y2="0" x2="180"/>
12  
-              <line y1="200" x1="20" y2="200" x2="180"/>
13  
-              <line y1="20" x1="0" y2="180" x2="0"/>
14  
-              <line y1="20" x1="200" y2="180" x2="200"/>
15  
-              <arc spanAngle="1440" startAngle="1440" y1="0" x1="0" y2="40" x2="40"/>
16  
-              <arc spanAngle="1440" startAngle="0" y1="0" x1="160" y2="40" x2="200"/>
17  
-              <arc spanAngle="1440" startAngle="2880" y1="160" x1="0" y2="200" x2="40"/>
18  
-              <arc spanAngle="-1440" startAngle="0" y1="160" x1="160" y2="200" x2="200"/>
19  
-            </picture>
20  
-            <labels>
21  
-              <label x="40" y="10" textBinded="name"/>
22  
-            </labels>
23  
-            <ports>
24  
-              <pointPort x="0" y="100"/>
25  
-              <pointPort x="100" y="0"/>
26  
-              <pointPort x="200" y="100"/>
27  
-              <pointPort x="100" y="200"/>
28  
-            </ports>
29  
-          </graphics>
30  
-          <logic>
31  
-            <generalizations>
32  
-              <parent parentName="KernelDiagram::Diagram"/>
33  
-            </generalizations>
34  
-            <container>
35  
-              <contains type="BlockDiagram::Action"/>
36  
-              <contains type="BlockDiagram::FinalNode"/>
37  
-              <contains type="BlockDiagram::ControlFlow"/>
38  
-              <contains type="BlockDiagram::InitialNode"/>
39  
-              <contains type="BlockDiagram::DecisionNode"/>
40  
-            </container>
41  
-          </logic>
42  
-        </node>
43  
-        <node displayedName="Action" name="Action">
44  
-          <graphics>
45  
-            <picture sizex="80" sizey="60">
46  
-              <path fill="#f8f8f8" stroke-style="solid" int="17" stroke="#000000" stroke-width="1" d=" M 10.75 1 C 5.36522 1 1 5.41447 1 10.86 L 1 49.14 C 1 54.5855 5.36522 59 10.75 59 L 69.25 59 C 74.6348 59 79 54.5855 79 49.14 L 79 10.86 C 79 5.41447 74.6348 1 69.25 1 L 10.75 1" fill-style="solid"/>
47  
-            </picture>
48  
-            <ports>
49  
-              <linePort>
50  
-                <start startx="79" starty="10"/>
51  
-                <end endx="79" endy="50"/>
52  
-              </linePort>
53  
-              <linePort>
54  
-                <start startx="1" starty="10"/>
55  
-                <end endx="1" endy="50"/>
56  
-              </linePort>
57  
-              <linePort>
58  
-                <start startx="10" starty="1"/>
59  
-                <end endx="70" endy="1"/>
60  
-              </linePort>
61  
-              <linePort>
62  
-                <start startx="10" starty="59"/>
63  
-                <end endx="70" endy="59"/>
64  
-              </linePort>
65  
-            </ports>
66  
-            <labels>
67  
-              <label textBinded="process" center="true"/>
68  
-            </labels>
69  
-          </graphics>
70  
-          <logic>
71  
-            <properties>
72  
-              <property type="string" name="process" />
73  
-            </properties>
74  
-          </logic>
75  
-        </node>
76  
-        <node displayedName="Final Node" path="29, 15 : 27, 20 : 24, 24 : 20, 27 : 15, 28 : 10, 27 : 6, 24 : 3, 20 : 2, 15 : 3, 10 : 6, 6 : 10, 3 : 15, 2 : 20, 3 : 24, 6 : 27, 10 : 29, 15 : 36, 15 : 34, 23 : 29, 29 : 23, 34 : 15, 35 : 7, 34 : 1, 29 : -4, 23 : -5, 15 : -4, 7 : 1, 1 : 7, -4 : 15, -5 : 23, -4 : 29, 1 : 34, 7 : 36, 15 : " name="BlockFinalNode">
77  
-          <graphics>
78  
-            <picture sizex="30" sizey="30">
79  
-              <ellipse fill="#ffffff" stroke-style="solid" stroke="#000000" y1="0" x1="0" y2="30" stroke-width="1" x2="30" fill-style="solid"/>
80  
-              <ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="5" x1="5" y2="25" stroke-width="1" x2="25" fill-style="solid"/>
81  
-            </picture>
82  
-            <ports>
83  
-              <pointPort x="0" y="15"/>
84  
-              <pointPort x="15" y="0"/>
85  
-              <pointPort x="15" y="30"/>
86  
-              <pointPort x="30" y="15"/>
87  
-              <pointPort x="15" y="15"/>
88  
-            </ports>
89  
-          </graphics>
90  
-          <logic>
91  
-          </logic>
92  
-        </node>
93  
-        <edge displayedName="Control Flow" name="ControlFlow">
94  
-          <graphics>
95  
-            <labels>
96  
-              <label textBinded="type"/>
97  
-            </labels>
98  
-            <lineType type="solidLine"/>
99  
-          </graphics>
100  
-          <logic>
101  
-            <properties>
102  
-              <property type="string" name="type_number" />
103  
-              <property type="bool" name="type" />
104  
-            </properties>
105  
-            <associations endType="open_arrow" beginType="no_arrow">
106  
-            </associations>
107  
-            <possibleEdges>
108  
-              <possibleEdge beginName="Action" directed="false" endName="Action"/>
109  
-              <possibleEdge beginName="Action" directed="true" endName="BlockFinalNode"/>
110  
-              <possibleEdge beginName="Action" directed="false" endName="ConditionNode"/>
111  
-              <possibleEdge beginName="ConditionNode" directed="false" endName="ConditionNode"/>
112  
-              <possibleEdge beginName="ConditionNode" directed="true" endName="FinalNode"/>
113  
-              <possibleEdge beginName="InitialNode" directed="true" endName="Action"/>
114  
-              <possibleEdge beginName="InitialNode" directed="true" endName="BlockFinalNode"/>
115  
-              <possibleEdge beginName="InitialNode" directed="true" endName="ConditionNode"/>
116  
-            </possibleEdges>
117  
-          </logic>
118  
-        </edge>
119  
-        <node displayedName="Initial Node" path="36, 15 : 34, 23 : 29, 29 : 23, 34 : 15, 35 : 7, 34 : 1, 29 : -4, 23 : -5, 15 : -4, 7 : 1, 1 : 7, -4 : 15, -5 : 23, -4 : 29, 1 : 34, 7 : 36, 15 : " name="InitialNode">
120  
-          <graphics>
121  
-            <picture sizex="30" sizey="30">
122  
-              <ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="0" x1="0" y2="30" stroke-width="1" x2="30" fill-style="solid"/>
123  
-            </picture>
124  
-            <ports>
125  
-              <pointPort x="0" y="15"/>
126  
-              <pointPort x="30" y="15"/>
127  
-              <pointPort x="15" y="0"/>
128  
-              <pointPort x="15" y="30"/>
129  
-              <pointPort x="15" y="15"/>
130  
-            </ports>
131  
-          </graphics>
132  
-          <logic>
133  
-          </logic>
134  
-        </node>
135  
-        <node displayedName="Condition Node" path="30, 2 : 58, 30 : 30, 58 : 2, 30 : 30, 2 :" name="ConditionNode">
136  
-          <graphics>
137  
-            <picture sizex="60" sizey="60">
138  
-              <line fill="#000000" stroke-style="solid" stroke="#000000" y1="1" x1="30" y2="30" stroke-width="1" x2="1" fill-style="solid" />
139  
-              <line fill="#000000" stroke-style="solid" stroke="#000000" y1="30" x1="1" y2="59" stroke-width="1" x2="30" fill-style="solid" />
140  
-              <line fill="#000000" stroke-style="solid" stroke="#000000" y1="59" x1="30" y2="30" stroke-width="1" x2="59" fill-style="solid" />
141  
-              <line fill="#000000" stroke-style="solid" stroke="#000000" y1="30" x1="59" y2="1" stroke-width="1" x2="30" fill-style="solid" />
142  
-            </picture>
143  
-            <ports>
144  
-              <pointPort x="1" y="30"/>
145  
-              <pointPort x="30" y="59"/>
146  
-              <pointPort x="59" y="30"/>
147  
-              <pointPort x="30" y="1"/>
148  
-            </ports>
149  
-            <labels>
150  
-              <label textBinded="condition" center="true"/>
151  
-            </labels>
152  
-          </graphics>
153  
-          <logic>
154  
-            <properties>
155  
-              <property type="string" name="decision">
156  
-                <default>1</default>
157  
-              </property>
158  
-              <property type="string" name="condition" />
159  
-            </properties>
160  
-          </logic>
161  
-        </node>
162  
-      </graphicTypes>
163  
-    </diagram>
  2
+	<include>../../commonMetamodels/kernelMetamodel.xml</include>
  3
+	<include>../../commonMetamodels/basicBehaviorsMetamodel.xml</include>
  4
+	<include>../../commonMetamodels/basicActionsMetamodel.xml</include>
  5
+	<namespace>UML 2.0</namespace>
  6
+	<diagram displayedName="Block Diagram" nodeName="BlockDiagramNode" name="BlockDiagram">
  7
+	  <graphicTypes>
  8
+		<node displayedName="Block Diagram" name="BlockDiagramNode">
  9
+		  <graphics>
  10
+			<picture sizex="200" sizey="200">
  11
+			  <line y1="0" x1="20" y2="0" x2="180"/>
  12
+			  <line y1="200" x1="20" y2="200" x2="180"/>
  13
+			  <line y1="20" x1="0" y2="180" x2="0"/>
  14
+			  <line y1="20" x1="200" y2="180" x2="200"/>
  15
+			  <arc spanAngle="1440" startAngle="1440" y1="0" x1="0" y2="40" x2="40"/>
  16
+			  <arc spanAngle="1440" startAngle="0" y1="0" x1="160" y2="40" x2="200"/>
  17
+			  <arc spanAngle="1440" startAngle="2880" y1="160" x1="0" y2="200" x2="40"/>
  18
+			  <arc spanAngle="-1440" startAngle="0" y1="160" x1="160" y2="200" x2="200"/>
  19
+			</picture>
  20
+			<labels>
  21
+			  <label x="40" y="10" textBinded="name"/>
  22
+			</labels>
  23
+			<ports>
  24
+			  <pointPort x="0" y="100"/>
  25
+			  <pointPort x="100" y="0"/>
  26
+			  <pointPort x="200" y="100"/>
  27
+			  <pointPort x="100" y="200"/>
  28
+			</ports>
  29
+		  </graphics>
  30
+		  <logic>
  31
+			<generalizations>
  32
+			  <parent parentName="KernelDiagram::Diagram"/>
  33
+			</generalizations>
  34
+			<container>
  35
+			  <contains type="BlockDiagram::Action"/>
  36
+			  <contains type="BlockDiagram::BlockFinalNode"/>
  37
+			  <contains type="BlockDiagram::ControlFlow"/>
  38
+			  <contains type="BlockDiagram::InitialNode"/>
  39
+			  <contains type="BlockDiagram::ConditionNode"/>
  40
+			</container>
  41
+		  </logic>
  42
+		</node>
  43
+		<node displayedName="Action" name="Action">
  44
+		  <graphics>
  45
+			<picture sizex="80" sizey="60">
  46
+			  <path fill="#f8f8f8" stroke-style="solid" int="17" stroke="#000000" stroke-width="1" d=" M 10.75 1 C 5.36522 1 1 5.41447 1 10.86 L 1 49.14 C 1 54.5855 5.36522 59 10.75 59 L 69.25 59 C 74.6348 59 79 54.5855 79 49.14 L 79 10.86 C 79 5.41447 74.6348 1 69.25 1 L 10.75 1" fill-style="solid"/>
  47
+			</picture>
  48
+			<ports>
  49
+			  <linePort>
  50
+				<start startx="79" starty="10"/>
  51
+				<end endx="79" endy="50"/>
  52
+			  </linePort>
  53
+			  <linePort>
  54
+				<start startx="1" starty="10"/>
  55
+				<end endx="1" endy="50"/>
  56
+			  </linePort>
  57
+			  <linePort>
  58
+				<start startx="10" starty="1"/>
  59
+				<end endx="70" endy="1"/>
  60
+			  </linePort>
  61
+			  <linePort>
  62
+				<start startx="10" starty="59"/>
  63
+				<end endx="70" endy="59"/>
  64
+			  </linePort>
  65
+			</ports>
  66
+			<labels>
  67
+			  <label textBinded="process" center="true"/>
  68
+			</labels>
  69
+		  </graphics>
  70
+		  <logic>
  71
+			<properties>
  72
+			  <property type="reference" name="condition">
  73
+			   <reference nameReference="ConditionNode"/>
  74
+			  </property>
  75
+			  <property type="string" name="process" />
  76
+			  <property type="bool" name="finished">
  77
+				<default>false</default>
  78
+			  </property>
  79
+			</properties>
  80
+		  </logic>
  81
+		</node>
  82
+		<node displayedName="Final Node" name="BlockFinalNode">
  83
+		  <graphics>
  84
+			<picture sizex="30" sizey="30">
  85
+			  <ellipse fill="#ffffff" stroke-style="solid" stroke="#000000" y1="0" x1="0" y2="30" stroke-width="1" x2="30" fill-style="solid"/>
  86
+			  <ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="5" x1="5" y2="25" stroke-width="1" x2="25" fill-style="solid"/>
  87
+			</picture>
  88
+			<ports>
  89
+			  <pointPort x="0" y="15"/>
  90
+			  <pointPort x="15" y="0"/>
  91
+			  <pointPort x="15" y="30"/>
  92
+			  <pointPort x="30" y="15"/>
  93
+			  <pointPort x="15" y="15"/>
  94
+			</ports>
  95
+		  </graphics>
  96
+		  <logic>
  97
+		  </logic>
  98
+		</node>
  99
+		<edge displayedName="Control Flow" name="ControlFlow">
  100
+		  <graphics>
  101
+			<lineType type="solidLine"/>
  102
+		  </graphics>
  103
+		  <logic>
  104
+			<possibleEdges>
  105
+			  <possibleEdge beginName="InitialNode" directed="true" endName="ConditionNode"/>
  106
+			  <possibleEdge beginName="InitialNode" directed="true" endName="BlockFinalNode"/>
  107
+			  <possibleEdge beginName="InitialNode" directed="true" endName="Action"/>
  108
+			  <possibleEdge beginName="Action" directed="true" endName="Action"/>
  109
+			  <possibleEdge beginName="Action" directed="true" endName="ConditionNode"/>
  110
+			  <possibleEdge beginName="Action" directed="true" endName="BlockFinalNode"/>
  111
+			</possibleEdges>
  112
+			<associations endType="open_arrow" beginType="no_arrow" />
  113
+		  </logic>
  114
+		</edge>
  115
+		<edge displayedName="Condition Control Flow" name="ConditionControlFlow">
  116
+		  <graphics>
  117
+			<labels>
  118
+			  <label textBinded="type"/>
  119
+			</labels>
  120
+			<lineType type="solidLine"/>
  121
+		  </graphics>
  122
+		  <logic>
  123
+			<properties>
  124
+			  <property type="bool" name="type">
  125
+				<default>false</default>
  126
+			  </property>
  127
+			</properties>
  128
+			<possibleEdges>
  129
+			  <possibleEdge beginName="ConditionNode" directed="true" endName="ConditionNode"/>
  130
+			  <possibleEdge beginName="ConditionNode" directed="true" endName="Action"/>
  131
+			  <possibleEdge beginName="ConditionNode" directed="true" endName="BlockFinalNode"/>
  132
+			</possibleEdges>
  133
+			<associations endType="open_arrow" beginType="no_arrow" />
  134
+		  </logic>
  135
+		</edge>
  136
+		<node displayedName="Initial Node" name="InitialNode">
  137
+		  <graphics>
  138
+			<picture sizex="30" sizey="30">
  139
+			  <ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="0" x1="0" y2="30" stroke-width="1" x2="30" fill-style="solid"/>
  140
+			</picture>
  141
+			<ports>
  142
+			  <pointPort x="0" y="15"/>
  143
+			  <pointPort x="30" y="15"/>
  144
+			  <pointPort x="15" y="0"/>
  145
+			  <pointPort x="15" y="30"/>
  146
+			  <pointPort x="15" y="15"/>
  147
+			</ports>
  148
+		  </graphics>
  149
+		  <logic>
  150
+			<properties>
  151
+			  <property type="bool" name="started">
  152
+				<default>false</default>
  153
+			  </property>
  154
+			</properties>
  155
+		  </logic>
  156
+		</node>
  157
+		<node displayedName="Condition Node" name="ConditionNode">
  158
+		  <graphics>
  159
+			<picture sizex="60" sizey="60">
  160
+			  <line fill="#000000" stroke-style="solid" stroke="#000000" y1="1" x1="30" y2="30" stroke-width="1" x2="1" fill-style="solid" />
  161
+			  <line fill="#000000" stroke-style="solid" stroke="#000000" y1="30" x1="1" y2="59" stroke-width="1" x2="30" fill-style="solid" />
  162
+			  <line fill="#000000" stroke-style="solid" stroke="#000000" y1="59" x1="30" y2="30" stroke-width="1" x2="59" fill-style="solid" />
  163
+			  <line fill="#000000" stroke-style="solid" stroke="#000000" y1="30" x1="59" y2="1" stroke-width="1" x2="30" fill-style="solid" />
  164
+			</picture>
  165
+			<ports>
  166
+			  <pointPort x="1" y="30"/>
  167
+			  <pointPort x="30" y="59"/>
  168
+			  <pointPort x="59" y="30"/>
  169
+			  <pointPort x="30" y="1"/>
  170
+			</ports>
  171
+			<labels>
  172
+			  <label textBinded="condition" center="true"/>
  173
+			</labels>
  174
+		  </graphics>
  175
+		  <logic>
  176
+			<properties>
  177
+			  <property type="string" name="condition" />
  178
+			  <property type="bool" name="flag" />
  179
+			</properties>
  180
+		  </logic>
  181
+		</node>
  182
+	  </graphicTypes>
  183
+	</diagram>
164 184
   </metamodel>
12  plugins/blockDiagram/visualDebugSupport/interpreter/interpreter.pri
... ...
@@ -1,10 +1,10 @@
1 1
 # Visual debugger
2 2
 HEADERS += \
3  
-	interpreter/visualDebugger.h \
4  
-	interpreter/blockParser.h \
5  
-	interpreter/debuggerConnector.h \
  3
+	$$PWD/visualDebugger.h \
  4
+	$$PWD/blockParser.h \
  5
+	$$PWD/debuggerConnector.h \
6 6
 
7 7
 SOURCES += \
8  
-	interpreter/visualDebugger.cpp \
9  
-	interpreter/blockParser.cpp \
10  
-	interpreter/debuggerConnector.cpp \
  8
+	$$PWD/visualDebugger.cpp \
  9
+	$$PWD/blockParser.cpp \
  10
+	$$PWD/debuggerConnector.cpp \
68  plugins/blockDiagram/visualDebugSupport/interpreter/visualDebugger.cpp
@@ -137,6 +137,12 @@ void VisualDebugger::error(ErrorType e)
137 137
 			mInterpretersInterface.errorReporter()->addCritical(
138 138
 					tr("Code generation failed"));
139 139
 			mHasCodeGenerationError = true;
  140
+			break;
  141
+		case incorrectUseOfLink:
  142
+			mInterpretersInterface.errorReporter()->addCritical(
  143
+						tr("Incorrect type of link used"),
  144
+						mCurrentId);
  145
+			break;
140 146
 		case noErrors:
141 147
 			return;
142 148
 			break;
@@ -165,6 +171,10 @@ Id const VisualDebugger::findValidLink()
165 171
 	bool condition = mBlockParser->parseCondition(conditionStr, pos, mCurrentId);
166 172
 
167 173
 	foreach (Id const &link, outLinks) {
  174
+		if (checkForIncorrectUseOfLink(link, "ControlFlow")) {
  175
+			return Id::rootId();
  176
+		}
  177
+		
168 178
 		bool type = getProperty(link, "type").toBool();
169 179
 		if (type == condition) {
170 180
 			return link;
@@ -266,6 +276,10 @@ void VisualDebugger::debug()
266 276
 				return;
267 277
 			}
268 278
 		} else {
  279
+			if (checkForIncorrectUseOfLink(outLinks.at(0), "ConditionControlFlow")) {
  280
+				return;
  281
+			}
  282
+			
269 283
 			doStep(outLinks.at(0));
270 284
 			if (mBlockParser->hasErrors()) {
271 285
 				deinitialize();
@@ -279,7 +293,7 @@ void VisualDebugger::debug()
279 293
 			error(VisualDebugger::missingEndOfLinkNode);
280 294
 			return;
281 295
 		}
282  
-
  296
+		
283 297
 		doStep(mLogicalModelApi.logicalRepoApi().to(mCurrentId));
284 298
 		if (mBlockParser->hasErrors()) {
285 299
 			deinitialize();
@@ -314,7 +328,9 @@ void VisualDebugger::debugSingleStep()
314 328
 	} else {
315 329
 		mBlockParser->setErrorReporter(mInterpretersInterface.errorReporter());
316 330
 
317  
-		if (mCurrentId.element() == "ControlFlow") {
  331
+		if (mCurrentId.element() == "ControlFlow" || 
  332
+				mCurrentId.element() == "ConditionControlFlow")
  333
+		{
318 334
 			if (!hasEndOfLinkNode(mCurrentId)) {
319 335
 				error(VisualDebugger::missingEndOfLinkNode);
320 336
 				return;
@@ -351,7 +367,12 @@ void VisualDebugger::debugSingleStep()
351 367
 				return;
352 368
 			}
353 369
 		} else {
354  
-			doStep(mLogicalModelApi.logicalRepoApi().outgoingLinks(mCurrentId).at(0));
  370
+			IdList outLinks = mLogicalModelApi.logicalRepoApi().outgoingLinks(mCurrentId);
  371
+			if (checkForIncorrectUseOfLink(outLinks.at(0), "ConditionControlFlow")) {
  372
+				return;
  373
+			}
  374
+			
  375
+			doStep(outLinks.at(0));
355 376
 
356 377
 			if (mBlockParser->hasErrors()) {
357 378
 				deinitialize();
@@ -397,6 +418,11 @@ void VisualDebugger::generateCode()
397 418
 void VisualDebugger::getConditionLinks(IdList const &outLinks, Id &falseEdge, Id &trueEdge)
398 419
 {
399 420
 	foreach (Id const &outLink, outLinks) {
  421
+		if (checkForIncorrectUseOfLink(outLink, "ControlFlow")) {
  422
+			error(codeGenerationError);
  423
+			return;
  424
+		}
  425
+		
400 426
 		bool type = getProperty(outLink, "type").toBool();
401 427
 		if (type) {
402 428
 			trueEdge = outLink;
@@ -419,6 +445,11 @@ void VisualDebugger::generateCode(Id const &id, QFile &codeFile)
419 445
 		codeFile.write("\n");
420 446
 		if (mLogicalModelApi.logicalRepoApi().outgoingLinks(id).count() != 0) {
421 447
 			Id const nextEdge = mLogicalModelApi.logicalRepoApi().outgoingLinks(id).at(0);
  448
+			if (checkForIncorrectUseOfLink(nextEdge, "ConditionControlFlow")) {
  449
+				error(codeGenerationError);
  450
+				return;
  451
+			}
  452
+			
422 453
 			generateCode(nextEdge, codeFile);
423 454
 		} else {
424 455
 			error(VisualDebugger::missingEndNode);
@@ -436,6 +467,10 @@ void VisualDebugger::generateCode(Id const &id, QFile &codeFile)
436 467
 
437 468
 			getConditionLinks(outLinks, falseEdge, trueEdge);
438 469
 
  470
+			if (mHasCodeGenerationError) {
  471
+				return;
  472
+			}
  473
+			
439 474
 			if (trueEdge == trueEdge.rootId()) {
440 475
 				error(VisualDebugger::missingValidLink);
441 476
 				error(codeGenerationError);
@@ -452,6 +487,10 @@ void VisualDebugger::generateCode(Id const &id, QFile &codeFile)
452 487
 			}
453 488
 	} else if (id.element() == "InitialNode") {
454 489
 		Id const nextEdge = mLogicalModelApi.logicalRepoApi().outgoingLinks(id).at(0);
  490
+		if (checkForIncorrectUseOfLink(nextEdge, "ConditionControlFlow")) {
  491
+			error(codeGenerationError);
  492
+			return;
  493
+		}
455 494
 		generateCode(nextEdge, codeFile);
456 495
 	} else if (id.element() == "BlockFinalNode") {
457 496
 		return;
@@ -478,6 +517,10 @@ void VisualDebugger::createIdByLineCorrelation(Id const &id, int& line)
478 517
 
479 518
 		if (mLogicalModelApi.logicalRepoApi().outgoingLinks(id).count() != 0) {
480 519
 			Id const nextEdge = mLogicalModelApi.logicalRepoApi().outgoingLinks(id).at(0);
  520
+			if (checkForIncorrectUseOfLink(nextEdge, "ConditionControlFlow")) {
  521
+				error(codeGenerationError);
  522
+				return;
  523
+			}
481 524
 			createIdByLineCorrelation(nextEdge, line);
482 525
 		} else {
483 526
 			error(missingEndNode);
@@ -491,6 +534,10 @@ void VisualDebugger::createIdByLineCorrelation(Id const &id, int& line)
491 534
 		Id trueEdge = trueEdge.rootId();
492 535
 
493 536
 		getConditionLinks(outLinks, falseEdge, trueEdge);
  537
+		
  538
+		if (mHasCodeGenerationError) {
  539
+			return;
  540
+		}
494 541
 
495 542
 		createIdByLineCorrelation(trueEdge, line);
496 543
 		line++;
@@ -502,6 +549,10 @@ void VisualDebugger::createIdByLineCorrelation(Id const &id, int& line)
502 549
 		}
503 550
 	} else if (id.element() == "InitialNode") {
504 551
 		Id const nextEdge = mLogicalModelApi.logicalRepoApi().outgoingLinks(id).at(0);
  552
+		if (checkForIncorrectUseOfLink(nextEdge, "ConditionControlFlow")) {
  553
+			error(codeGenerationError);
  554
+			return;
  555
+		}
505 556
 		createIdByLineCorrelation(nextEdge, line);
506 557
 	} else if (id.element() == "BlockFinalNode") {
507 558
 		mIdByLineCorrelation[line] = id;
@@ -542,7 +593,7 @@ Id VisualDebugger::getIdByLine(int line)
542 593
 
543 594
 void VisualDebugger::highlight(Id const &id)
544 595
 {
545  
-	mInterpretersInterface.highlight(id);
  596
+	mInterpretersInterface.highlight(id, true);
546 597
 }
547 598
 
548 599
 void VisualDebugger::dehighlight()
@@ -571,3 +622,12 @@ void VisualDebugger::setWorkDir(QString const &path)
571 622
 		mWorkDir = path + "/";
572 623
 	}
573 624
 }
  625
+
  626
+bool VisualDebugger::checkForIncorrectUseOfLink(Id const &link, QString const &type)
  627
+{
  628
+	bool res = link.element() == type;
  629
+	if (res) {
  630
+		error(incorrectUseOfLink);
  631
+	}
  632
+	return res;
  633
+}
3  plugins/blockDiagram/visualDebugSupport/interpreter/visualDebugger.h
@@ -69,6 +69,7 @@ public slots:
69 69
 		missingValidLink,
70 70
 		someDiagramIsRunning,
71 71
 		codeGenerationError,
  72
+		incorrectUseOfLink,
72 73
 		noErrors
73 74
 	};
74 75
 	
@@ -94,6 +95,8 @@ public slots:
94 95
 	/// Interpret action in one block
95 96
 	void processAction();
96 97
 	
  98
+	bool checkForIncorrectUseOfLink(Id const &link, QString const &type);
  99
+	
97 100
 	void setTimeout(int timeout);
98 101
 	void generateCode(Id const &id, QFile &codeFile);
99 102
 	QVariant getProperty(Id const &id, QString const &propertyName);
14  plugins/blockDiagram/visualDebugSupport/visualDebugSupport.pro
@@ -9,18 +9,18 @@ LIBS += -L../../../bin -lqrkernel -lqrutils
9 9
 TRANSLATIONS = visualDebugSupport_ru.ts
10 10
 
11 11
 HEADERS = \
12  
-	visualDebuggerPlugin.h \
13  
-	visualDebuggerPreferencesPage.h \
14  
-	../../../qrgui/dialogs/preferencesPages/preferencesPage.h
  12
+	$$PWD/visualDebuggerPlugin.h \
  13
+	$$PWD/visualDebuggerPreferencesPage.h \
  14
+	$$PWD/../../../qrgui/dialogs/preferencesPages/preferencesPage.h
15 15
 
16 16
 SOURCES = \
17  
-	visualDebuggerPlugin.cpp \
18  
-	visualDebuggerPreferencesPage.cpp
  17
+	$$PWD/visualDebuggerPlugin.cpp \
  18
+	$$PWD/visualDebuggerPreferencesPage.cpp
19 19
 
20 20
 FORMS += \
21  
-	visualDebuggerPreferencesPage.ui
  21
+	$$PWD/visualDebuggerPreferencesPage.ui
22 22
 
23 23
 RESOURCES += \
24  
-	visualDebugger.qrc
  24
+	$$PWD/visualDebugger.qrc
25 25
 
26 26
 include(interpreter/interpreter.pri)
BIN  plugins/blockDiagram/visualDebugSupport/visualDebugSupport_ru.qm
Binary file not shown
73  plugins/blockDiagram/visualDebugSupport/visualDebugSupport_ru.ts
@@ -9,17 +9,17 @@
9 9
         <translation type="unfinished">Настройки визуального отладчика</translation>
10 10
     </message>
11 11
     <message>
12  
-        <location filename="visualDebuggerPreferencesPage.ui" line="26"/>
  12
+        <location filename="visualDebuggerPreferencesPage.ui" line="58"/>
13 13
         <source>Builder path:</source>
14 14
         <translation type="unfinished">Путь к компилятору:</translation>
15 15
     </message>
16 16
     <message>
17  
-        <location filename="visualDebuggerPreferencesPage.ui" line="48"/>
  17
+        <location filename="visualDebuggerPreferencesPage.ui" line="84"/>
18 18
         <source>Debugger path:</source>
19 19
         <translation type="unfinished">Путь к отладчику:</translation>
20 20
     </message>
21 21
     <message>
22  
-        <location filename="visualDebuggerPreferencesPage.ui" line="61"/>
  22
+        <location filename="visualDebuggerPreferencesPage.ui" line="30"/>
23 23
         <source>Visual debugger working
24 24
 directory:</source>
25 25
         <oldsource>Visual debugger
@@ -28,7 +28,7 @@ working directory:</oldsource>
28 28
 визуального отладчика:</translation>
29 29
     </message>
30 30
     <message>
31  
-        <location filename="visualDebuggerPreferencesPage.ui" line="75"/>
  31
+        <location filename="visualDebuggerPreferencesPage.ui" line="51"/>
32 32
         <source>Generated code file name:</source>
33 33
         <oldsource>Generated
34 34
 code file name:</oldsource>
@@ -36,15 +36,15 @@ code file name:</oldsource>
36 36
 файла с исходниками:</translation>
37 37
     </message>
38 38
     <message>
39  
-        <location filename="visualDebuggerPreferencesPage.ui" line="88"/>
  39
+        <location filename="visualDebuggerPreferencesPage.ui" line="94"/>
40 40
         <source>Builded file name:</source>
41 41
         <translation type="unfinished">Название скомпилирован-
42 42
 ного исполняемого файла:</translation>
43 43
     </message>
44 44
     <message>
45  
-        <location filename="visualDebuggerPreferencesPage.ui" line="151"/>
46  
-        <location filename="visualDebuggerPreferencesPage.ui" line="164"/>
47  
-        <location filename="visualDebuggerPreferencesPage.ui" line="177"/>
  45
+        <location filename="visualDebuggerPreferencesPage.ui" line="23"/>
  46
+        <location filename="visualDebuggerPreferencesPage.ui" line="44"/>
  47
+        <location filename="visualDebuggerPreferencesPage.ui" line="71"/>
48 48
         <source>...</source>
49 49
         <translation type="unfinished">...</translation>
50 50
     </message>
@@ -112,49 +112,54 @@ code file name:</oldsource>
112 112
 <context>
113 113
     <name>qReal::VisualDebugger</name>
114 114
     <message>
115  
-        <location filename="interpreter/visualDebugger.cpp" line="110"/>
  115
+        <location filename="interpreter/visualDebugger.cpp" line="111"/>
116 116
         <source>The diagram doesn&apos;t have Initial Node</source>
117 117
         <translation type="unfinished">Диаграмма не имеет начального элемента</translation>
118 118
     </message>
119 119
     <message>
120  
-        <location filename="interpreter/visualDebugger.cpp" line="114"/>
  120
+        <location filename="interpreter/visualDebugger.cpp" line="115"/>
121 121
         <source>The diagram doesn&apos;t end with Final Node</source>
122 122
         <translation type="unfinished">Диаграмма закончилась не на конечном элементе</translation>
123 123
     </message>
124 124
     <message>
125  
-        <location filename="interpreter/visualDebugger.cpp" line="118"/>
  125
+        <location filename="interpreter/visualDebugger.cpp" line="119"/>
126 126
         <source>The diagram cann&apos;t end with edge</source>
127 127
         <translation type="unfinished">Диаграмма не может закончиться на ребре</translation>
128 128
     </message>
129 129
     <message>
130  
-        <location filename="interpreter/visualDebugger.cpp" line="122"/>
  130
+        <location filename="interpreter/visualDebugger.cpp" line="123"/>
131 131
         <source>There are no links from this node and it mismatches Final Node</source>
132 132
         <translation type="unfinished">У этого элемента нет рёбер, и он не совпадает с конечным элементом</translation>
133 133
     </message>
134 134
     <message>
135  
-        <location filename="interpreter/visualDebugger.cpp" line="127"/>
  135
+        <location filename="interpreter/visualDebugger.cpp" line="128"/>
136 136
         <source>The condition doesn&apos;t have valid link</source>
137 137
         <translation type="unfinished">Условие не имеет корректного ребра</translation>
138 138
     </message>
139 139
     <message>
140  
-        <location filename="interpreter/visualDebugger.cpp" line="131"/>
  140
+        <location filename="interpreter/visualDebugger.cpp" line="132"/>
141 141
         <source>Some diagram is already under debug</source>
142 142
         <translation type="unfinished">Некоторая диаграмма уже отлаживается</translation>
143 143
     </message>
144 144
     <message>
145  
-        <location filename="interpreter/visualDebugger.cpp" line="137"/>
  145
+        <location filename="interpreter/visualDebugger.cpp" line="138"/>
146 146
         <source>Code generation failed</source>
147 147
         <translation type="unfinished">Ошибка генерации исходного кода</translation>
148 148
     </message>
149 149
     <message>
150  
-        <location filename="interpreter/visualDebugger.cpp" line="299"/>
  150
+        <location filename="interpreter/visualDebugger.cpp" line="143"/>
  151
+        <source>Incorrect type of link used</source>
  152
+        <translation type="unfinished">Используется некорректый тип связи элементов</translation>
  153
+    </message>
  154
+    <message>
  155
+        <location filename="interpreter/visualDebugger.cpp" line="314"/>
151 156
         <source>Debug finished successfully</source>
152 157
         <translation type="unfinished">Отладка завершена успешно</translation>
153 158
     </message>
154 159
     <message>
155  
-        <location filename="interpreter/visualDebugger.cpp" line="336"/>
156  
-        <location filename="interpreter/visualDebugger.cpp" line="362"/>
157  
-        <location filename="interpreter/visualDebugger.cpp" line="367"/>
  160
+        <location filename="interpreter/visualDebugger.cpp" line="353"/>
  161
+        <location filename="interpreter/visualDebugger.cpp" line="384"/>
  162
+        <location filename="interpreter/visualDebugger.cpp" line="389"/>
158 163
         <source>Debug (single step) finished successfully</source>
159 164
         <translation type="unfinished">Один шаг отладки завершён успешно</translation>
160 165
     </message>
@@ -190,77 +195,77 @@ code file name:</oldsource>
190 195
         <translation type="unfinished">Интерпретировать (автоматический режим)</translation>
191 196
     </message>
192 197
     <message>
193  
-        <location filename="visualDebuggerPlugin.cpp" line="58"/>
  198
+        <location filename="visualDebuggerPlugin.cpp" line="59"/>
194 199
         <source>Interpret (one step)</source>
195 200
         <translation type="unfinished">Интерпретировать (один шаг)</translation>
196 201
     </message>
197 202
     <message>
198  
-        <location filename="visualDebuggerPlugin.cpp" line="62"/>
  203
+        <location filename="visualDebuggerPlugin.cpp" line="64"/>
199 204
         <source>Show watch list</source>
200 205
         <translation type="unfinished">Показать список переменных</translation>
201 206
     </message>
202 207
     <message>
203  
-        <location filename="visualDebuggerPlugin.cpp" line="67"/>
  208
+        <location filename="visualDebuggerPlugin.cpp" line="70"/>
204 209
         <source>Visual debug (with gdb)</source>
205 210
         <translation type="unfinished">Визуальная отладка (при помощи gdb)</translation>
206 211
     </message>
207 212
     <message>
208  
-        <location filename="visualDebuggerPlugin.cpp" line="70"/>
  213
+        <location filename="visualDebuggerPlugin.cpp" line="73"/>
209 214
         <source>Generate and build</source>
210 215
         <translation type="unfinished">Сгенерировать и скомпилировать</translation>
211 216
     </message>
212 217
     <message>
213  
-        <location filename="visualDebuggerPlugin.cpp" line="74"/>
  218
+        <location filename="visualDebuggerPlugin.cpp" line="78"/>
214 219
         <source>Start debugger (gdb)</source>
215 220
         <translation type="unfinished">Запустить отладчик (gdb)</translation>
216 221
     </message>
217 222
     <message>
218  
-        <location filename="visualDebuggerPlugin.cpp" line="90"/>
  223
+        <location filename="visualDebuggerPlugin.cpp" line="98"/>
219 224
         <source>run</source>
220 225
         <translation type="unfinished">Запустить отладку в gdb</translation>
221 226
     </message>
222 227
     <message>
223  
-        <location filename="visualDebuggerPlugin.cpp" line="102"/>
  228
+        <location filename="visualDebuggerPlugin.cpp" line="113"/>
224 229
         <source>kill</source>
225 230
         <translation type="unfinished">Остановить отладку в gdb</translation>
226 231
     </message>
227 232
     <message>
228  
-        <location filename="visualDebuggerPlugin.cpp" line="110"/>
  233
+        <location filename="visualDebuggerPlugin.cpp" line="123"/>
229 234
         <source>Cancel debug</source>
230 235
         <translation type="unfinished">Закончить отладку</translation>
231 236
     </message>
232 237
     <message>
233  
-        <location filename="visualDebuggerPlugin.cpp" line="98"/>
  238
+        <location filename="visualDebuggerPlugin.cpp" line="108"/>
234 239
         <source>cont</source>
235 240
         <translation type="unfinished">Перейти к следующей точки останова</translation>
236 241
     </message>
237 242
     <message>
238  
-        <location filename="visualDebuggerPlugin.cpp" line="94"/>
  243
+        <location filename="visualDebuggerPlugin.cpp" line="103"/>
239 244
         <source>next</source>
240 245
         <translation type="unfinished">Перейти к следующей строчке</translation>
241 246
     </message>
242 247
     <message>
243  
-        <location filename="visualDebuggerPlugin.cpp" line="82"/>
  248
+        <location filename="visualDebuggerPlugin.cpp" line="93"/>
244 249
         <source>Set breakpoints on each element</source>
245 250
         <translation type="unfinished">Поставить точки останова на каждом элементе диаграммы</translation>
246 251
     </message>
247 252
     <message>
248  
-        <location filename="visualDebuggerPlugin.cpp" line="78"/>
  253
+        <location filename="visualDebuggerPlugin.cpp" line="83"/>
249 254
         <source>Configure</source>
250 255
         <translation type="unfinished">Настроить gdb</translation>
251 256
     </message>
252 257
     <message>
253  
-        <location filename="visualDebuggerPlugin.cpp" line="86"/>
  258
+        <location filename="visualDebuggerPlugin.cpp" line="88"/>
254 259
         <source>Set breakpoint at start</source>
255 260