| 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 27
28 // /vis/geometry commands - John Allison 31st 28 // /vis/geometry commands - John Allison 31st January 2006
29 29
30 #include "G4VisCommandsGeometrySet.hh" 30 #include "G4VisCommandsGeometrySet.hh"
31 31
32 #include "G4UIcommand.hh" 32 #include "G4UIcommand.hh"
33 #include "G4VisManager.hh" 33 #include "G4VisManager.hh"
34 #include "G4LogicalVolumeStore.hh" 34 #include "G4LogicalVolumeStore.hh"
35 #include "G4UImanager.hh" 35 #include "G4UImanager.hh"
36 36
37 #include <sstream> 37 #include <sstream>
38 38
39 #define G4warn G4cout <<
40 <<
41 void G4VVisCommandGeometrySet::Set 39 void G4VVisCommandGeometrySet::Set
42 (const G4String& requestedName, << 40 (G4String requestedName,
43 const G4VVisCommandGeometrySetFunction& setFu 41 const G4VVisCommandGeometrySetFunction& setFunction,
44 G4int requestedDepth) 42 G4int requestedDepth)
45 { 43 {
46 G4VisManager::Verbosity verbosity = fpVisMan 44 G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
47 G4LogicalVolumeStore* pLVStore = G4LogicalVo 45 G4LogicalVolumeStore* pLVStore = G4LogicalVolumeStore::GetInstance();
48 G4bool found = false; 46 G4bool found = false;
49 for (std::size_t iLV = 0; iLV < pLVStore->si << 47 for (size_t iLV = 0; iLV < pLVStore->size(); iLV++ ) {
50 G4LogicalVolume* pLV = (*pLVStore)[iLV]; 48 G4LogicalVolume* pLV = (*pLVStore)[iLV];
51 const G4String& logVolName = pLV->GetName( 49 const G4String& logVolName = pLV->GetName();
52 if (logVolName == requestedName) found = t 50 if (logVolName == requestedName) found = true;
53 if (requestedName == "all" || logVolName = 51 if (requestedName == "all" || logVolName == requestedName) {
54 SetLVVisAtts(pLV, setFunction, 0, reques 52 SetLVVisAtts(pLV, setFunction, 0, requestedDepth);
55 } 53 }
56 } 54 }
57 if (requestedName != "all" && !found) { 55 if (requestedName != "all" && !found) {
58 if (verbosity >= G4VisManager::errors) { 56 if (verbosity >= G4VisManager::errors) {
59 G4warn << "ERROR: Logical volume \"" << << 57 G4cerr << "ERROR: Logical volume \"" << requestedName
60 << "\" not found in logical volume stor 58 << "\" not found in logical volume store." << G4endl;
61 } 59 }
62 return; 60 return;
63 } 61 }
64 // Recalculate extent of any physical volume <<
65 for (const auto& scene : fpVisManager->GetSc <<
66 const auto& runDurationModelList = scene-> <<
67 for (const auto& sceneModel : runDurationM <<
68 auto model = sceneModel.fpModel; <<
69 auto pvModel = dynamic_cast<G4PhysicalVo <<
70 if (pvModel) pvModel->CalculateExtent(); <<
71 } <<
72 // And re-calculate the scene's extent <<
73 scene->CalculateExtent(); <<
74 } <<
75 if (fpVisManager->GetCurrentViewer()) { 62 if (fpVisManager->GetCurrentViewer()) {
76 G4UImanager::GetUIpointer()->ApplyCommand( 63 G4UImanager::GetUIpointer()->ApplyCommand("/vis/scene/notifyHandlers");
77 } 64 }
78 } 65 }
79 66
80 void G4VVisCommandGeometrySet::SetLVVisAtts 67 void G4VVisCommandGeometrySet::SetLVVisAtts
81 (G4LogicalVolume* pLV, 68 (G4LogicalVolume* pLV,
82 const G4VVisCommandGeometrySetFunction& setFu 69 const G4VVisCommandGeometrySetFunction& setFunction,
83 G4int depth, G4int requestedDepth) 70 G4int depth, G4int requestedDepth)
84 { 71 {
85 G4VisManager::Verbosity verbosity = fpVisMan 72 G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
86 const G4VisAttributes* oldVisAtts = pLV->Get 73 const G4VisAttributes* oldVisAtts = pLV->GetVisAttributes();
87 fVisAttsMap.insert(std::make_pair(pLV,oldVis 74 fVisAttsMap.insert(std::make_pair(pLV,oldVisAtts)); // Store old vis atts.
88 G4VisAttributes* newVisAtts = new G4VisAttri 75 G4VisAttributes* newVisAtts = new G4VisAttributes; // Memory leak!
89 if (oldVisAtts) { 76 if (oldVisAtts) {
90 *newVisAtts = *oldVisAtts; 77 *newVisAtts = *oldVisAtts;
91 } 78 }
92 setFunction(newVisAtts); // Sets whatever a 79 setFunction(newVisAtts); // Sets whatever attribute determined by
93 // function object. 80 // function object.
94 pLV->SetVisAttributes(newVisAtts); 81 pLV->SetVisAttributes(newVisAtts);
95 if (verbosity >= G4VisManager::confirmations 82 if (verbosity >= G4VisManager::confirmations) {
96 G4cout << "\nLogical Volume \"" << pLV->Ge 83 G4cout << "\nLogical Volume \"" << pLV->GetName()
97 << "\": setting vis attributes:"; 84 << "\": setting vis attributes:";
98 if (oldVisAtts) { 85 if (oldVisAtts) {
99 G4cout << "\nwas: " << *oldVisAtts; 86 G4cout << "\nwas: " << *oldVisAtts;
100 } else { 87 } else {
101 G4cout << "\n(no old attributes)"; 88 G4cout << "\n(no old attributes)";
102 } 89 }
103 G4cout << "\nnow: " << *newVisAtts 90 G4cout << "\nnow: " << *newVisAtts
104 << G4endl; 91 << G4endl;
105 } 92 }
106 if (requestedDepth < 0 || depth < requestedD 93 if (requestedDepth < 0 || depth < requestedDepth) {
107 G4int nDaughters = (G4int)pLV->GetNoDaught << 94 G4int nDaughters = pLV->GetNoDaughters();
108 for (G4int i = 0; i < nDaughters; ++i) { 95 for (G4int i = 0; i < nDaughters; ++i) {
109 SetLVVisAtts(pLV->GetDaughter(i)->GetLog 96 SetLVVisAtts(pLV->GetDaughter(i)->GetLogicalVolume(),
110 setFunction, ++depth, requestedDepth); 97 setFunction, ++depth, requestedDepth);
111 } 98 }
112 } 99 }
113 } 100 }
114 101
115 ////////////// /vis/geometry/set/colour ////// 102 ////////////// /vis/geometry/set/colour ///////////////////////////////////////
116 103
117 G4VisCommandGeometrySetColour::G4VisCommandGeo 104 G4VisCommandGeometrySetColour::G4VisCommandGeometrySetColour()
118 { 105 {
119 G4bool omitable; 106 G4bool omitable;
120 fpCommand = new G4UIcommand("/vis/geometry/s 107 fpCommand = new G4UIcommand("/vis/geometry/set/colour", this);
121 fpCommand->SetGuidance("Sets colour of logic 108 fpCommand->SetGuidance("Sets colour of logical volume(s).");
122 fpCommand->SetGuidance("\"all\" sets all log 109 fpCommand->SetGuidance("\"all\" sets all logical volumes.");
123 fpCommand->SetGuidance 110 fpCommand->SetGuidance
124 ("Optionally propagates down hierarchy to 111 ("Optionally propagates down hierarchy to given depth.");
125 G4UIparameter* parameter; 112 G4UIparameter* parameter;
126 parameter = new G4UIparameter ("logical-volu 113 parameter = new G4UIparameter ("logical-volume-name", 's', omitable = true);
127 parameter->SetDefaultValue("all"); 114 parameter->SetDefaultValue("all");
128 fpCommand->SetParameter(parameter); 115 fpCommand->SetParameter(parameter);
129 parameter = new G4UIparameter("depth", 'd', 116 parameter = new G4UIparameter("depth", 'd', omitable = true);
130 parameter->SetDefaultValue(0); 117 parameter->SetDefaultValue(0);
131 parameter->SetGuidance 118 parameter->SetGuidance
132 ("Depth of propagation (-1 means unlimited 119 ("Depth of propagation (-1 means unlimited depth).");
133 fpCommand->SetParameter(parameter); 120 fpCommand->SetParameter(parameter);
134 parameter = new G4UIparameter("red", 's', om 121 parameter = new G4UIparameter("red", 's', omitable = true);
135 parameter->SetDefaultValue("1."); 122 parameter->SetDefaultValue("1.");
136 parameter->SetGuidance 123 parameter->SetGuidance
137 ("Red component or a string, e.g., \"blue\ 124 ("Red component or a string, e.g., \"blue\", in which case succeeding colour components are ignored.");
138 fpCommand->SetParameter(parameter); 125 fpCommand->SetParameter(parameter);
139 parameter = new G4UIparameter("green", 'd', 126 parameter = new G4UIparameter("green", 'd', omitable = true);
140 parameter->SetDefaultValue(1.); 127 parameter->SetDefaultValue(1.);
141 fpCommand->SetParameter(parameter); 128 fpCommand->SetParameter(parameter);
142 parameter = new G4UIparameter("blue", 'd', o 129 parameter = new G4UIparameter("blue", 'd', omitable = true);
143 parameter->SetDefaultValue(1.); 130 parameter->SetDefaultValue(1.);
144 fpCommand->SetParameter(parameter); 131 fpCommand->SetParameter(parameter);
145 parameter = new G4UIparameter("opacity", 'd' 132 parameter = new G4UIparameter("opacity", 'd', omitable = true);
146 parameter->SetDefaultValue(1.); 133 parameter->SetDefaultValue(1.);
147 fpCommand->SetParameter(parameter); 134 fpCommand->SetParameter(parameter);
148 } 135 }
149 136
150 G4VisCommandGeometrySetColour::~G4VisCommandGe 137 G4VisCommandGeometrySetColour::~G4VisCommandGeometrySetColour()
151 { 138 {
152 delete fpCommand; 139 delete fpCommand;
153 } 140 }
154 141
155 G4String G4VisCommandGeometrySetColour::GetCur 142 G4String G4VisCommandGeometrySetColour::GetCurrentValue(G4UIcommand*)
156 { 143 {
157 return ""; 144 return "";
158 } 145 }
159 146
160 void G4VisCommandGeometrySetColour::SetNewValu 147 void G4VisCommandGeometrySetColour::SetNewValue
161 (G4UIcommand*, G4String newValue) 148 (G4UIcommand*, G4String newValue)
162 { 149 {
163 G4String name, redOrString; 150 G4String name, redOrString;
164 G4int requestedDepth; 151 G4int requestedDepth;
165 G4double green, blue, opacity; 152 G4double green, blue, opacity;
166 std::istringstream iss(newValue); 153 std::istringstream iss(newValue);
167 iss >> name >> requestedDepth >> redOrString 154 iss >> name >> requestedDepth >> redOrString >> green >> blue >> opacity;
168 G4Colour colour(1,1,1,1); // Default white 155 G4Colour colour(1,1,1,1); // Default white and opaque.
169 ConvertToColour(colour, redOrString, green, 156 ConvertToColour(colour, redOrString, green, blue, opacity);
170 G4VisCommandGeometrySetColourFunction setCol 157 G4VisCommandGeometrySetColourFunction setColour(colour);
171 Set(name, setColour, requestedDepth); 158 Set(name, setColour, requestedDepth);
172 } 159 }
173 160
174 ////////////// /vis/geometry/set/daughtersInvi 161 ////////////// /vis/geometry/set/daughtersInvisible //////////////////////
175 162
176 G4VisCommandGeometrySetDaughtersInvisible::G4V 163 G4VisCommandGeometrySetDaughtersInvisible::G4VisCommandGeometrySetDaughtersInvisible()
177 { 164 {
178 G4bool omitable; 165 G4bool omitable;
179 fpCommand = new G4UIcommand("/vis/geometry/s 166 fpCommand = new G4UIcommand("/vis/geometry/set/daughtersInvisible", this);
180 fpCommand->SetGuidance("Makes daughters of l 167 fpCommand->SetGuidance("Makes daughters of logical volume(s) invisible.");
181 fpCommand->SetGuidance("\"all\" sets all log 168 fpCommand->SetGuidance("\"all\" sets all logical volumes.");
182 fpCommand->SetGuidance 169 fpCommand->SetGuidance
183 ("Optionally propagates down hierarchy to 170 ("Optionally propagates down hierarchy to given depth.");
184 G4UIparameter* parameter; 171 G4UIparameter* parameter;
185 parameter = new G4UIparameter ("logical-volu 172 parameter = new G4UIparameter ("logical-volume-name", 's', omitable = true);
186 parameter->SetDefaultValue("all"); 173 parameter->SetDefaultValue("all");
187 fpCommand->SetParameter(parameter); 174 fpCommand->SetParameter(parameter);
188 parameter = new G4UIparameter("depth", 'd', 175 parameter = new G4UIparameter("depth", 'd', omitable = true);
189 parameter->SetDefaultValue(0); 176 parameter->SetDefaultValue(0);
190 parameter->SetGuidance 177 parameter->SetGuidance
191 ("Depth of propagation (-1 means unlimited 178 ("Depth of propagation (-1 means unlimited depth).");
192 fpCommand->SetParameter(parameter); 179 fpCommand->SetParameter(parameter);
193 parameter = new G4UIparameter("daughtersInvi 180 parameter = new G4UIparameter("daughtersInvisible", 'b', omitable = true);
194 parameter->SetDefaultValue(true); 181 parameter->SetDefaultValue(true);
195 fpCommand->SetParameter(parameter); 182 fpCommand->SetParameter(parameter);
196 } 183 }
197 184
198 G4VisCommandGeometrySetDaughtersInvisible::~G4 185 G4VisCommandGeometrySetDaughtersInvisible::~G4VisCommandGeometrySetDaughtersInvisible()
199 { 186 {
200 delete fpCommand; 187 delete fpCommand;
201 } 188 }
202 189
203 G4String 190 G4String
204 G4VisCommandGeometrySetDaughtersInvisible::Get 191 G4VisCommandGeometrySetDaughtersInvisible::GetCurrentValue(G4UIcommand*)
205 { 192 {
206 return ""; 193 return "";
207 } 194 }
208 195
209 void G4VisCommandGeometrySetDaughtersInvisible 196 void G4VisCommandGeometrySetDaughtersInvisible::SetNewValue
210 (G4UIcommand*, G4String newValue) 197 (G4UIcommand*, G4String newValue)
211 { 198 {
212 G4String name; 199 G4String name;
213 G4int requestedDepth; 200 G4int requestedDepth;
214 G4String daughtersInvisibleString; 201 G4String daughtersInvisibleString;
215 std::istringstream iss(newValue); 202 std::istringstream iss(newValue);
216 iss >> name >> requestedDepth >> daughtersIn 203 iss >> name >> requestedDepth >> daughtersInvisibleString;
217 G4bool daughtersInvisible = 204 G4bool daughtersInvisible =
218 G4UIcommand::ConvertToBool(daughtersInvisi 205 G4UIcommand::ConvertToBool(daughtersInvisibleString);
219 206
220 if (requestedDepth !=0) { 207 if (requestedDepth !=0) {
221 requestedDepth = 0; 208 requestedDepth = 0;
222 if (fpVisManager->GetVerbosity() >= G4VisM 209 if (fpVisManager->GetVerbosity() >= G4VisManager::warnings) {
223 G4warn << "Recursive application suppres << 210 G4cout << "Recursive application suppressed for this attribute."
224 << G4endl; 211 << G4endl;
225 } 212 }
226 } 213 }
227 214
228 G4VisCommandGeometrySetDaughtersInvisibleFun 215 G4VisCommandGeometrySetDaughtersInvisibleFunction
229 setDaughtersInvisible(daughtersInvisible); 216 setDaughtersInvisible(daughtersInvisible);
230 Set(name, setDaughtersInvisible, requestedDe 217 Set(name, setDaughtersInvisible, requestedDepth);
231 218
232 G4VViewer* pViewer = fpVisManager->GetCurren 219 G4VViewer* pViewer = fpVisManager->GetCurrentViewer();
233 if (pViewer) { 220 if (pViewer) {
234 const G4ViewParameters& viewParams = pView 221 const G4ViewParameters& viewParams = pViewer->GetViewParameters();
235 if (fpVisManager->GetVerbosity() >= G4VisM 222 if (fpVisManager->GetVerbosity() >= G4VisManager::warnings) {
236 if (!viewParams.IsCulling()) { 223 if (!viewParams.IsCulling()) {
237 G4warn << << 224 G4cout <<
238 "Culling must be on - \"/vis/viewer/set/cu 225 "Culling must be on - \"/vis/viewer/set/culling global true\" - to see effect."
239 << G4endl; 226 << G4endl;
240 } 227 }
241 } 228 }
242 } 229 }
243 } 230 }
244 231
245 ////////////// /vis/geometry/set/forceAuxEdgeV 232 ////////////// /vis/geometry/set/forceAuxEdgeVisible /////////////////////////
246 233
247 G4VisCommandGeometrySetForceAuxEdgeVisible::G4 234 G4VisCommandGeometrySetForceAuxEdgeVisible::G4VisCommandGeometrySetForceAuxEdgeVisible()
248 { 235 {
249 G4bool omitable; 236 G4bool omitable;
250 fpCommand = new G4UIcommand("/vis/geometry/s 237 fpCommand = new G4UIcommand("/vis/geometry/set/forceAuxEdgeVisible", this);
251 fpCommand->SetGuidance 238 fpCommand->SetGuidance
252 ("Forces auxiliary (soft) edges of logical 239 ("Forces auxiliary (soft) edges of logical volume(s) to be visible,"
253 "\nregardless of the view parameters."); 240 "\nregardless of the view parameters.");
254 fpCommand->SetGuidance("\"all\" sets all log 241 fpCommand->SetGuidance("\"all\" sets all logical volumes.");
255 fpCommand->SetGuidance 242 fpCommand->SetGuidance
256 ("Optionally propagates down hierarchy to 243 ("Optionally propagates down hierarchy to given depth.");
257 G4UIparameter* parameter; 244 G4UIparameter* parameter;
258 parameter = new G4UIparameter ("logical-volu 245 parameter = new G4UIparameter ("logical-volume-name", 's', omitable = true);
259 parameter->SetDefaultValue("all"); 246 parameter->SetDefaultValue("all");
260 fpCommand->SetParameter(parameter); 247 fpCommand->SetParameter(parameter);
261 parameter = new G4UIparameter("depth", 'd', 248 parameter = new G4UIparameter("depth", 'd', omitable = true);
262 parameter->SetDefaultValue(0); 249 parameter->SetDefaultValue(0);
263 parameter->SetGuidance 250 parameter->SetGuidance
264 ("Depth of propagation (-1 means unlimited 251 ("Depth of propagation (-1 means unlimited depth).");
265 fpCommand->SetParameter(parameter); 252 fpCommand->SetParameter(parameter);
266 parameter = new G4UIparameter("forceAuxEdgeV 253 parameter = new G4UIparameter("forceAuxEdgeVisible", 'b', omitable = true);
267 parameter->SetDefaultValue(true); 254 parameter->SetDefaultValue(true);
268 fpCommand->SetParameter(parameter); 255 fpCommand->SetParameter(parameter);
269 } 256 }
270 257
271 G4VisCommandGeometrySetForceAuxEdgeVisible::~G 258 G4VisCommandGeometrySetForceAuxEdgeVisible::~G4VisCommandGeometrySetForceAuxEdgeVisible()
272 { 259 {
273 delete fpCommand; 260 delete fpCommand;
274 } 261 }
275 262
276 G4String 263 G4String
277 G4VisCommandGeometrySetForceAuxEdgeVisible::Ge 264 G4VisCommandGeometrySetForceAuxEdgeVisible::GetCurrentValue(G4UIcommand*)
278 { 265 {
279 return ""; 266 return "";
280 } 267 }
281 268
282 void G4VisCommandGeometrySetForceAuxEdgeVisibl 269 void G4VisCommandGeometrySetForceAuxEdgeVisible::SetNewValue
283 (G4UIcommand*, G4String newValue) 270 (G4UIcommand*, G4String newValue)
284 { 271 {
285 G4String name; 272 G4String name;
286 G4int requestedDepth; 273 G4int requestedDepth;
287 G4String forceAuxEdgeVisibleString; 274 G4String forceAuxEdgeVisibleString;
288 std::istringstream iss(newValue); 275 std::istringstream iss(newValue);
289 iss >> name >> requestedDepth >> forceAuxEdg 276 iss >> name >> requestedDepth >> forceAuxEdgeVisibleString;
290 G4bool forceAuxEdgeVisible = 277 G4bool forceAuxEdgeVisible =
291 G4UIcommand::ConvertToBool(forceAuxEdgeVis 278 G4UIcommand::ConvertToBool(forceAuxEdgeVisibleString);;
292 279
293 G4VisCommandGeometrySetForceAuxEdgeVisibleFu 280 G4VisCommandGeometrySetForceAuxEdgeVisibleFunction
294 setForceAuxEdgeVisible(forceAuxEdgeVisible 281 setForceAuxEdgeVisible(forceAuxEdgeVisible);
295 Set(name, setForceAuxEdgeVisible, requestedD 282 Set(name, setForceAuxEdgeVisible, requestedDepth);
296 } 283 }
297 284
298 ////////////// /vis/geometry/set/forceCloud // <<
299 <<
300 G4VisCommandGeometrySetForceCloud::G4VisComman <<
301 { <<
302 G4bool omitable; <<
303 fpCommand = new G4UIcommand("/vis/geometry/s <<
304 fpCommand->SetGuidance <<
305 ("Forces logical volume(s) always to be draw <<
306 "\nregardless of the view parameters."); <<
307 fpCommand->SetGuidance("\"all\" sets all log <<
308 fpCommand->SetGuidance <<
309 ("Optionally propagates down hierarchy to <<
310 G4UIparameter* parameter; <<
311 parameter = new G4UIparameter ("logical-volu <<
312 parameter->SetDefaultValue("all"); <<
313 fpCommand->SetParameter(parameter); <<
314 parameter = new G4UIparameter("depth", 'd', <<
315 parameter->SetDefaultValue(0); <<
316 parameter->SetGuidance <<
317 ("Depth of propagation (-1 means unlimited <<
318 fpCommand->SetParameter(parameter); <<
319 parameter = new G4UIparameter("forceCloud", <<
320 parameter->SetDefaultValue(true); <<
321 fpCommand->SetParameter(parameter); <<
322 parameter = new G4UIparameter("nPoints", 'd' <<
323 parameter->SetGuidance <<
324 ("<= 0 means under control of viewer."); <<
325 parameter->SetDefaultValue(0); <<
326 fpCommand->SetParameter(parameter); <<
327 } <<
328 <<
329 G4VisCommandGeometrySetForceCloud::~G4VisComma <<
330 { <<
331 delete fpCommand; <<
332 } <<
333 <<
334 G4String <<
335 G4VisCommandGeometrySetForceCloud::GetCurrentV <<
336 { <<
337 return ""; <<
338 } <<
339 <<
340 void G4VisCommandGeometrySetForceCloud::SetNew <<
341 (G4UIcommand*, G4String newValue) <<
342 { <<
343 G4String name, forceCloudString; <<
344 G4int requestedDepth, nPoints; <<
345 std::istringstream iss(newValue); <<
346 iss >> name >> requestedDepth >> forceCloudS <<
347 G4bool forceCloud = G4UIcommand::ConvertToBo <<
348 <<
349 G4VisCommandGeometrySetForceCloudFunction se <<
350 Set(name, setForceCloud, requestedDepth); <<
351 } <<
352 <<
353 ////////////// /vis/geometry/set/forceLineSegm 285 ////////////// /vis/geometry/set/forceLineSegmentsPerCircle /////////////////////////
354 286
355 G4VisCommandGeometrySetForceLineSegmentsPerCir 287 G4VisCommandGeometrySetForceLineSegmentsPerCircle::G4VisCommandGeometrySetForceLineSegmentsPerCircle()
356 { 288 {
357 G4bool omitable; 289 G4bool omitable;
358 fpCommand = new G4UIcommand("/vis/geometry/s 290 fpCommand = new G4UIcommand("/vis/geometry/set/forceLineSegmentsPerCircle", this);
359 fpCommand->SetGuidance 291 fpCommand->SetGuidance
360 ("Forces number of line segments per circl 292 ("Forces number of line segments per circle, the precision with which a"
361 "\ncurved line or surface is represented 293 "\ncurved line or surface is represented by a polygon or polyhedron,"
362 "\nregardless of the view parameters."); 294 "\nregardless of the view parameters.");
363 fpCommand->SetGuidance("\"all\" sets all log 295 fpCommand->SetGuidance("\"all\" sets all logical volumes.");
364 fpCommand->SetGuidance 296 fpCommand->SetGuidance
365 ("Optionally propagates down hierarchy to 297 ("Optionally propagates down hierarchy to given depth.");
366 G4UIparameter* parameter; 298 G4UIparameter* parameter;
367 parameter = new G4UIparameter ("logical-volu 299 parameter = new G4UIparameter ("logical-volume-name", 's', omitable = true);
368 parameter->SetDefaultValue("all"); 300 parameter->SetDefaultValue("all");
369 fpCommand->SetParameter(parameter); 301 fpCommand->SetParameter(parameter);
370 parameter = new G4UIparameter("depth", 'd', 302 parameter = new G4UIparameter("depth", 'd', omitable = true);
371 parameter->SetDefaultValue(0); 303 parameter->SetDefaultValue(0);
372 parameter->SetGuidance 304 parameter->SetGuidance
373 ("Depth of propagation (-1 means unlimited 305 ("Depth of propagation (-1 means unlimited depth).");
374 fpCommand->SetParameter(parameter); 306 fpCommand->SetParameter(parameter);
375 parameter = new G4UIparameter("lineSegmentsP 307 parameter = new G4UIparameter("lineSegmentsPerCircle", 'd', omitable = true);
376 parameter->SetGuidance 308 parameter->SetGuidance
377 ("<= 0 means not forced, i.e., under contr 309 ("<= 0 means not forced, i.e., under control of viewer.");
378 parameter->SetDefaultValue(0); 310 parameter->SetDefaultValue(0);
379 fpCommand->SetParameter(parameter); 311 fpCommand->SetParameter(parameter);
380 } 312 }
381 313
382 G4VisCommandGeometrySetForceLineSegmentsPerCir 314 G4VisCommandGeometrySetForceLineSegmentsPerCircle::~G4VisCommandGeometrySetForceLineSegmentsPerCircle()
383 { 315 {
384 delete fpCommand; 316 delete fpCommand;
385 } 317 }
386 318
387 G4String 319 G4String
388 G4VisCommandGeometrySetForceLineSegmentsPerCir 320 G4VisCommandGeometrySetForceLineSegmentsPerCircle::GetCurrentValue(G4UIcommand*)
389 { 321 {
390 return ""; 322 return "";
391 } 323 }
392 324
393 void G4VisCommandGeometrySetForceLineSegmentsP 325 void G4VisCommandGeometrySetForceLineSegmentsPerCircle::SetNewValue
394 (G4UIcommand*, G4String newValue) 326 (G4UIcommand*, G4String newValue)
395 { 327 {
396 G4String name; 328 G4String name;
397 G4int requestedDepth; 329 G4int requestedDepth;
398 G4int lineSegmentsPerCircle; 330 G4int lineSegmentsPerCircle;
399 std::istringstream iss(newValue); 331 std::istringstream iss(newValue);
400 iss >> name >> requestedDepth >> lineSegment 332 iss >> name >> requestedDepth >> lineSegmentsPerCircle;
401 333
402 G4VisCommandGeometrySetForceLineSegmentsPerC << 334 G4VisCommandGeometrySetForceLineSegmentsPerCircleFunction setForceLineSegmentsPerCircle(lineSegmentsPerCircle);
403 setForceLineSegmentsPerCircle(lineSegmentsPe <<
404 Set(name, setForceLineSegmentsPerCircle, req 335 Set(name, setForceLineSegmentsPerCircle, requestedDepth);
405 } 336 }
406 337
407 ////////////// /vis/geometry/set/forceSolid // 338 ////////////// /vis/geometry/set/forceSolid /////////////////////////
408 339
409 G4VisCommandGeometrySetForceSolid::G4VisComman 340 G4VisCommandGeometrySetForceSolid::G4VisCommandGeometrySetForceSolid()
410 { 341 {
411 G4bool omitable; 342 G4bool omitable;
412 fpCommand = new G4UIcommand("/vis/geometry/s 343 fpCommand = new G4UIcommand("/vis/geometry/set/forceSolid", this);
413 fpCommand->SetGuidance 344 fpCommand->SetGuidance
414 ("Forces logical volume(s) always to be dra 345 ("Forces logical volume(s) always to be drawn solid (surface drawing),"
415 "\nregardless of the view parameters."); 346 "\nregardless of the view parameters.");
416 fpCommand->SetGuidance("\"all\" sets all log 347 fpCommand->SetGuidance("\"all\" sets all logical volumes.");
417 fpCommand->SetGuidance 348 fpCommand->SetGuidance
418 ("Optionally propagates down hierarchy to 349 ("Optionally propagates down hierarchy to given depth.");
419 G4UIparameter* parameter; 350 G4UIparameter* parameter;
420 parameter = new G4UIparameter ("logical-volu 351 parameter = new G4UIparameter ("logical-volume-name", 's', omitable = true);
421 parameter->SetDefaultValue("all"); 352 parameter->SetDefaultValue("all");
422 fpCommand->SetParameter(parameter); 353 fpCommand->SetParameter(parameter);
423 parameter = new G4UIparameter("depth", 'd', 354 parameter = new G4UIparameter("depth", 'd', omitable = true);
424 parameter->SetDefaultValue(0); 355 parameter->SetDefaultValue(0);
425 parameter->SetGuidance 356 parameter->SetGuidance
426 ("Depth of propagation (-1 means unlimited 357 ("Depth of propagation (-1 means unlimited depth).");
427 fpCommand->SetParameter(parameter); 358 fpCommand->SetParameter(parameter);
428 parameter = new G4UIparameter("force", 'b', << 359 parameter = new G4UIparameter("forceSolid", 'b', omitable = true);
429 parameter->SetDefaultValue(true); 360 parameter->SetDefaultValue(true);
430 fpCommand->SetParameter(parameter); 361 fpCommand->SetParameter(parameter);
431 } 362 }
432 363
433 G4VisCommandGeometrySetForceSolid::~G4VisComma 364 G4VisCommandGeometrySetForceSolid::~G4VisCommandGeometrySetForceSolid()
434 { 365 {
435 delete fpCommand; 366 delete fpCommand;
436 } 367 }
437 368
438 G4String 369 G4String
439 G4VisCommandGeometrySetForceSolid::GetCurrentV 370 G4VisCommandGeometrySetForceSolid::GetCurrentValue(G4UIcommand*)
440 { 371 {
441 return ""; 372 return "";
442 } 373 }
443 374
444 void G4VisCommandGeometrySetForceSolid::SetNew 375 void G4VisCommandGeometrySetForceSolid::SetNewValue
445 (G4UIcommand*, G4String newValue) 376 (G4UIcommand*, G4String newValue)
446 { 377 {
447 G4String name; 378 G4String name;
448 G4int requestedDepth; 379 G4int requestedDepth;
449 G4String forceString; << 380 G4String forceSolidString;
450 std::istringstream iss(newValue); 381 std::istringstream iss(newValue);
451 iss >> name >> requestedDepth >> forceString << 382 iss >> name >> requestedDepth >> forceSolidString;
452 G4bool force = G4UIcommand::ConvertToBool(fo << 383 G4bool forceSolid = G4UIcommand::ConvertToBool(forceSolidString);
453 384
454 G4VisCommandGeometrySetForceSolidFunction se << 385 G4VisCommandGeometrySetForceSolidFunction setForceSolid(forceSolid);
455 Set(name, setForceSolid, requestedDepth); 386 Set(name, setForceSolid, requestedDepth);
456 } 387 }
457 388
458 ////////////// /vis/geometry/set/forceWirefram 389 ////////////// /vis/geometry/set/forceWireframe /////////////////////////
459 390
460 G4VisCommandGeometrySetForceWireframe::G4VisCo 391 G4VisCommandGeometrySetForceWireframe::G4VisCommandGeometrySetForceWireframe()
461 { 392 {
462 G4bool omitable; 393 G4bool omitable;
463 fpCommand = new G4UIcommand("/vis/geometry/s 394 fpCommand = new G4UIcommand("/vis/geometry/set/forceWireframe", this);
464 fpCommand->SetGuidance 395 fpCommand->SetGuidance
465 ("Forces logical volume(s) always to be dra 396 ("Forces logical volume(s) always to be drawn as wireframe,"
466 "\nregardless of the view parameters."); 397 "\nregardless of the view parameters.");
467 fpCommand->SetGuidance("\"all\" sets all log 398 fpCommand->SetGuidance("\"all\" sets all logical volumes.");
468 fpCommand->SetGuidance 399 fpCommand->SetGuidance
469 ("Optionally propagates down hierarchy to 400 ("Optionally propagates down hierarchy to given depth.");
470 G4UIparameter* parameter; 401 G4UIparameter* parameter;
471 parameter = new G4UIparameter ("logical-volu 402 parameter = new G4UIparameter ("logical-volume-name", 's', omitable = true);
472 parameter->SetDefaultValue("all"); 403 parameter->SetDefaultValue("all");
473 fpCommand->SetParameter(parameter); 404 fpCommand->SetParameter(parameter);
474 parameter = new G4UIparameter("depth", 'd', 405 parameter = new G4UIparameter("depth", 'd', omitable = true);
475 parameter->SetDefaultValue(0); 406 parameter->SetDefaultValue(0);
476 parameter->SetGuidance 407 parameter->SetGuidance
477 ("Depth of propagation (-1 means unlimited 408 ("Depth of propagation (-1 means unlimited depth).");
478 fpCommand->SetParameter(parameter); 409 fpCommand->SetParameter(parameter);
479 parameter = new G4UIparameter("forceWirefram 410 parameter = new G4UIparameter("forceWireframe", 'b', omitable = true);
480 parameter->SetDefaultValue(true); 411 parameter->SetDefaultValue(true);
481 fpCommand->SetParameter(parameter); 412 fpCommand->SetParameter(parameter);
482 } 413 }
483 414
484 G4VisCommandGeometrySetForceWireframe::~G4VisC 415 G4VisCommandGeometrySetForceWireframe::~G4VisCommandGeometrySetForceWireframe()
485 { 416 {
486 delete fpCommand; 417 delete fpCommand;
487 } 418 }
488 419
489 G4String 420 G4String
490 G4VisCommandGeometrySetForceWireframe::GetCurr 421 G4VisCommandGeometrySetForceWireframe::GetCurrentValue(G4UIcommand*)
491 { 422 {
492 return ""; 423 return "";
493 } 424 }
494 425
495 void G4VisCommandGeometrySetForceWireframe::Se 426 void G4VisCommandGeometrySetForceWireframe::SetNewValue
496 (G4UIcommand*, G4String newValue) 427 (G4UIcommand*, G4String newValue)
497 { 428 {
498 G4String name; 429 G4String name;
499 G4int requestedDepth; 430 G4int requestedDepth;
500 G4String forceWireframeString; 431 G4String forceWireframeString;
501 std::istringstream iss(newValue); 432 std::istringstream iss(newValue);
502 iss >> name >> requestedDepth >> forceWirefr 433 iss >> name >> requestedDepth >> forceWireframeString;
503 G4bool forceWireframe = G4UIcommand::Convert 434 G4bool forceWireframe = G4UIcommand::ConvertToBool(forceWireframeString);
504 435
505 G4VisCommandGeometrySetForceWireframeFunctio 436 G4VisCommandGeometrySetForceWireframeFunction
506 setForceWireframe(forceWireframe); 437 setForceWireframe(forceWireframe);
507 Set(name, setForceWireframe, requestedDepth) 438 Set(name, setForceWireframe, requestedDepth);
508 } 439 }
509 440
510 ////////////// /vis/geometry/set/lineStyle /// 441 ////////////// /vis/geometry/set/lineStyle /////////////////////////////////
511 442
512 G4VisCommandGeometrySetLineStyle::G4VisCommand 443 G4VisCommandGeometrySetLineStyle::G4VisCommandGeometrySetLineStyle()
513 { 444 {
514 G4bool omitable; 445 G4bool omitable;
515 fpCommand = new G4UIcommand("/vis/geometry/s 446 fpCommand = new G4UIcommand("/vis/geometry/set/lineStyle", this);
516 fpCommand->SetGuidance("Sets line style of l 447 fpCommand->SetGuidance("Sets line style of logical volume(s) drawing.");
517 fpCommand->SetGuidance("\"all\" sets all log 448 fpCommand->SetGuidance("\"all\" sets all logical volumes.");
518 fpCommand->SetGuidance 449 fpCommand->SetGuidance
519 ("Optionally propagates down hierarchy to 450 ("Optionally propagates down hierarchy to given depth.");
520 G4UIparameter* parameter; 451 G4UIparameter* parameter;
521 parameter = new G4UIparameter ("logical-volu 452 parameter = new G4UIparameter ("logical-volume-name", 's', omitable = true);
522 parameter->SetDefaultValue("all"); 453 parameter->SetDefaultValue("all");
523 fpCommand->SetParameter(parameter); 454 fpCommand->SetParameter(parameter);
524 parameter = new G4UIparameter("depth", 'd', 455 parameter = new G4UIparameter("depth", 'd', omitable = true);
525 parameter->SetDefaultValue(0); 456 parameter->SetDefaultValue(0);
526 parameter->SetGuidance 457 parameter->SetGuidance
527 ("Depth of propagation (-1 means unlimited 458 ("Depth of propagation (-1 means unlimited depth).");
528 fpCommand->SetParameter(parameter); 459 fpCommand->SetParameter(parameter);
529 parameter = new G4UIparameter("lineStyle", ' 460 parameter = new G4UIparameter("lineStyle", 's', omitable = true);
530 parameter->SetParameterCandidates("unbroken 461 parameter->SetParameterCandidates("unbroken dashed dotted");
531 parameter->SetDefaultValue("unbroken"); 462 parameter->SetDefaultValue("unbroken");
532 fpCommand->SetParameter(parameter); 463 fpCommand->SetParameter(parameter);
533 } 464 }
534 465
535 G4VisCommandGeometrySetLineStyle::~G4VisComman 466 G4VisCommandGeometrySetLineStyle::~G4VisCommandGeometrySetLineStyle()
536 { 467 {
537 delete fpCommand; 468 delete fpCommand;
538 } 469 }
539 470
540 G4String 471 G4String
541 G4VisCommandGeometrySetLineStyle::GetCurrentVa 472 G4VisCommandGeometrySetLineStyle::GetCurrentValue(G4UIcommand*)
542 { 473 {
543 return ""; 474 return "";
544 } 475 }
545 476
546 void G4VisCommandGeometrySetLineStyle::SetNewV 477 void G4VisCommandGeometrySetLineStyle::SetNewValue
547 (G4UIcommand*, G4String newValue) 478 (G4UIcommand*, G4String newValue)
548 { 479 {
549 G4String name, lineStyleString; 480 G4String name, lineStyleString;
550 G4int requestedDepth; 481 G4int requestedDepth;
551 std::istringstream iss(newValue); 482 std::istringstream iss(newValue);
552 iss >> name >> requestedDepth >> lineStyleSt 483 iss >> name >> requestedDepth >> lineStyleString;
553 G4VisAttributes::LineStyle lineStyle = G4Vis 484 G4VisAttributes::LineStyle lineStyle = G4VisAttributes::unbroken;
554 if (lineStyleString == "unbroken") lineStyle 485 if (lineStyleString == "unbroken") lineStyle = G4VisAttributes::unbroken;
555 if (lineStyleString == "dashed") lineStyle = 486 if (lineStyleString == "dashed") lineStyle = G4VisAttributes::dashed;
556 if (lineStyleString == "dotted") lineStyle = 487 if (lineStyleString == "dotted") lineStyle = G4VisAttributes::dotted;
557 488
558 G4VisCommandGeometrySetLineStyleFunction set 489 G4VisCommandGeometrySetLineStyleFunction setLineStyle(lineStyle);
559 Set(name, setLineStyle, requestedDepth); 490 Set(name, setLineStyle, requestedDepth);
560 } 491 }
561 492
562 ////////////// /vis/geometry/set/lineWidth /// 493 ////////////// /vis/geometry/set/lineWidth /////////////////////////////////
563 494
564 G4VisCommandGeometrySetLineWidth::G4VisCommand 495 G4VisCommandGeometrySetLineWidth::G4VisCommandGeometrySetLineWidth()
565 { 496 {
566 G4bool omitable; 497 G4bool omitable;
567 fpCommand = new G4UIcommand("/vis/geometry/s 498 fpCommand = new G4UIcommand("/vis/geometry/set/lineWidth", this);
568 fpCommand->SetGuidance("Sets line width of l 499 fpCommand->SetGuidance("Sets line width of logical volume(s) drawing.");
569 fpCommand->SetGuidance("\"all\" sets all log 500 fpCommand->SetGuidance("\"all\" sets all logical volumes.");
570 fpCommand->SetGuidance 501 fpCommand->SetGuidance
571 ("Optionally propagates down hierarchy to 502 ("Optionally propagates down hierarchy to given depth.");
572 G4UIparameter* parameter; 503 G4UIparameter* parameter;
573 parameter = new G4UIparameter ("logical-volu 504 parameter = new G4UIparameter ("logical-volume-name", 's', omitable = true);
574 parameter->SetDefaultValue("all"); 505 parameter->SetDefaultValue("all");
575 fpCommand->SetParameter(parameter); 506 fpCommand->SetParameter(parameter);
576 parameter = new G4UIparameter("depth", 'd', 507 parameter = new G4UIparameter("depth", 'd', omitable = true);
577 parameter->SetDefaultValue(0); 508 parameter->SetDefaultValue(0);
578 parameter->SetGuidance 509 parameter->SetGuidance
579 ("Depth of propagation (-1 means unlimited 510 ("Depth of propagation (-1 means unlimited depth).");
580 fpCommand->SetParameter(parameter); 511 fpCommand->SetParameter(parameter);
581 parameter = new G4UIparameter("lineWidth", ' 512 parameter = new G4UIparameter("lineWidth", 'd', omitable = true);
582 parameter->SetDefaultValue(1.); 513 parameter->SetDefaultValue(1.);
583 fpCommand->SetParameter(parameter); 514 fpCommand->SetParameter(parameter);
584 } 515 }
585 516
586 G4VisCommandGeometrySetLineWidth::~G4VisComman 517 G4VisCommandGeometrySetLineWidth::~G4VisCommandGeometrySetLineWidth()
587 { 518 {
588 delete fpCommand; 519 delete fpCommand;
589 } 520 }
590 521
591 G4String 522 G4String
592 G4VisCommandGeometrySetLineWidth::GetCurrentVa 523 G4VisCommandGeometrySetLineWidth::GetCurrentValue(G4UIcommand*)
593 { 524 {
594 return ""; 525 return "";
595 } 526 }
596 527
597 void G4VisCommandGeometrySetLineWidth::SetNewV 528 void G4VisCommandGeometrySetLineWidth::SetNewValue
598 (G4UIcommand*, G4String newValue) 529 (G4UIcommand*, G4String newValue)
599 { 530 {
600 G4String name; 531 G4String name;
601 G4int requestedDepth; 532 G4int requestedDepth;
602 G4double lineWidth; 533 G4double lineWidth;
603 std::istringstream iss(newValue); 534 std::istringstream iss(newValue);
604 iss >> name >> requestedDepth >> lineWidth; 535 iss >> name >> requestedDepth >> lineWidth;
605 536
606 G4VisCommandGeometrySetLineWidthFunction set 537 G4VisCommandGeometrySetLineWidthFunction setLineWidth(lineWidth);
607 Set(name, setLineWidth, requestedDepth); 538 Set(name, setLineWidth, requestedDepth);
608 } 539 }
609 540
610 ////////////// /vis/geometry/set/visibility // 541 ////////////// /vis/geometry/set/visibility ///////////////////////////////////////
611 542
612 G4VisCommandGeometrySetVisibility::G4VisComman 543 G4VisCommandGeometrySetVisibility::G4VisCommandGeometrySetVisibility()
613 { 544 {
614 G4bool omitable; 545 G4bool omitable;
615 fpCommand = new G4UIcommand("/vis/geometry/s 546 fpCommand = new G4UIcommand("/vis/geometry/set/visibility", this);
616 fpCommand->SetGuidance("Sets visibility of l 547 fpCommand->SetGuidance("Sets visibility of logical volume(s).");
617 fpCommand->SetGuidance("\"all\" sets all log 548 fpCommand->SetGuidance("\"all\" sets all logical volumes.");
618 fpCommand->SetGuidance 549 fpCommand->SetGuidance
619 ("Optionally propagates down hierarchy to 550 ("Optionally propagates down hierarchy to given depth.");
620 G4UIparameter* parameter; 551 G4UIparameter* parameter;
621 parameter = new G4UIparameter ("logical-volu 552 parameter = new G4UIparameter ("logical-volume-name", 's', omitable = true);
622 parameter->SetDefaultValue("all"); 553 parameter->SetDefaultValue("all");
623 fpCommand->SetParameter(parameter); 554 fpCommand->SetParameter(parameter);
624 parameter = new G4UIparameter("depth", 'd', 555 parameter = new G4UIparameter("depth", 'd', omitable = true);
625 parameter->SetDefaultValue(0); 556 parameter->SetDefaultValue(0);
626 parameter->SetGuidance 557 parameter->SetGuidance
627 ("Depth of propagation (-1 means unlimited 558 ("Depth of propagation (-1 means unlimited depth).");
628 fpCommand->SetParameter(parameter); 559 fpCommand->SetParameter(parameter);
629 parameter = new G4UIparameter("visibility", 560 parameter = new G4UIparameter("visibility", 'b', omitable = true);
630 parameter->SetDefaultValue(true); 561 parameter->SetDefaultValue(true);
631 fpCommand->SetParameter(parameter); 562 fpCommand->SetParameter(parameter);
632 } 563 }
633 564
634 G4VisCommandGeometrySetVisibility::~G4VisComma 565 G4VisCommandGeometrySetVisibility::~G4VisCommandGeometrySetVisibility()
635 { 566 {
636 delete fpCommand; 567 delete fpCommand;
637 } 568 }
638 569
639 G4String G4VisCommandGeometrySetVisibility::Ge 570 G4String G4VisCommandGeometrySetVisibility::GetCurrentValue(G4UIcommand*)
640 { 571 {
641 return ""; 572 return "";
642 } 573 }
643 574
644 void G4VisCommandGeometrySetVisibility::SetNew 575 void G4VisCommandGeometrySetVisibility::SetNewValue
645 (G4UIcommand*, G4String newValue) 576 (G4UIcommand*, G4String newValue)
646 { 577 {
647 G4String name; 578 G4String name;
648 G4int requestedDepth; 579 G4int requestedDepth;
649 G4String visibilityString; 580 G4String visibilityString;
650 std::istringstream iss(newValue); 581 std::istringstream iss(newValue);
651 iss >> name >> requestedDepth >> visibilityS 582 iss >> name >> requestedDepth >> visibilityString;
652 G4bool visibility = G4UIcommand::ConvertToBo 583 G4bool visibility = G4UIcommand::ConvertToBool(visibilityString);
653 584
654 G4VisCommandGeometrySetVisibilityFunction se 585 G4VisCommandGeometrySetVisibilityFunction setVisibility(visibility);
655 Set(name, setVisibility, requestedDepth); 586 Set(name, setVisibility, requestedDepth);
656 587
657 G4VViewer* pViewer = fpVisManager->GetCurren 588 G4VViewer* pViewer = fpVisManager->GetCurrentViewer();
658 if (pViewer) { 589 if (pViewer) {
659 const G4ViewParameters& viewParams = pView 590 const G4ViewParameters& viewParams = pViewer->GetViewParameters();
660 if (fpVisManager->GetVerbosity() >= G4VisM 591 if (fpVisManager->GetVerbosity() >= G4VisManager::warnings) {
661 if (!viewParams.IsCulling() || 592 if (!viewParams.IsCulling() ||
662 !viewParams.IsCullingInvisible()) { 593 !viewParams.IsCullingInvisible()) {
663 G4warn << << 594 G4cout <<
664 "Culling must be on - \"/vis/viewer/set/cu 595 "Culling must be on - \"/vis/viewer/set/culling global true\" and"
665 "\n \"/vis/viewer/set/culling invisible t 596 "\n \"/vis/viewer/set/culling invisible true\" - to see effect."
666 << G4endl; 597 << G4endl;
667 } 598 }
668 } 599 }
669 } 600 }
670 } 601 }
671 602
672 void G4VisCommandGeometrySetVisibility::SetNew 603 void G4VisCommandGeometrySetVisibility::SetNewValueOnLV
673 (G4LogicalVolume* pLV, G4int requestedDepth,G4 604 (G4LogicalVolume* pLV, G4int requestedDepth,G4bool visibility)
674 { 605 {
675 if (!pLV) return; 606 if (!pLV) return;
676 G4VisCommandGeometrySetVisibilityFunction se 607 G4VisCommandGeometrySetVisibilityFunction setVisibility(visibility);
677 SetLVVisAtts(pLV, setVisibility, 0, requeste 608 SetLVVisAtts(pLV, setVisibility, 0, requestedDepth);
678 609
679 G4VViewer* pViewer = fpVisManager->GetCurren 610 G4VViewer* pViewer = fpVisManager->GetCurrentViewer();
680 if (pViewer) { 611 if (pViewer) {
681 G4UImanager::GetUIpointer()->ApplyCommand( 612 G4UImanager::GetUIpointer()->ApplyCommand("/vis/scene/notifyHandlers");
682 const G4ViewParameters& viewParams = pView 613 const G4ViewParameters& viewParams = pViewer->GetViewParameters();
683 if (fpVisManager->GetVerbosity() >= G4VisM 614 if (fpVisManager->GetVerbosity() >= G4VisManager::warnings) {
684 if (!viewParams.IsCulling() || 615 if (!viewParams.IsCulling() ||
685 !viewParams.IsCullingInvisible()) { 616 !viewParams.IsCullingInvisible()) {
686 G4warn << << 617 G4cout <<
687 "Culling must be on - \"/vis/viewer/set/cu 618 "Culling must be on - \"/vis/viewer/set/culling global true\" and"
688 "\n \"/vis/viewer/set/culling invisible t 619 "\n \"/vis/viewer/set/culling invisible true\" - to see effect."
689 << G4endl; 620 << G4endl;
690 } 621 }
691 } 622 }
692 } 623 }
693 } 624 }
694 625