Sun, 10 Jun 2018 23:25:08 +0300
some rework in description
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
1 | /* |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
2 | * LDForge: LDraw parts authoring CAD |
1326 | 3 | * Copyright (C) 2013 - 2018 Teemu Piippo |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
4 | * |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
5 | * This program is free software: you can redistribute it and/or modify |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
6 | * it under the terms of the GNU General Public License as published by |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
7 | * the Free Software Foundation, either version 3 of the License, or |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
8 | * (at your option) any later version. |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
9 | * |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
10 | * This program is distributed in the hope that it will be useful, |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
13 | * GNU General Public License for more details. |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
14 | * |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
15 | * You should have received a copy of the GNU General Public License |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
17 | */ |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
18 | |
1039 | 19 | #include <QApplication> |
1156
c20ee66b6705
Removed the Critical and Question functions, replaced with direct QMessageBox uses. Removed unused code from mainwindow.h.
Teemu Piippo <teemu@hecknology.net>
parents:
1149
diff
changeset
|
20 | #include <QMessageBox> |
1145
02264bf0108d
Renamed ldDocument.cpp → lddocument.cpp
Teemu Piippo <teemu@hecknology.net>
parents:
1141
diff
changeset
|
21 | #include "lddocument.h" |
962
a4b463a7ee82
Rename MainWindow files
Teemu Piippo <crimsondusk64@gmail.com>
parents:
958
diff
changeset
|
22 | #include "mainwindow.h" |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
23 | #include "primitives.h" |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
24 | #include "colors.h" |
998 | 25 | #include "documentmanager.h" |
1318
568fcfc6da71
removed unnecessary files and includes
Teemu Piippo <teemu@hecknology.net>
parents:
1312
diff
changeset
|
26 | #include "editHistory.h" |
1319 | 27 | #include "algorithms/geometry.h" |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
28 | #include "generics/ring.h" |
1117
efcb47c64a72
Moved LDComment and LDEmpty into their own source file pairs.
Teemu Piippo <teemu@hecknology.net>
parents:
1090
diff
changeset
|
29 | #include "linetypes/comment.h" |
1141
7dc2c981937e
Split LDConditionalEdge and LDEdgeLine into new source pairs
Teemu Piippo <teemu@hecknology.net>
parents:
1139
diff
changeset
|
30 | #include "linetypes/conditionaledge.h" |
7dc2c981937e
Split LDConditionalEdge and LDEdgeLine into new source pairs
Teemu Piippo <teemu@hecknology.net>
parents:
1139
diff
changeset
|
31 | #include "linetypes/edgeline.h" |
1117
efcb47c64a72
Moved LDComment and LDEmpty into their own source file pairs.
Teemu Piippo <teemu@hecknology.net>
parents:
1090
diff
changeset
|
32 | #include "linetypes/empty.h" |
1149
502c866b8512
Moved LDQuadrilateral into its own source pair.
Teemu Piippo <teemu@hecknology.net>
parents:
1148
diff
changeset
|
33 | #include "linetypes/quadrilateral.h" |
1148
96cb15a7611f
Moved LDTriangle into its own source pair.
Teemu Piippo <teemu@hecknology.net>
parents:
1145
diff
changeset
|
34 | #include "linetypes/triangle.h" |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
35 | |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
36 | PrimitiveManager::PrimitiveManager(QObject* parent) : |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
37 | QAbstractItemModel {parent}, |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
38 | HierarchyElement {parent}, |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
39 | m_activeScanner {nullptr}, |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
40 | m_unmatched {nullptr} {} |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
41 | |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
42 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
43 | PrimitiveScanner* PrimitiveManager::activeScanner() |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
44 | { |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
45 | return m_activeScanner; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
46 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
47 | |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
48 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
49 | QString PrimitiveManager::getPrimitivesCfgPath() const |
971
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
970
diff
changeset
|
50 | { |
1332
1fffb24d4ffe
replaced remaining DIRSLASH, Dirname and Basename uses with Qt file info stuff
Teemu Piippo <teemu@hecknology.net>
parents:
1326
diff
changeset
|
51 | return QDir {qApp->applicationDirPath()}.filePath("prims.cfg"); |
971
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
970
diff
changeset
|
52 | } |
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
970
diff
changeset
|
53 | |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
54 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
55 | void PrimitiveManager::loadPrimitives() |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
56 | { |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
57 | // Try to load prims.cfg |
1054 | 58 | QFile primitivesFile = {getPrimitivesCfgPath()}; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
59 | |
1054 | 60 | if (not primitivesFile.open (QIODevice::ReadOnly)) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
61 | { |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
62 | // No prims.cfg, build it |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
63 | startScan(); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
64 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
65 | else |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
66 | { |
1285
0d165d277562
added signal emissions
Teemu Piippo <teemu@hecknology.net>
parents:
1284
diff
changeset
|
67 | emit layoutAboutToBeChanged(); |
0d165d277562
added signal emissions
Teemu Piippo <teemu@hecknology.net>
parents:
1284
diff
changeset
|
68 | m_primitives.clear(); |
0d165d277562
added signal emissions
Teemu Piippo <teemu@hecknology.net>
parents:
1284
diff
changeset
|
69 | |
1054 | 70 | while (not primitivesFile.atEnd()) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
71 | { |
1054 | 72 | QString line = primitivesFile.readLine().simplified(); |
73 | int space = line.indexOf(" "); | |
790
fe1b83f6ba82
- added primitives toolbox
Santeri Piippo <crimsondusk64@gmail.com>
parents:
784
diff
changeset
|
74 | |
1054 | 75 | if (space != -1) |
76 | { | |
77 | Primitive info; | |
78 | info.name = line.left(space); | |
79 | info.title = line.mid(space + 1); | |
80 | m_primitives.append(info); | |
81 | } | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
82 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
83 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
84 | populateCategories(); |
1285
0d165d277562
added signal emissions
Teemu Piippo <teemu@hecknology.net>
parents:
1284
diff
changeset
|
85 | emit layoutChanged(); |
1065
c8ecddbd99e9
Actually, let's call it countof(). Makes more sense.
Teemu Piippo <teemu@hecknology.net>
parents:
1064
diff
changeset
|
86 | print(tr("%1 primitives loaded.") + "\n", countof(m_primitives)); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
87 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
88 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
89 | |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
90 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
91 | void PrimitiveManager::startScan() |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
92 | { |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
93 | if (m_activeScanner == nullptr) |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
94 | { |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
95 | loadCategories(); |
1054 | 96 | m_activeScanner = new PrimitiveScanner {this}; |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
97 | m_activeScanner->work(); |
1054 | 98 | connect(m_activeScanner, &PrimitiveScanner::workDone, this, [&]() |
99 | { | |
100 | if (m_activeScanner) | |
101 | { | |
1284 | 102 | emit layoutAboutToBeChanged(); |
1054 | 103 | m_primitives = m_activeScanner->scannedPrimitives(); |
104 | populateCategories(); | |
1284 | 105 | emit layoutChanged(); |
1065
c8ecddbd99e9
Actually, let's call it countof(). Makes more sense.
Teemu Piippo <teemu@hecknology.net>
parents:
1064
diff
changeset
|
106 | print(tr("%1 primitives scanned"), countof(m_primitives)); |
1054 | 107 | delete m_activeScanner; |
108 | m_activeScanner = nullptr; | |
109 | } | |
110 | }); | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
111 | } |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
112 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
113 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
114 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
115 | void PrimitiveManager::clearCategories() |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
116 | { |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
117 | for (PrimitiveCategory* category : m_categories) |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
118 | delete category; |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
119 | |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
120 | m_categories.clear(); |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
121 | } |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
122 | |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
123 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
124 | void PrimitiveManager::populateCategories() |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
125 | { |
791
b1eae3a56eda
- sort primitive categories alphabetically
Santeri Piippo <crimsondusk64@gmail.com>
parents:
790
diff
changeset
|
126 | loadCategories(); |
b1eae3a56eda
- sort primitive categories alphabetically
Santeri Piippo <crimsondusk64@gmail.com>
parents:
790
diff
changeset
|
127 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
128 | for (PrimitiveCategory* category : m_categories) |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
129 | category->primitives.clear(); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
130 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
131 | for (Primitive& primitive : m_primitives) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
132 | { |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
133 | bool matched = false; |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
134 | primitive.category = nullptr; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
135 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
136 | // Go over the categories and their regexes, if and when there's a match, |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
137 | // the primitive's category is set to the category the regex beloings to. |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
138 | for (PrimitiveCategory* category : m_categories) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
139 | { |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
140 | for (PrimitiveCategory::RegexEntry& entry : category->patterns) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
141 | { |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
142 | switch (entry.type) |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
143 | { |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
144 | case PrimitiveCategory::FilenamePattern: |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
145 | // f-regex, check against filename |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
146 | matched = entry.regex.exactMatch (primitive.name); |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
147 | break; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
148 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
149 | case PrimitiveCategory::TitlePattern: |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
150 | // t-regex, check against title |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
151 | matched = entry.regex.exactMatch (primitive.title); |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
152 | break; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
153 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
154 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
155 | if (matched) |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
156 | { |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
157 | primitive.category = category; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
158 | break; |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
159 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
160 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
161 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
162 | // Drop off if a category was decided on. |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
163 | if (primitive.category) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
164 | break; |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
165 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
166 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
167 | // If there was a match, add the primitive to the category. |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
168 | // Otherwise, add it to the list of unmatched primitives. |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
169 | if (primitive.category) |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
170 | primitive.category->primitives << primitive; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
171 | else |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
172 | m_unmatched->primitives << primitive; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
173 | } |
791
b1eae3a56eda
- sort primitive categories alphabetically
Santeri Piippo <crimsondusk64@gmail.com>
parents:
790
diff
changeset
|
174 | |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
175 | // Sort the categories. Note that we only do this here because we needed the original order for pattern matching. |
1320
bdb4804bc09c
Moved includes, added squared() function
Teemu Piippo <teemu@hecknology.net>
parents:
1319
diff
changeset
|
176 | ::sort(m_categories.begin(), m_categories.end(), |
1054 | 177 | [](PrimitiveCategory* const& one, PrimitiveCategory* const& other) -> bool |
791
b1eae3a56eda
- sort primitive categories alphabetically
Santeri Piippo <crimsondusk64@gmail.com>
parents:
790
diff
changeset
|
178 | { |
1054 | 179 | return one->name() < other->name(); |
791
b1eae3a56eda
- sort primitive categories alphabetically
Santeri Piippo <crimsondusk64@gmail.com>
parents:
790
diff
changeset
|
180 | }); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
181 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
182 | |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
183 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
184 | void PrimitiveManager::loadCategories() |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
185 | { |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
186 | clearCategories(); |
971
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
970
diff
changeset
|
187 | QString path = ":/data/primitive-categories.cfg"; |
1054 | 188 | QFile categoriesFile = {path}; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
189 | |
1054 | 190 | if (not categoriesFile.open (QIODevice::ReadOnly)) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
191 | { |
1156
c20ee66b6705
Removed the Critical and Question functions, replaced with direct QMessageBox uses. Removed unused code from mainwindow.h.
Teemu Piippo <teemu@hecknology.net>
parents:
1149
diff
changeset
|
192 | QString message = format(tr("Failed to open primitive categories: %1"), categoriesFile.errorString()); |
c20ee66b6705
Removed the Critical and Question functions, replaced with direct QMessageBox uses. Removed unused code from mainwindow.h.
Teemu Piippo <teemu@hecknology.net>
parents:
1149
diff
changeset
|
193 | QMessageBox::critical(m_window, tr("Cannot open categories"), message); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
194 | return; |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
195 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
196 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
197 | PrimitiveCategory* category = nullptr; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
198 | |
1054 | 199 | while (not categoriesFile.atEnd()) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
200 | { |
1054 | 201 | QString line = QString::fromUtf8(categoriesFile.readLine()).trimmed(); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
202 | |
1064
4c7a353cf583
Replaced '.length()' with 'length()' where appropriate
Teemu Piippo <teemu@hecknology.net>
parents:
1063
diff
changeset
|
203 | if (line.isEmpty() or line[0] == '#') |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
204 | continue; |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
205 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
206 | int colon = line.indexOf (":"); |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
207 | if (colon == -1) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
208 | { |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
209 | if (category and category->isValidToInclude()) |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
210 | { |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
211 | m_categories << category; |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
212 | } |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
213 | else if (category) |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
214 | { |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
215 | print (tr ("Warning: Category \"%1\" left without patterns"), category->name()); |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
216 | delete category; |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
217 | } |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
218 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
219 | category = new PrimitiveCategory (line); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
220 | } |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
221 | else if (category) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
222 | { |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
223 | QString typechar = line.left (colon); |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
224 | PrimitiveCategory::PatternType type = PrimitiveCategory::FilenamePattern; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
225 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
226 | if (typechar == "f") |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
227 | { |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
228 | type = PrimitiveCategory::FilenamePattern; |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
229 | } |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
230 | else if (typechar == "t") |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
231 | { |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
232 | type = PrimitiveCategory::TitlePattern; |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
233 | } |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
234 | else |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
235 | { |
1054 | 236 | print(tr("Warning: unknown pattern type \"%1\" on line \"%2\""), typechar, line); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
237 | continue; |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
238 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
239 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
240 | QRegExp regex (line.mid (colon + 1)); |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
241 | PrimitiveCategory::RegexEntry entry = { regex, type }; |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
242 | category->patterns << entry; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
243 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
244 | else |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
245 | { |
1054 | 246 | print("Warning: Rules given before the first category name"); |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
247 | } |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
248 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
249 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
250 | if (category->isValidToInclude()) |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
251 | m_categories << category; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
252 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
253 | // Add a category for unmatched primitives. |
1054 | 254 | // Note: if this function is called the second time, m_unmatched has been |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
255 | // deleted at the beginning of the function and is dangling at this point. |
1054 | 256 | m_unmatched = new PrimitiveCategory {tr("Other")}; |
257 | m_categories.append(m_unmatched); | |
258 | categoriesFile.close(); | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
259 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
260 | |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
261 | // Length of a single LDraw edge circle segment. Ideally, it is sqrt(2 - 2 * cos(π / 8)), but |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
262 | // rounding errors come into play so it's a tiny bit larger than that. |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
263 | // This actual value is given by: hypot(0.0761, 0.3827) |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
264 | static const double chordLength = 0.3901929010117944; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
265 | |
1391
5fa4bf1fc781
added work done on cylinders
Teemu Piippo <teemu@hecknology.net>
parents:
1364
diff
changeset
|
266 | void PrimitiveModel::generateCylinder(Model& model, Winding winding) const |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
267 | { |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
268 | Q_ASSERT(this->type == Cylinder); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
269 | auto circle = makeCircle(this->segments, this->divisions, 1); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
270 | bool useTangents = (this->segments != this->divisions); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
271 | |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
272 | QPointF tangent_1; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
273 | QPointF tangent_2; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
274 | |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
275 | if (useTangents) |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
276 | { |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
277 | tangent_1 = {1.0, -chordLength}; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
278 | |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
279 | double angle = double(segments) * 2 * pi / double(divisions) + (pi / 2); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
280 | tangent_2 = { |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
281 | circle.last().p2().x() + chordLength * cos(angle), |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
282 | circle.last().p2().y() + chordLength * sin(angle), |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
283 | }; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
284 | } |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
285 | |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
286 | for (int i = 0; i < this->segments; i += 1) |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
287 | { |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
288 | double x0 = circle[i].x1(); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
289 | double x1 = circle[i].x2(); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
290 | double z0 = circle[i].y1(); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
291 | double z1 = circle[i].y2(); |
1391
5fa4bf1fc781
added work done on cylinders
Teemu Piippo <teemu@hecknology.net>
parents:
1364
diff
changeset
|
292 | double y1 = (winding == CounterClockwise) ? 0.0 : 1.0; |
5fa4bf1fc781
added work done on cylinders
Teemu Piippo <teemu@hecknology.net>
parents:
1364
diff
changeset
|
293 | double y2 = (winding == CounterClockwise) ? 1.0 : 0.0; |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
294 | |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
295 | LDQuadrilateral* quad = model.emplace<LDQuadrilateral>( |
1391
5fa4bf1fc781
added work done on cylinders
Teemu Piippo <teemu@hecknology.net>
parents:
1364
diff
changeset
|
296 | Vertex {x1, y1, z1}, |
5fa4bf1fc781
added work done on cylinders
Teemu Piippo <teemu@hecknology.net>
parents:
1364
diff
changeset
|
297 | Vertex {x0, y1, z0}, |
5fa4bf1fc781
added work done on cylinders
Teemu Piippo <teemu@hecknology.net>
parents:
1364
diff
changeset
|
298 | Vertex {x0, y2, z0}, |
5fa4bf1fc781
added work done on cylinders
Teemu Piippo <teemu@hecknology.net>
parents:
1364
diff
changeset
|
299 | Vertex {x1, y2, z1} |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
300 | ); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
301 | quad->setColor(MainColor); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
302 | } |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
303 | |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
304 | for (int i = 0; i < this->segments + 1; i += 1) |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
305 | { |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
306 | QPointF p0 = ::pointOnLDrawCircumference(i, divisions); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
307 | QPointF p2 = ::pointOnLDrawCircumference(i - 1, divisions); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
308 | QPointF p3 = ::pointOnLDrawCircumference(i + 1, divisions); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
309 | |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
310 | if (useTangents and i == 0) |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
311 | p2 = tangent_1; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
312 | else if (useTangents and i == this->segments) |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
313 | p3 = tangent_2; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
314 | |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
315 | Vertex v0 = {p0.x(), 1.0, p0.y()}; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
316 | Vertex v1 = {v0.x, 0.0, v0.z}; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
317 | Vertex v2 = {p2.x(), 1.0, p2.y()}; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
318 | Vertex v3 = {p3.x(), 1.0, p3.y()}; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
319 | LDConditionalEdge* line = model.emplace<LDConditionalEdge>(); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
320 | line->setColor(EdgeColor); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
321 | line->setVertex(0, v0); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
322 | line->setVertex(1, v1); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
323 | line->setVertex(2, v2); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
324 | line->setVertex(3, v3); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
325 | } |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
326 | } |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
327 | |
1398
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
328 | /* |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
329 | * Builds a circle primitive. |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
330 | */ |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
331 | void PrimitiveModel::generateCircle(Model& model) const |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
332 | { |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
333 | QVector<QLineF> circle = makeCircle(segments, divisions, 1); |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
334 | |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
335 | for (int i = 0; i < segments; ++i) |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
336 | { |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
337 | double x0 = circle[i].x1(); |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
338 | double x1 = circle[i].x2(); |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
339 | double z0 = circle[i].y1(); |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
340 | double z1 = circle[i].y2(); |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
341 | |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
342 | LDEdgeLine* line = model.emplace<LDEdgeLine>(); |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
343 | line->setVertex(0, Vertex {x0, 0.0f, z0}); |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
344 | line->setVertex(1, Vertex {x1, 0.0f, z1}); |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
345 | line->setColor(EdgeColor); |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
346 | } |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
347 | } |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
348 | |
1080
6dac2d52bd9a
Removed the LDSpawn function and replaced its last use cases.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
349 | void PrimitiveModel::generateBody(Model& model) const |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
350 | { |
1398
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
351 | switch (type) |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
352 | { |
1398
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
353 | case Cylinder: |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
354 | generateCylinder(model); |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
355 | return; |
1398
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
356 | |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
357 | case Circle: |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
358 | generateCircle(model); |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
359 | return; |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
360 | |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
361 | default: |
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
362 | break; |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
363 | } |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
364 | |
1053 | 365 | QVector<int> conditionalLineSegments; |
366 | QVector<QLineF> circle = makeCircle(segments, divisions, 1); | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
367 | |
1053 | 368 | for (int i = 0; i < segments; ++i) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
369 | { |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
370 | double x0 = circle[i].x1(); |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
371 | double x1 = circle[i].x2(); |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
372 | double z0 = circle[i].y1(); |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
373 | double z1 = circle[i].y2(); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
374 | |
1053 | 375 | switch (type) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
376 | { |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
377 | case Ring: |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
378 | case Cone: |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
379 | { |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
380 | double x2, x3, z2, z3; |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
381 | double y0, y1, y2, y3; |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
382 | x2 = x1 * (ringNumber + 1); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
383 | x3 = x0 * (ringNumber + 1); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
384 | z2 = z1 * (ringNumber + 1); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
385 | z3 = z0 * (ringNumber + 1); |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
386 | x0 *= ringNumber; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
387 | x1 *= ringNumber; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
388 | z0 *= ringNumber; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
389 | z1 *= ringNumber; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
390 | |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
391 | if (type == Ring) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
392 | { |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
393 | y0 = y1 = y2 = y3 = 0.0; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
394 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
395 | else |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
396 | { |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
397 | y0 = y1 = 1.0; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
398 | y2 = y3 = 0.0; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
399 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
400 | |
1053 | 401 | Vertex v0 = {x0, y0, z0}; |
402 | Vertex v1 = {x1, y1, z1}; | |
403 | Vertex v2 = {x2, y2, z2}; | |
404 | Vertex v3 = {x3, y3, z3}; | |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
405 | qSwap(v1, v3); |
1261
5d2c9d36da9d
Removed LDObject::invert, inversion code moved to basic toolset
Santeri Piippo
parents:
1156
diff
changeset
|
406 | |
1139
51303023d651
LDObject subclass renaming:
Teemu Piippo <teemu@hecknology.net>
parents:
1117
diff
changeset
|
407 | LDQuadrilateral* quad = model.emplace<LDQuadrilateral>(v0, v1, v2, v3); |
1054 | 408 | quad->setColor(MainColor); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
409 | |
1053 | 410 | if (type == Cylinder or type == Cone) |
411 | conditionalLineSegments.append(i); | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
412 | } |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
413 | break; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
414 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
415 | case Disc: |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
416 | case DiscNegative: |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
417 | { |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
418 | double x2, z2; |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
419 | |
1053 | 420 | if (type == Disc) |
421 | { | |
422 | x2 = z2 = 0.0; | |
423 | } | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
424 | else |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
425 | { |
1053 | 426 | x2 = (x0 >= 0.0) ? 1.0 : -1.0; |
427 | z2 = (z0 >= 0.0) ? 1.0 : -1.0; | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
428 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
429 | |
1053 | 430 | Vertex v0 = {x0, 0.0, z0}; |
431 | Vertex v1 = {x1, 0.0, z1}; | |
432 | Vertex v2 = {x2, 0.0, z2}; | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
433 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
434 | // Disc negatives need to go the other way around, otherwise |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
435 | // they'll end up upside-down. |
1080
6dac2d52bd9a
Removed the LDSpawn function and replaced its last use cases.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
436 | LDTriangle* segment = model.emplace<LDTriangle>(); |
1053 | 437 | segment->setColor(MainColor); |
438 | segment->setVertex(type == Disc ? 0 : 2, v0); | |
439 | segment->setVertex(1, v1); | |
440 | segment->setVertex(type == Disc ? 2 : 0, v2); | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
441 | } |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
442 | break; |
1364 | 443 | |
1398
1c70d3447d20
changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents:
1391
diff
changeset
|
444 | case Circle: |
1364 | 445 | case Cylinder: |
446 | break; | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
447 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
448 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
449 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
450 | // If this is not a full circle, we need a conditional line at the other |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
451 | // end, too. |
1053 | 452 | if (segments < divisions and not conditionalLineSegments.isEmpty()) |
453 | conditionalLineSegments << segments; | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
454 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
455 | for (int i : conditionalLineSegments) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
456 | { |
1325
f9abfc7ba676
Use 4 points of precision for circle point coordinates
Teemu Piippo <teemu@hecknology.net>
parents:
1323
diff
changeset
|
457 | QPointF p0 = ::pointOnLDrawCircumference(i, divisions); |
1346
c4cb7dc850aa
reworked primitive generator
Teemu Piippo <teemu@hecknology.net>
parents:
1345
diff
changeset
|
458 | QPointF p2 = ::pointOnLDrawCircumference(i - 1, divisions); |
c4cb7dc850aa
reworked primitive generator
Teemu Piippo <teemu@hecknology.net>
parents:
1345
diff
changeset
|
459 | QPointF p3 = ::pointOnLDrawCircumference(i + 1, divisions); |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
460 | Vertex v0 = {p0.x() * ringNumber, 1.0, p0.y() * ringNumber}; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
461 | Vertex v1 = {v0.x * (ringNumber + 1), 0.0, v0.z * (ringNumber + 1)}; |
1319 | 462 | Vertex v2 = {p2.x(), 0.0, p2.y()}; |
463 | Vertex v3 = {p3.x(), 0.0, p3.y()}; | |
1347
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
464 | v2 *= ringNumber; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
465 | v3 *= ringNumber; |
7dd217202126
refactor cylinder generation
Teemu Piippo <teemu@hecknology.net>
parents:
1346
diff
changeset
|
466 | v2.y = v3.y = 1.0; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
467 | |
1139
51303023d651
LDObject subclass renaming:
Teemu Piippo <teemu@hecknology.net>
parents:
1117
diff
changeset
|
468 | LDConditionalEdge* line = model.emplace<LDConditionalEdge>(); |
1053 | 469 | line->setColor(EdgeColor); |
470 | line->setVertex(0, v0); | |
471 | line->setVertex(1, v1); | |
472 | line->setVertex(2, v2); | |
473 | line->setVertex(3, v3); | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
474 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
475 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
476 | |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
477 | |
1053 | 478 | QString PrimitiveModel::typeName() const |
479 | { | |
480 | return typeName(type); | |
481 | } | |
482 | ||
483 | ||
484 | QString PrimitiveModel::typeName(PrimitiveModel::Type type) | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
485 | { |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
486 | // Not translated as primitives are in English. |
1053 | 487 | const char* names[] = {"Circle", "Cylinder", "Disc", "Disc Negative", "Ring", "Cone"}; |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
488 | |
1065
c8ecddbd99e9
Actually, let's call it countof(). Makes more sense.
Teemu Piippo <teemu@hecknology.net>
parents:
1064
diff
changeset
|
489 | if (type >= 0 and type < countof(names)) |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
490 | return names[type]; |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
491 | else |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
492 | return "Unknown"; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
493 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
494 | |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
495 | |
1345
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
496 | QString PrimitiveModel::makeFileName(FilenameStyle style) const |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
497 | { |
1053 | 498 | int numerator = segments; |
499 | int denominator = divisions; | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
500 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
501 | // Simplify the fractional part, but the denominator must be at least 4. |
1053 | 502 | simplify(numerator, denominator); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
503 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
504 | if (denominator < 4) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
505 | { |
1053 | 506 | int factor = 4 / denominator; |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
507 | numerator *= factor; |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
508 | denominator *= factor; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
509 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
510 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
511 | // Compose some general information: prefix, fraction, root, ring number |
1339
1f342d5abc85
Added support for 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1334
diff
changeset
|
512 | QString prefix = (divisions == MediumResolution) ? "" : format ("%1\\", divisions); |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
513 | QString frac = format ("%1-%2", numerator, denominator); |
1053 | 514 | static const char* roots[] = {"edge", "cyli", "disc", "ndis", "ring", "con"}; |
515 | QString root = roots[type]; | |
516 | QString numberString = (type == Ring or type == Cone) ? format ("%1", ringNumber) : ""; | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
517 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
518 | // Truncate the root if necessary (7-16rin4.dat for instance). |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
519 | // However, always keep the root at least 2 characters. |
1345
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
520 | if (style == LegacyStyleName) |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
521 | { |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
522 | int extra = (countof(frac) + countof(numberString) + countof(root)) - 8; |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
523 | root.chop(qBound(0, extra, 2)); |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
524 | } |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
525 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
526 | // Stick them all together and return the result. |
1053 | 527 | return prefix + frac + root + numberString + ".dat"; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
528 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
529 | |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
530 | |
1053 | 531 | LDDocument* PrimitiveManager::generatePrimitive(const PrimitiveModel& spec) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
532 | { |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
533 | // Make the description |
1019
a2e4286adb0d
Split PrimitivePrompt into its new source files, renamed it to GeneratePrimitivePrompt
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1018
diff
changeset
|
534 | QString fraction = QString::number ((float) spec.segments / spec.divisions); |
1345
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
535 | QString fileName = spec.makeFileName(PrimitiveModel::NewStyleName); |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
536 | QString description; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
537 | |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
538 | // Ensure that there's decimals, even if they're 0. |
1054 | 539 | if (fraction.indexOf(".") == -1) |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
540 | fraction += ".0"; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
541 | |
1053 | 542 | if (spec.type == PrimitiveModel::Ring or spec.type == PrimitiveModel::Cone) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
543 | { |
1346
c4cb7dc850aa
reworked primitive generator
Teemu Piippo <teemu@hecknology.net>
parents:
1345
diff
changeset
|
544 | QString spacing = (spec.ringNumber < 10) ? " " : ""; |
1054 | 545 | description = format("%1 %2%3 x %4", PrimitiveModel::typeName(spec.type), spacing, spec.ringNumber, fraction); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
546 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
547 | else |
1346
c4cb7dc850aa
reworked primitive generator
Teemu Piippo <teemu@hecknology.net>
parents:
1345
diff
changeset
|
548 | { |
1054 | 549 | description = format("%1 %2", PrimitiveModel::typeName(spec.type), fraction); |
1346
c4cb7dc850aa
reworked primitive generator
Teemu Piippo <teemu@hecknology.net>
parents:
1345
diff
changeset
|
550 | } |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
551 | |
1340
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
552 | // Prepend "Hi-Res" or "Lo-Res" as appropriate. |
1019
a2e4286adb0d
Split PrimitivePrompt into its new source files, renamed it to GeneratePrimitivePrompt
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1018
diff
changeset
|
553 | if (spec.divisions == HighResolution) |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
554 | description.insert (0, "Hi-Res "); |
1340
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
555 | else if (spec.divisions == LowResolution) |
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
556 | description.insert (0, "Lo-Res "); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
557 | |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
558 | LDDocument* document = m_window->newDocument(); |
1053 | 559 | document->setDefaultName(fileName); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
560 | |
1323
05b3e173c900
Config is now a namespace
Teemu Piippo <teemu@hecknology.net>
parents:
1320
diff
changeset
|
561 | if (not config::defaultName().isEmpty()) |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
562 | { |
1340
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
563 | document->header.license = LDHeader::defaultLicense(); |
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
564 | document->header.author = format("%1 [%2]", config::defaultName(), config::defaultUser()); |
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
565 | } |
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
566 | else |
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
567 | { |
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
568 | document->header.author = APPNAME; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
569 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
570 | |
1090
ed73c4f48ca4
The current document pointer may no longer be null.
Teemu Piippo <teemu@hecknology.net>
parents:
1086
diff
changeset
|
571 | document->setFrozen(false); |
1312 | 572 | document->header.name = fileName; |
573 | document->header.description = description; | |
574 | ||
1340
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
575 | if (spec.divisions == HighResolution) |
1312 | 576 | document->header.type = LDHeader::Primitive_48; |
1340
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
577 | else if (spec.divisions == LowResolution) |
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
578 | document->header.type = LDHeader::Primitive_8; |
1312 | 579 | else |
1340
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
580 | document->header.type = LDHeader::Primitive; |
1312 | 581 | |
1323
05b3e173c900
Config is now a namespace
Teemu Piippo <teemu@hecknology.net>
parents:
1320
diff
changeset
|
582 | if (config::useCaLicense()) |
1312 | 583 | document->header.license = LDHeader::CaLicense; |
584 | else | |
585 | document->header.license =LDHeader::UnspecifiedLicense; | |
586 | ||
587 | document->setWinding(CounterClockwise); | |
1080
6dac2d52bd9a
Removed the LDSpawn function and replaced its last use cases.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
588 | spec.generateBody(*document); |
1340
ea1b3ea9a3ca
more work on 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents:
1339
diff
changeset
|
589 | document->history()->setIgnoring(false); |
978
4603d8fd063e
Make documents members of the main window
Teemu Piippo <crimsondusk64@gmail.com>
parents:
971
diff
changeset
|
590 | return document; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
591 | } |
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
592 | |
1053 | 593 | /* |
594 | * PrimitiveManager :: getPrimitive | |
595 | * | |
596 | * Gets a primitive by the given model. If the primitive cannot be found, it will be automatically generated. | |
597 | */ | |
598 | LDDocument* PrimitiveManager::getPrimitive(const PrimitiveModel& model) | |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
599 | { |
1345
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
600 | // Try find with the new style name. |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
601 | QString name = model.makeFileName(PrimitiveModel::NewStyleName); |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
602 | LDDocument* document = m_window->documents()->getDocumentByName(name); |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
603 | |
1090
ed73c4f48ca4
The current document pointer may no longer be null.
Teemu Piippo <teemu@hecknology.net>
parents:
1086
diff
changeset
|
604 | if (not document) |
ed73c4f48ca4
The current document pointer may no longer be null.
Teemu Piippo <teemu@hecknology.net>
parents:
1086
diff
changeset
|
605 | { |
1345
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
606 | // Not found, try the legacy name |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
607 | QString name = model.makeFileName(PrimitiveModel::LegacyStyleName); |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
608 | document = m_window->documents()->getDocumentByName(name); |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
609 | } |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
610 | |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
611 | if (not document) |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
612 | { |
1e345ed80a1d
added support for new style primitive names
Teemu Piippo <teemu@hecknology.net>
parents:
1340
diff
changeset
|
613 | // Not found either, generate it. |
1090
ed73c4f48ca4
The current document pointer may no longer be null.
Teemu Piippo <teemu@hecknology.net>
parents:
1086
diff
changeset
|
614 | document = generatePrimitive(model); |
ed73c4f48ca4
The current document pointer may no longer be null.
Teemu Piippo <teemu@hecknology.net>
parents:
1086
diff
changeset
|
615 | m_window->openDocumentForEditing(document); |
ed73c4f48ca4
The current document pointer may no longer be null.
Teemu Piippo <teemu@hecknology.net>
parents:
1086
diff
changeset
|
616 | } |
ed73c4f48ca4
The current document pointer may no longer be null.
Teemu Piippo <teemu@hecknology.net>
parents:
1086
diff
changeset
|
617 | |
ed73c4f48ca4
The current document pointer may no longer be null.
Teemu Piippo <teemu@hecknology.net>
parents:
1086
diff
changeset
|
618 | return document; |
655
b376645315ab
- renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
619 | } |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
620 | |
1053 | 621 | /* |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
622 | * Returns the amount of columns in the primitives tree (1) |
1053 | 623 | */ |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
624 | int PrimitiveManager::columnCount(const QModelIndex&) const |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
625 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
626 | return 1; |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
627 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
628 | |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
629 | /* |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
630 | * For an index that points to a primitive, returns the category that contains it |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
631 | */ |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
632 | static PrimitiveCategory* categoryForPrimitiveIndex(const QModelIndex& primitiveIndex) |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
633 | { |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
634 | return static_cast<PrimitiveCategory*>(primitiveIndex.internalPointer()); |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
635 | } |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
636 | |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
637 | /* |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
638 | * Returns data from the tree model. |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
639 | */ |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
640 | QVariant PrimitiveManager::data(const QModelIndex& index, int role) const |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
641 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
642 | if (index.isValid()) |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
643 | { |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
644 | if (categoryForPrimitiveIndex(index) != nullptr) |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
645 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
646 | // Index points to a primitive, return primitive information. |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
647 | Primitive& primitive = categoryForPrimitiveIndex(index)->primitives[index.row()]; |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
648 | |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
649 | switch(role) |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
650 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
651 | case Qt::DisplayRole: |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
652 | return format("%1 - %2", primitive.name, primitive.title); |
1297
389516787a4c
added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents:
1285
diff
changeset
|
653 | |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
654 | case Qt::DecorationRole: |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
655 | return MainWindow::getIcon("subfilereference"); |
1297
389516787a4c
added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents:
1285
diff
changeset
|
656 | |
389516787a4c
added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents:
1285
diff
changeset
|
657 | case PrimitiveNameRole: |
389516787a4c
added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents:
1285
diff
changeset
|
658 | return primitive.name; |
389516787a4c
added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents:
1285
diff
changeset
|
659 | |
389516787a4c
added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents:
1285
diff
changeset
|
660 | case PrimitiveDescriptionRole: |
389516787a4c
added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents:
1285
diff
changeset
|
661 | return primitive.title; |
389516787a4c
added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents:
1285
diff
changeset
|
662 | |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
663 | default: |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
664 | return {}; |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
665 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
666 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
667 | else |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
668 | { |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
669 | // Index points to a category, return category information. |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
670 | PrimitiveCategory* category = this->m_categories[index.row()]; |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
671 | |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
672 | switch (role) |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
673 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
674 | case Qt::DisplayRole: |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
675 | return category->name(); |
1297
389516787a4c
added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents:
1285
diff
changeset
|
676 | |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
677 | case Qt::DecorationRole: |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
678 | return MainWindow::getIcon("folder"); |
1297
389516787a4c
added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents:
1285
diff
changeset
|
679 | |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
680 | default: |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
681 | return {}; |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
682 | } |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
683 | } |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
684 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
685 | else |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
686 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
687 | // Index is invalid. |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
688 | return {}; |
1018
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
689 | } |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
690 | } |
49358df9495b
Transformed primitive management into a new class PrimitiveManager that is a member of MainWindow
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1014
diff
changeset
|
691 | |
1283
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
692 | /* |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
693 | * For a row and parent index, returns a child index. |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
694 | */ |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
695 | QModelIndex PrimitiveManager::index(int row, int, const QModelIndex& parent) const |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
696 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
697 | if (parent.isValid()) |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
698 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
699 | if (categoryForPrimitiveIndex(parent)) |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
700 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
701 | // Parent is a primitive index. Primitives cannot have children so return an |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
702 | // invalid index. |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
703 | return {}; |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
704 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
705 | else |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
706 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
707 | // Parent is a category, return an index to a primitive |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
708 | PrimitiveCategory* category = m_categories[parent.row()]; |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
709 | |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
710 | // Create an index inside the category |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
711 | if (row >= 0 and row < category->primitives.size()) |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
712 | return this->createIndex(row, 0, category); |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
713 | else |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
714 | return {}; |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
715 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
716 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
717 | else |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
718 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
719 | // Create a top-level index pointing to a category |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
720 | if (row >= 0 and row < this->m_categories.size()) |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
721 | return this->createIndex(row, 0, nullptr); |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
722 | else |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
723 | return {}; |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
724 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
725 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
726 | |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
727 | /* |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
728 | * For a primitive index, find the category index that contains it. |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
729 | */ |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
730 | QModelIndex PrimitiveManager::parent(const QModelIndex &index) const |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
731 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
732 | int row = this->m_categories.indexOf(categoryForPrimitiveIndex(index)); |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
733 | |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
734 | if (row != -1) |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
735 | return this->createIndex(row, 0, nullptr); |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
736 | else |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
737 | return {}; |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
738 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
739 | |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
740 | /* |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
741 | * Returns the amount of rows contained inside the given index. |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
742 | */ |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
743 | int PrimitiveManager::rowCount(const QModelIndex& parent) const |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
744 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
745 | if (parent.isValid()) |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
746 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
747 | if (categoryForPrimitiveIndex(parent)) |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
748 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
749 | // Primitives don't have child nodes, so return 0. |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
750 | return 0; |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
751 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
752 | else |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
753 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
754 | // For categories, return the amount of primitives contained. |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
755 | return this->m_categories[parent.row()]->primitives.size(); |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
756 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
757 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
758 | else |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
759 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
760 | // For top-level, return the amount of categories. |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
761 | return this->m_categories.size(); |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
762 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
763 | } |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
764 | |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
765 | /* |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
766 | * Returns a static "Primitives" text for the header. |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
767 | */ |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
768 | QVariant PrimitiveManager::headerData(int section, Qt::Orientation, int role) const |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
769 | { |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
770 | if (section == 0 and role == Qt::DisplayRole) |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
771 | return tr("Primitives"); |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
772 | else |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
773 | return {}; |
3c3a5eb965f7
added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents:
1261
diff
changeset
|
774 | } |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
775 | |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
776 | // |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
777 | // --------------------------------------------------------------------------------------------------------------------- |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
778 | // |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
779 | |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
780 | |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
781 | PrimitiveCategory::PrimitiveCategory (QString name, QObject* parent) : |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
782 | QObject (parent), |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
783 | m_name (name) {} |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
784 | |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
785 | |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
786 | bool PrimitiveCategory::isValidToInclude() |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
787 | { |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
788 | return not patterns.isEmpty(); |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
789 | } |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
790 | |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
791 | |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
792 | QString PrimitiveCategory::name() const |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
793 | { |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
794 | return m_name; |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
795 | } |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
796 | |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
797 | |
1055
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
798 | /* |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
799 | * PrimitiveScanner :: PrimitiveScanner |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
800 | * |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
801 | * Constructs a primitive scanner. |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
802 | */ |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
803 | PrimitiveScanner::PrimitiveScanner(PrimitiveManager* parent) : |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
804 | QObject(parent), |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
805 | HierarchyElement(parent), |
1309
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
806 | m_manager(parent) |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
807 | { |
1323
05b3e173c900
Config is now a namespace
Teemu Piippo <teemu@hecknology.net>
parents:
1320
diff
changeset
|
808 | for (const Library& library : config::libraries()) |
1309
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
809 | { |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
810 | QDir dir {library.path}; |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
811 | if (dir.exists("p") and QFileInfo {dir.filePath("p")}.isDir()) |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
812 | { |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
813 | directories.push(dir.filePath("p")); |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
814 | |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
815 | if (dir.exists("p/48") and QFileInfo {dir.filePath("p/48")}.isDir()) |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
816 | directories.push(dir.filePath("p/48")); |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
817 | } |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
818 | } |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
819 | |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
820 | print("Scanning primitives..."); |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
821 | } |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
822 | |
1309
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
823 | PrimitiveScanner::~PrimitiveScanner() |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
824 | { |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
825 | delete this->currentIterator; |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
826 | } |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
827 | |
1055
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
828 | /* |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
829 | * PrimitiveScanner :: scannedPrimitives |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
830 | * |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
831 | * Returns a vector containing all the primitives found. |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
832 | */ |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
833 | const QVector<Primitive> &PrimitiveScanner::scannedPrimitives() const |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
834 | { |
1055
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
835 | return m_scannedPrimitives; |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
836 | } |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
837 | |
1055
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
838 | /* |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
839 | * PrimitiveScanner :: work |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
840 | * |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
841 | * Does one step of work, processes up to 100 primitives. |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
842 | * If the scanner does not finish work by this function call, it will ask the event loop to call this method again. |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
843 | */ |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
844 | void PrimitiveScanner::work() |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
845 | { |
1309
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
846 | while (this->currentIterator == nullptr or not this->currentIterator->hasNext()) |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
847 | { |
1309
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
848 | delete this->currentIterator; |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
849 | this->currentIterator = nullptr; |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
850 | |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
851 | if (this->directories.isEmpty()) |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
852 | { |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
853 | // If there are no more primitives to iterate, we're done. Now save this information into a cache file. |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
854 | std::sort( |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
855 | m_scannedPrimitives.begin(), |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
856 | m_scannedPrimitives.end(), |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
857 | [](const Primitive& one, const Primitive& other) -> bool |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
858 | { |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
859 | return one.title < other.title; |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
860 | } |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
861 | ); |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
862 | QString path = m_manager->getPrimitivesCfgPath(); |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
863 | QFile configFile = {path}; |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
864 | |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
865 | if (configFile.open(QIODevice::WriteOnly | QIODevice::Text)) |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
866 | { |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
867 | for (Primitive& primitive : m_scannedPrimitives) |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
868 | fprint(configFile, "%1 %2\r\n", primitive.name, primitive.title); |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
869 | |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
870 | configFile.close(); |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
871 | } |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
872 | else |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
873 | { |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
874 | QMessageBox::critical( |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
875 | m_window, |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
876 | tr("Error"), |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
877 | format( |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
878 | tr("Couldn't write primitive list %1: %2"), |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
879 | path, |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
880 | configFile.errorString() |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
881 | ) |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
882 | ); |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
883 | } |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
884 | |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
885 | emit workDone(); |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
886 | return; |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
887 | } |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
888 | else |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
889 | { |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
890 | this->currentIterator = new QDirIterator {this->directories.pop()}; |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
891 | this->m_basePathLength = this->currentIterator->path().length(); |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
892 | } |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
893 | } |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
894 | |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
895 | for (int i = 0; this->currentIterator->hasNext() and i < 100; ++i) |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
896 | { |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
897 | QString filename = this->currentIterator->next(); |
1055
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
898 | QFile file = {filename}; |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
899 | |
1055
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
900 | if (file.open (QIODevice::ReadOnly)) |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
901 | { |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
902 | Primitive primitive; |
1309
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
903 | primitive.name = LDDocument::shortenName(filename); |
1055
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
904 | primitive.category = nullptr; |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
905 | primitive.title = QString::fromUtf8(file.readLine().simplified()); |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
906 | |
1055
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
907 | if (primitive.title[0] == '0') |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
908 | { |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
909 | primitive.title.remove(0, 1); // remove 0 |
1309
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
910 | primitive.title = primitive.title.trimmed(); |
1055
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
911 | } |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
912 | |
c28d07a583ac
Cleaned up PrimitiveScanner
Teemu Piippo <teemu@hecknology.net>
parents:
1054
diff
changeset
|
913 | m_scannedPrimitives << primitive; |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
914 | } |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
915 | } |
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
916 | |
1309
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
917 | // Defer to event loop, pick up the work later. |
c72e7e09bda8
reworked primitive scanning
Teemu Piippo <teemu@hecknology.net>
parents:
1297
diff
changeset
|
918 | QMetaObject::invokeMethod (this, "work", Qt::QueuedConnection); |
1020
815a040d4039
Reformatted primitives.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents:
1019
diff
changeset
|
919 | } |