comparison: src/toolsets/extprogramtoolset.cpp
src/toolsets/extprogramtoolset.cpp
- changeset 998
- 5be0ce31ce60
- parent 984
- a7b6f987d269
- child 1009
- 85fd352bae45
equal
deleted
inserted
replaced
| 997:1b49f34e533d | 998:5be0ce31ce60 |
|---|---|
| 32 #include "../mainwindow.h" | 32 #include "../mainwindow.h" |
| 33 #include "../ldDocument.h" | 33 #include "../ldDocument.h" |
| 34 #include "../radioGroup.h" | 34 #include "../radioGroup.h" |
| 35 #include "../editHistory.h" | 35 #include "../editHistory.h" |
| 36 #include "../dialogs.h" | 36 #include "../dialogs.h" |
| 37 #include "../documentmanager.h" | |
| 37 #include "extprogramtoolset.h" | 38 #include "extprogramtoolset.h" |
| 38 #include "ui_ytruder.h" | 39 #include "ui_ytruder.h" |
| 39 #include "ui_intersector.h" | 40 #include "ui_intersector.h" |
| 40 #include "ui_rectifier.h" | 41 #include "ui_rectifier.h" |
| 41 #include "ui_coverer.h" | 42 #include "ui_coverer.h" |
| 313 { | 314 { |
| 314 Critical (format ("Couldn't open temporary file %1 for reading.\n", fname)); | 315 Critical (format ("Couldn't open temporary file %1 for reading.\n", fname)); |
| 315 return; | 316 return; |
| 316 } | 317 } |
| 317 | 318 |
| 318 LDObjectList objs = LoadFileContents (&f, nullptr); | 319 // TODO: I don't like how I need to go to the document manager to load objects from a file... |
| 320 // We're not loading this as a document so it shouldn't be necessary. | |
| 321 LDObjectList objs = m_documents->loadFileContents (&f, nullptr, nullptr); | |
| 319 | 322 |
| 320 // If we replace the objects, delete the selection now. | 323 // If we replace the objects, delete the selection now. |
| 321 if (replace) | 324 if (replace) |
| 322 m_window->deleteSelection(); | 325 m_window->deleteSelection(); |
| 323 | 326 |
