| Geant4 Cross Reference |
1 // 1 //
2 // ******************************************* 2 // ********************************************************************
3 // * License and Disclaimer 3 // * License and Disclaimer *
4 // * 4 // * *
5 // * The Geant4 software is copyright of th 5 // * The Geant4 software is copyright of the Copyright Holders of *
6 // * the Geant4 Collaboration. It is provided 6 // * the Geant4 Collaboration. It is provided under the terms and *
7 // * conditions of the Geant4 Software License 7 // * conditions of the Geant4 Software License, included in the file *
8 // * LICENSE and available at http://cern.ch/ 8 // * LICENSE and available at http://cern.ch/geant4/license . These *
9 // * include a list of copyright holders. 9 // * include a list of copyright holders. *
10 // * 10 // * *
11 // * Neither the authors of this software syst 11 // * Neither the authors of this software system, nor their employing *
12 // * institutes,nor the agencies providing fin 12 // * institutes,nor the agencies providing financial support for this *
13 // * work make any representation or warran 13 // * work make any representation or warranty, express or implied, *
14 // * regarding this software system or assum 14 // * regarding this software system or assume any liability for its *
15 // * use. Please see the license in the file 15 // * use. Please see the license in the file LICENSE and URL above *
16 // * for the full disclaimer and the limitatio 16 // * for the full disclaimer and the limitation of liability. *
17 // * 17 // * *
18 // * This code implementation is the result 18 // * This code implementation is the result of the scientific and *
19 // * technical work of the GEANT4 collaboratio 19 // * technical work of the GEANT4 collaboration. *
20 // * By using, copying, modifying or distri 20 // * By using, copying, modifying or distributing the software (or *
21 // * any work based on the software) you ag 21 // * any work based on the software) you agree to acknowledge its *
22 // * use in resulting scientific publicati 22 // * use in resulting scientific publications, and indicate your *
23 // * acceptance of all terms of the Geant4 Sof 23 // * acceptance of all terms of the Geant4 Software license. *
24 // ******************************************* 24 // ********************************************************************
25 // 25 //
26 // 26 //
27 // Jane Tinslay, John Allison, Joseph Perl Nov 27 // Jane Tinslay, John Allison, Joseph Perl November 2005
28 // 28 //
29 #include "G4TrajectoryDrawerUtils.hh" 29 #include "G4TrajectoryDrawerUtils.hh"
30 #include "G4Colour.hh" 30 #include "G4Colour.hh"
31 #include "G4Polyline.hh" 31 #include "G4Polyline.hh"
32 #include "G4Polymarker.hh" 32 #include "G4Polymarker.hh"
33 #include "G4VTrajectory.hh" 33 #include "G4VTrajectory.hh"
34 #include "G4VTrajectoryPoint.hh" 34 #include "G4VTrajectoryPoint.hh"
35 #include "G4VisAttributes.hh" 35 #include "G4VisAttributes.hh"
36 #include "G4VisTrajContext.hh" 36 #include "G4VisTrajContext.hh"
37 #include "G4VVisManager.hh" 37 #include "G4VVisManager.hh"
38 #include "G4UIcommand.hh" 38 #include "G4UIcommand.hh"
39 #include "G4AttValue.hh" 39 #include "G4AttValue.hh"
40 40
41 #include <utility> <<
42 <<
43 #define G4warn G4cout 41 #define G4warn G4cout
44 42
45 namespace G4TrajectoryDrawerUtils { 43 namespace G4TrajectoryDrawerUtils {
46 44
47 enum TimesValidity {InvalidTimes, ValidTimes 45 enum TimesValidity {InvalidTimes, ValidTimes};
48 46
49 TimesValidity GetPointsAndTimes 47 TimesValidity GetPointsAndTimes
50 (const G4VTrajectory& traj, 48 (const G4VTrajectory& traj,
51 const G4VisTrajContext& context, 49 const G4VisTrajContext& context,
52 G4Polyline& trajectoryLine, 50 G4Polyline& trajectoryLine,
53 G4Polymarker& auxiliaryPoints, 51 G4Polymarker& auxiliaryPoints,
54 G4Polymarker& stepPoints, 52 G4Polymarker& stepPoints,
55 std::vector<G4double>& trajectoryLineTimes, 53 std::vector<G4double>& trajectoryLineTimes,
56 std::vector<G4double>& auxiliaryPointTimes, 54 std::vector<G4double>& auxiliaryPointTimes,
57 std::vector<G4double>& stepPointTimes) 55 std::vector<G4double>& stepPointTimes)
58 { 56 {
59 TimesValidity validity = InvalidTimes; 57 TimesValidity validity = InvalidTimes;
60 if (context.GetTimeSliceInterval()) validi 58 if (context.GetTimeSliceInterval()) validity = ValidTimes;
61 59
62 // Memory for last trajectory point positi 60 // Memory for last trajectory point position for auxiliary point
63 // time interpolation algorithm. There ar 61 // time interpolation algorithm. There are no auxiliary points
64 // for the first trajectory point, so its 62 // for the first trajectory point, so its initial value is
65 // immaterial. 63 // immaterial.
66 G4ThreeVector lastTrajectoryPointPosition; 64 G4ThreeVector lastTrajectoryPointPosition;
67 65
68 // Keep positions. Don't store unless fir 66 // Keep positions. Don't store unless first or different.
69 std::vector<G4ThreeVector> positions; 67 std::vector<G4ThreeVector> positions;
70 68
71 for (G4int iPoint=0; iPoint<traj.GetPointE 69 for (G4int iPoint=0; iPoint<traj.GetPointEntries(); iPoint++) {
72 70
73 G4VTrajectoryPoint* aTrajectoryPoint = t 71 G4VTrajectoryPoint* aTrajectoryPoint = traj.GetPoint(iPoint);
74 const G4ThreeVector& trajectoryPointPosi 72 const G4ThreeVector& trajectoryPointPosition =
75 aTrajectoryPoint->GetPosition(); 73 aTrajectoryPoint->GetPosition();
76 74
77 // Only store if first or if different 75 // Only store if first or if different
78 if (positions.size() == 0 || 76 if (positions.size() == 0 ||
79 trajectoryPointPosition != positions[posit 77 trajectoryPointPosition != positions[positions.size()-1]) {
80 78
81 // Pre- and Post-Point times from the trajec 79 // Pre- and Post-Point times from the trajectory point...
82 G4double trajectoryPointPreTime = -std::nume 80 G4double trajectoryPointPreTime = -std::numeric_limits<double>::max();
83 G4double trajectoryPointPostTime = std::nume 81 G4double trajectoryPointPostTime = std::numeric_limits<double>::max();
84 82
85 if (context.GetTimeSliceInterval() && validi 83 if (context.GetTimeSliceInterval() && validity == ValidTimes) {
86 84
87 std::vector<G4AttValue>* trajectoryPointAt 85 std::vector<G4AttValue>* trajectoryPointAttValues =
88 aTrajectoryPoint->CreateAttValues(); 86 aTrajectoryPoint->CreateAttValues();
89 if (!trajectoryPointAttValues) { 87 if (!trajectoryPointAttValues) {
90 static G4bool warnedNoAttValues = false; 88 static G4bool warnedNoAttValues = false;
91 if (!warnedNoAttValues) { 89 if (!warnedNoAttValues) {
92 G4warn << 90 G4warn <<
93 "******************************************* 91 "*************************************************************************"
94 "\n* WARNING: G4TrajectoryDrawerUtils::GetP 92 "\n* WARNING: G4TrajectoryDrawerUtils::GetPointsAndTimes: no att values."
95 "\n***************************************** 93 "\n*************************************************************************"
96 << G4endl; 94 << G4endl;
97 warnedNoAttValues = true; 95 warnedNoAttValues = true;
98 } 96 }
99 validity = InvalidTimes; 97 validity = InvalidTimes;
100 } else { 98 } else {
101 G4bool foundPreTime = false, foundPostTi 99 G4bool foundPreTime = false, foundPostTime = false;
102 for (std::vector<G4AttValue>::iterator i 100 for (std::vector<G4AttValue>::iterator i =
103 trajectoryPointAttValues->begin(); 101 trajectoryPointAttValues->begin();
104 i != trajectoryPointAttValues->end(); ++i 102 i != trajectoryPointAttValues->end(); ++i) {
105 if (i->GetName() == "PreT") { 103 if (i->GetName() == "PreT") {
106 trajectoryPointPreTime = 104 trajectoryPointPreTime =
107 G4UIcommand::ConvertToDimensionedDouble( 105 G4UIcommand::ConvertToDimensionedDouble(i->GetValue());
108 foundPreTime = true; 106 foundPreTime = true;
109 } 107 }
110 if (i->GetName() == "PostT") { 108 if (i->GetName() == "PostT") {
111 trajectoryPointPostTime = 109 trajectoryPointPostTime =
112 G4UIcommand::ConvertToDimensionedDouble( 110 G4UIcommand::ConvertToDimensionedDouble(i->GetValue());
113 foundPostTime = true; 111 foundPostTime = true;
114 } 112 }
115 } 113 }
116 if (!foundPreTime || !foundPostTime) { 114 if (!foundPreTime || !foundPostTime) {
117 static G4bool warnedTimesNotFound = fa 115 static G4bool warnedTimesNotFound = false;
118 if (!warnedTimesNotFound) { 116 if (!warnedTimesNotFound) {
119 G4warn << 117 G4warn <<
120 "******************************************* 118 "*************************************************************************"
121 "\n* WARNING: G4TrajectoryDrawerUtils::GetP 119 "\n* WARNING: G4TrajectoryDrawerUtils::GetPointsAndTimes: times not found."
122 "\n You need to specify \"/vis/scene/add/tra 120 "\n You need to specify \"/vis/scene/add/trajectories rich\""
123 "\n***************************************** 121 "\n*************************************************************************"
124 << G4endl; 122 << G4endl;
125 warnedTimesNotFound = true; 123 warnedTimesNotFound = true;
126 } 124 }
127 validity = InvalidTimes; 125 validity = InvalidTimes;
128 } 126 }
129 } 127 }
130 delete trajectoryPointAttValues; // 128 delete trajectoryPointAttValues; // (Must be deleted after use.)
131 } 129 }
132 130
133 const std::vector<G4ThreeVector>* auxiliarie 131 const std::vector<G4ThreeVector>* auxiliaries
134 = aTrajectoryPoint->GetAuxiliaryPoints(); 132 = aTrajectoryPoint->GetAuxiliaryPoints();
135 if (0 != auxiliaries) { 133 if (0 != auxiliaries) {
136 for (size_t iAux=0; iAux<auxiliaries->size 134 for (size_t iAux=0; iAux<auxiliaries->size(); ++iAux) {
137 const G4ThreeVector& auxPointPosition = 135 const G4ThreeVector& auxPointPosition = (*auxiliaries)[iAux];
138 if (positions.size() == 0 || 136 if (positions.size() == 0 ||
139 auxPointPosition != positions[positions.si 137 auxPointPosition != positions[positions.size()-1]) {
140 // Only store if first or if different 138 // Only store if first or if different
141 positions.push_back(trajectoryPointPos 139 positions.push_back(trajectoryPointPosition);
142 trajectoryLine.push_back(auxPointPosit 140 trajectoryLine.push_back(auxPointPosition);
143 auxiliaryPoints.push_back(auxPointPosi 141 auxiliaryPoints.push_back(auxPointPosition);
144 if (validity == ValidTimes) { 142 if (validity == ValidTimes) {
145 // Interpolate time for auxiliary points.. 143 // Interpolate time for auxiliary points...
146 G4double s1 = 144 G4double s1 =
147 (auxPointPosition - lastTrajectoryPointP 145 (auxPointPosition - lastTrajectoryPointPosition).mag();
148 G4double s2 = 146 G4double s2 =
149 (trajectoryPointPosition - auxPointPosit 147 (trajectoryPointPosition - auxPointPosition).mag();
150 G4double t = trajectoryPointPreTime + 148 G4double t = trajectoryPointPreTime +
151 (trajectoryPointPostTime - trajectoryPoi 149 (trajectoryPointPostTime - trajectoryPointPreTime) *
152 (s1 / (s1 + s2)); 150 (s1 / (s1 + s2));
153 trajectoryLineTimes.push_back(t); 151 trajectoryLineTimes.push_back(t);
154 auxiliaryPointTimes.push_back(t); 152 auxiliaryPointTimes.push_back(t);
155 } 153 }
156 } 154 }
157 } 155 }
158 } 156 }
159 157
160 positions.push_back(trajectoryPointPosition) 158 positions.push_back(trajectoryPointPosition);
161 trajectoryLine.push_back(trajectoryPointPosi 159 trajectoryLine.push_back(trajectoryPointPosition);
162 stepPoints.push_back(trajectoryPointPosition 160 stepPoints.push_back(trajectoryPointPosition);
163 if (validity == ValidTimes) { 161 if (validity == ValidTimes) {
164 trajectoryLineTimes.push_back(trajectoryPo 162 trajectoryLineTimes.push_back(trajectoryPointPostTime);
165 stepPointTimes.push_back(trajectoryPointPo 163 stepPointTimes.push_back(trajectoryPointPostTime);
166 } 164 }
167 lastTrajectoryPointPosition = trajecto 165 lastTrajectoryPointPosition = trajectoryPointPosition;
168 } 166 }
169 } 167 }
170 return validity; 168 return validity;
171 } 169 }
172 170
173 static void SliceLine(G4double timeIncrement 171 static void SliceLine(G4double timeIncrement,
174 G4Polyline& trajectoryLine, 172 G4Polyline& trajectoryLine,
175 std::vector<G4double>& trajectoryLineTim 173 std::vector<G4double>& trajectoryLineTimes)
176 { 174 {
177 // Assumes valid arguments from GetPoints 175 // Assumes valid arguments from GetPoints and GetTimes.
178 176
179 G4Polyline newTrajectoryLine; 177 G4Polyline newTrajectoryLine;
180 std::vector<G4double> newTrajectoryLineTim 178 std::vector<G4double> newTrajectoryLineTimes;
181 179
182 newTrajectoryLine.push_back(trajectoryLine 180 newTrajectoryLine.push_back(trajectoryLine[0]);
183 newTrajectoryLineTimes.push_back(trajector 181 newTrajectoryLineTimes.push_back(trajectoryLineTimes[0]);
184 size_t lineSize = trajectoryLine.size(); 182 size_t lineSize = trajectoryLine.size();
185 if (lineSize > 1) { 183 if (lineSize > 1) {
186 for (size_t i = 1; i < trajectoryLine.si 184 for (size_t i = 1; i < trajectoryLine.size(); ++i) {
187 G4double deltaT = trajectoryLineTimes[i] - t 185 G4double deltaT = trajectoryLineTimes[i] - trajectoryLineTimes[i - 1];
188 if (deltaT > 0.) { 186 if (deltaT > 0.) {
189 G4double practicalTimeIncrement = 187 G4double practicalTimeIncrement =
190 std::max(timeIncrement, deltaT / 100.); 188 std::max(timeIncrement, deltaT / 100.);
191 for (G4double t = 189 for (G4double t =
192 (int(trajectoryLineTimes[i - 1]/practical 190 (int(trajectoryLineTimes[i - 1]/practicalTimeIncrement) + 1) *
193 practicalTimeIncrement; 191 practicalTimeIncrement;
194 t <= trajectoryLineTimes[i]; 192 t <= trajectoryLineTimes[i];
195 t += practicalTimeIncrement) { 193 t += practicalTimeIncrement) {
196 G4ThreeVector pos = trajectoryLine[i - 1 194 G4ThreeVector pos = trajectoryLine[i - 1] +
197 (trajectoryLine[i] - trajectoryLine[i 195 (trajectoryLine[i] - trajectoryLine[i - 1]) *
198 ((t - trajectoryLineTimes[i - 1]) / de 196 ((t - trajectoryLineTimes[i - 1]) / deltaT);
199 newTrajectoryLine.push_back(pos); 197 newTrajectoryLine.push_back(pos);
200 newTrajectoryLineTimes.push_back(t); 198 newTrajectoryLineTimes.push_back(t);
201 } 199 }
202 } 200 }
203 newTrajectoryLine.push_back(trajectoryLine[i 201 newTrajectoryLine.push_back(trajectoryLine[i]);
204 newTrajectoryLineTimes.push_back(trajectoryL 202 newTrajectoryLineTimes.push_back(trajectoryLineTimes[i]);
205 } 203 }
206 } 204 }
207 205
208 trajectoryLine = std::move(newTrajectoryLi << 206 trajectoryLine = newTrajectoryLine;
209 trajectoryLineTimes = std::move(newTraject << 207 trajectoryLineTimes = newTrajectoryLineTimes;
210 } 208 }
211 209
212 static void DrawWithoutTime(const G4VisTrajC 210 static void DrawWithoutTime(const G4VisTrajContext& myContext,
213 G4Polyline& trajectoryLine, 211 G4Polyline& trajectoryLine,
214 G4Polymarker& auxiliaryPoints, 212 G4Polymarker& auxiliaryPoints,
215 G4Polymarker& stepPoints) 213 G4Polymarker& stepPoints)
216 { 214 {
217 // Draw without time slice information 215 // Draw without time slice information
218 216
219 G4VVisManager* pVVisManager = G4VVisManage 217 G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
220 if (0 == pVVisManager) return; 218 if (0 == pVVisManager) return;
221 219
222 if (myContext.GetDrawLine() && myContext.G 220 if (myContext.GetDrawLine() && myContext.GetLineVisible()) {
223 G4VisAttributes trajectoryLineAttribs(my 221 G4VisAttributes trajectoryLineAttribs(myContext.GetLineColour());
224 trajectoryLineAttribs.SetLineWidth(myCon 222 trajectoryLineAttribs.SetLineWidth(myContext.GetLineWidth());
225 trajectoryLine.SetVisAttributes(&traject 223 trajectoryLine.SetVisAttributes(&trajectoryLineAttribs);
226 224
227 pVVisManager->Draw(trajectoryLine); 225 pVVisManager->Draw(trajectoryLine);
228 } 226 }
229 227
230 if (myContext.GetDrawAuxPts() && myContext 228 if (myContext.GetDrawAuxPts() && myContext.GetAuxPtsVisible()
231 && (auxiliaryPoints.size() > 0)) { 229 && (auxiliaryPoints.size() > 0)) {
232 auxiliaryPoints.SetMarkerType(myContext. 230 auxiliaryPoints.SetMarkerType(myContext.GetAuxPtsType());
233 auxiliaryPoints.SetSize(myContext.GetAux 231 auxiliaryPoints.SetSize(myContext.GetAuxPtsSizeType(), myContext.GetAuxPtsSize());
234 auxiliaryPoints.SetFillStyle(myContext.G 232 auxiliaryPoints.SetFillStyle(myContext.GetAuxPtsFillStyle());
235 233
236 G4VisAttributes auxiliaryPointsAttribs(m 234 G4VisAttributes auxiliaryPointsAttribs(myContext.GetAuxPtsColour());
237 auxiliaryPoints.SetVisAttributes(&auxili 235 auxiliaryPoints.SetVisAttributes(&auxiliaryPointsAttribs);
238 236
239 pVVisManager->Draw(auxiliaryPoints); 237 pVVisManager->Draw(auxiliaryPoints);
240 } 238 }
241 239
242 if (myContext.GetDrawStepPts() && myContex 240 if (myContext.GetDrawStepPts() && myContext.GetStepPtsVisible()
243 && (stepPoints.size() > 0)) { 241 && (stepPoints.size() > 0)) {
244 stepPoints.SetMarkerType(myContext.GetSt 242 stepPoints.SetMarkerType(myContext.GetStepPtsType());
245 stepPoints.SetSize(myContext.GetStepPtsS 243 stepPoints.SetSize(myContext.GetStepPtsSizeType(), myContext.GetStepPtsSize());
246 stepPoints.SetFillStyle(myContext.GetSte 244 stepPoints.SetFillStyle(myContext.GetStepPtsFillStyle());
247 245
248 G4VisAttributes stepPointsAttribs(myCont 246 G4VisAttributes stepPointsAttribs(myContext.GetStepPtsColour());
249 stepPoints.SetVisAttributes(&stepPointsA 247 stepPoints.SetVisAttributes(&stepPointsAttribs);
250 248
251 pVVisManager->Draw(stepPoints); 249 pVVisManager->Draw(stepPoints);
252 } 250 }
253 } 251 }
254 252
255 static void DrawWithTime(const G4VisTrajCont 253 static void DrawWithTime(const G4VisTrajContext& myContext,
256 G4Polyline& trajectoryLine, 254 G4Polyline& trajectoryLine,
257 G4Polymarker& auxiliaryPoints, 255 G4Polymarker& auxiliaryPoints,
258 G4Polymarker& stepPoints, 256 G4Polymarker& stepPoints,
259 std::vector<G4double>& trajectoryLine 257 std::vector<G4double>& trajectoryLineTimes,
260 std::vector<G4double>& auxiliaryPoint 258 std::vector<G4double>& auxiliaryPointTimes,
261 std::vector<G4double>& stepPointTimes 259 std::vector<G4double>& stepPointTimes)
262 { 260 {
263 // Draw with time slice information 261 // Draw with time slice information
264 262
265 G4VVisManager* pVVisManager = G4VVisManage 263 G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
266 if (0 == pVVisManager) return; 264 if (0 == pVVisManager) return;
267 265
268 if (myContext.GetDrawLine() && myContext.G 266 if (myContext.GetDrawLine() && myContext.GetLineVisible()) {
269 G4VisAttributes trajectoryLineAttribs(my 267 G4VisAttributes trajectoryLineAttribs(myContext.GetLineColour());
270 trajectoryLineAttribs.SetLineWidth(myCon 268 trajectoryLineAttribs.SetLineWidth(myContext.GetLineWidth());
271 269
272 for (size_t i = 1; i < trajectoryLine.si 270 for (size_t i = 1; i < trajectoryLine.size(); ++i ) {
273 G4Polyline slice; 271 G4Polyline slice;
274 slice.push_back(trajectoryLine[i -1]); 272 slice.push_back(trajectoryLine[i -1]);
275 slice.push_back(trajectoryLine[i]); 273 slice.push_back(trajectoryLine[i]);
276 trajectoryLineAttribs.SetStartTime(trajector 274 trajectoryLineAttribs.SetStartTime(trajectoryLineTimes[i - 1]);
277 trajectoryLineAttribs.SetEndTime(trajectoryL 275 trajectoryLineAttribs.SetEndTime(trajectoryLineTimes[i]);
278 slice.SetVisAttributes(&trajectoryLineAttrib 276 slice.SetVisAttributes(&trajectoryLineAttribs);
279 pVVisManager->Draw(slice); 277 pVVisManager->Draw(slice);
280 } 278 }
281 } 279 }
282 280
283 if (myContext.GetDrawAuxPts() && myContext 281 if (myContext.GetDrawAuxPts() && myContext.GetAuxPtsVisible()
284 && (auxiliaryPoints.size() > 0)) { 282 && (auxiliaryPoints.size() > 0)) {
285 G4VisAttributes auxiliaryPointsAttribs(m 283 G4VisAttributes auxiliaryPointsAttribs(myContext.GetAuxPtsColour());
286 284
287 for (size_t i = 0; i < auxiliaryPoints.s 285 for (size_t i = 0; i < auxiliaryPoints.size(); ++i ) {
288 G4Polymarker point; 286 G4Polymarker point;
289 point.push_back(auxiliaryPoints[i]); 287 point.push_back(auxiliaryPoints[i]);
290 point.SetMarkerType(myContext.GetAuxPtsType( 288 point.SetMarkerType(myContext.GetAuxPtsType());
291 point.SetSize(myContext.GetAuxPtsSizeType(), 289 point.SetSize(myContext.GetAuxPtsSizeType(), myContext.GetAuxPtsSize());
292 point.SetFillStyle(myContext.GetAuxPtsFillSt 290 point.SetFillStyle(myContext.GetAuxPtsFillStyle());
293 auxiliaryPointsAttribs.SetStartTime(auxiliar 291 auxiliaryPointsAttribs.SetStartTime(auxiliaryPointTimes[i]);
294 auxiliaryPointsAttribs.SetEndTime(auxiliaryP 292 auxiliaryPointsAttribs.SetEndTime(auxiliaryPointTimes[i]);
295 point.SetVisAttributes(&auxiliaryPointsAttri 293 point.SetVisAttributes(&auxiliaryPointsAttribs);
296 pVVisManager->Draw(point); 294 pVVisManager->Draw(point);
297 } 295 }
298 } 296 }
299 297
300 if (myContext.GetDrawStepPts() && myContex 298 if (myContext.GetDrawStepPts() && myContext.GetStepPtsVisible()
301 && (stepPoints.size() > 0)) { 299 && (stepPoints.size() > 0)) {
302 G4VisAttributes stepPointsAttribs(myCont 300 G4VisAttributes stepPointsAttribs(myContext.GetStepPtsColour());
303 301
304 for (size_t i = 0; i < stepPoints.size() 302 for (size_t i = 0; i < stepPoints.size(); ++i ) {
305 G4Polymarker point; 303 G4Polymarker point;
306 point.push_back(stepPoints[i]); 304 point.push_back(stepPoints[i]);
307 point.SetMarkerType(myContext.GetStepPtsType 305 point.SetMarkerType(myContext.GetStepPtsType());
308 point.SetSize(myContext.GetStepPtsSizeType() 306 point.SetSize(myContext.GetStepPtsSizeType(), myContext.GetStepPtsSize());
309 point.SetFillStyle(myContext.GetStepPtsFillS 307 point.SetFillStyle(myContext.GetStepPtsFillStyle());
310 stepPointsAttribs.SetStartTime(stepPointTime 308 stepPointsAttribs.SetStartTime(stepPointTimes[i]);
311 stepPointsAttribs.SetEndTime(stepPointTimes[ 309 stepPointsAttribs.SetEndTime(stepPointTimes[i]);
312 point.SetVisAttributes(&stepPointsAttribs); 310 point.SetVisAttributes(&stepPointsAttribs);
313 pVVisManager->Draw(point); 311 pVVisManager->Draw(point);
314 } 312 }
315 } 313 }
316 } 314 }
317 315
318 void DrawLineAndPoints(const G4VTrajectory& 316 void DrawLineAndPoints(const G4VTrajectory& traj, const G4VisTrajContext& context)
319 { 317 {
320 // Return if don't need to do anything 318 // Return if don't need to do anything
321 if (!context.GetDrawLine() && !context.Get 319 if (!context.GetDrawLine() && !context.GetDrawAuxPts() && !context.GetDrawStepPts()) return;
322 320
323 // Get points and times (times are returne 321 // Get points and times (times are returned only if time-slicing
324 // is requested). 322 // is requested).
325 G4Polyline trajectoryLine; 323 G4Polyline trajectoryLine;
326 G4Polymarker stepPoints; 324 G4Polymarker stepPoints;
327 G4Polymarker auxiliaryPoints; 325 G4Polymarker auxiliaryPoints;
328 std::vector<G4double> trajectoryLineTimes; 326 std::vector<G4double> trajectoryLineTimes;
329 std::vector<G4double> stepPointTimes; 327 std::vector<G4double> stepPointTimes;
330 std::vector<G4double> auxiliaryPointTimes; 328 std::vector<G4double> auxiliaryPointTimes;
331 329
332 TimesValidity validity = GetPointsAndTimes 330 TimesValidity validity = GetPointsAndTimes
333 (traj, context, 331 (traj, context,
334 trajectoryLine, auxiliaryPoints, stepPo 332 trajectoryLine, auxiliaryPoints, stepPoints,
335 trajectoryLineTimes, auxiliaryPointTime 333 trajectoryLineTimes, auxiliaryPointTimes, stepPointTimes);
336 334
337 if (validity == ValidTimes) { 335 if (validity == ValidTimes) {
338 336
339 SliceLine(context.GetTimeSliceInterval() 337 SliceLine(context.GetTimeSliceInterval(),
340 trajectoryLine, trajectoryLineTimes); 338 trajectoryLine, trajectoryLineTimes);
341 339
342 DrawWithTime(context, 340 DrawWithTime(context,
343 trajectoryLine, auxiliaryPoints, stepPo 341 trajectoryLine, auxiliaryPoints, stepPoints,
344 trajectoryLineTimes, auxiliaryPointTime 342 trajectoryLineTimes, auxiliaryPointTimes, stepPointTimes);
345 343
346 } else { 344 } else {
347 345
348 DrawWithoutTime(context, trajectoryLine, 346 DrawWithoutTime(context, trajectoryLine, auxiliaryPoints, stepPoints);
349 347
350 } 348 }
351 } 349 }
352 } 350 }
353 351