Import Geant4 5.2.0 source tree
This commit is contained in:
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIGAG.hh,v 1.5 2001/07/11 10:01:17 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIGAG.hh,v 1.6 2003/06/16 16:55:49 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
// G4UIGAG.hh
|
||||
// GAG(Geant4 adaptive GUI) interface class
|
||||
@@ -36,8 +36,8 @@
|
||||
|
||||
#include "G4UIsession.hh"
|
||||
#include "G4UImanager.hh"
|
||||
#include "g4std/fstream"
|
||||
#include "g4std/vector"
|
||||
#include <fstream>
|
||||
#include <vector>
|
||||
|
||||
enum UImode { terminal_mode , java_mode, tcl_mode };
|
||||
enum ChangeOfTree { notChanged=0, added, deleted, addedAndDeleted };
|
||||
@@ -117,12 +117,12 @@ class G4UIGAG : public G4UIsession
|
||||
void GetNewTreeStructure( G4UIcommandTree*,int recursiveLevel);
|
||||
void GetNewTreeValues( G4UIcommandTree*,int recursiveLevel);
|
||||
|
||||
G4std::vector<G4String> previousTreeCommands;
|
||||
G4std::vector<G4String> newTreeCommands;
|
||||
G4std::vector<G4String> previousTreeParams;
|
||||
G4std::vector<G4String> newTreeParams;
|
||||
G4std::vector<G4UIcommand*> previousTreePCP;
|
||||
G4std::vector<G4UIcommand*> newTreePCP;
|
||||
std::vector<G4String> previousTreeCommands;
|
||||
std::vector<G4String> newTreeCommands;
|
||||
std::vector<G4String> previousTreeParams;
|
||||
std::vector<G4String> newTreeParams;
|
||||
std::vector<G4UIcommand*> previousTreePCP;
|
||||
std::vector<G4UIcommand*> newTreePCP;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIGainServer.hh,v 1.3 2002/06/14 02:17:58 yhajime Exp $
|
||||
// $Name: geant4-05-01 $
|
||||
// $Id: G4UIGainServer.hh,v 1.4 2003/06/16 16:55:50 gunter Exp $
|
||||
// $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
|
||||
@@ -38,8 +38,8 @@
|
||||
#include <netinet/in.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "g4std/iostream"
|
||||
#include "g4std/fstream"
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include "globals.hh"
|
||||
#include "G4UImanager.hh"
|
||||
#include "G4VBasicShell.hh"
|
||||
@@ -88,12 +88,12 @@ private:
|
||||
void GetNewTreeStructure( G4UIcommandTree*,int recursiveLevel);
|
||||
void GetNewTreeValues( G4UIcommandTree*,int recursiveLevel);
|
||||
|
||||
G4std::vector<G4String> previousTreeCommands;
|
||||
G4std::vector<G4String> newTreeCommands;
|
||||
G4std::vector<G4String> previousTreeParams;
|
||||
G4std::vector<G4String> newTreeParams;
|
||||
G4std::vector<G4UIcommand*> previousTreePCP;
|
||||
G4std::vector<G4UIcommand*> newTreePCP;
|
||||
std::vector<G4String> previousTreeCommands;
|
||||
std::vector<G4String> newTreeCommands;
|
||||
std::vector<G4String> previousTreeParams;
|
||||
std::vector<G4String> newTreeParams;
|
||||
std::vector<G4UIcommand*> previousTreePCP;
|
||||
std::vector<G4UIcommand*> newTreePCP;
|
||||
|
||||
public:
|
||||
// These methods are implementation of corresponding virtual methods
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIGAG.cc,v 1.15 2002/12/05 16:33:41 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIGAG.cc,v 1.16 2003/06/16 16:55:51 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
// G4UIGAG.cc
|
||||
// 18.Feb.98 M.Nagamatu and T.Kodama created G4UIGAG from G4UIterminal
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "G4UIcommandTree.hh"
|
||||
#include "G4UIcommand.hh"
|
||||
#include "G4UIcommandStatus.hh"
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
|
||||
G4UIGAG::G4UIGAG()//: TVersion("T1.0a"), JVersion("J1.0a")
|
||||
{
|
||||
@@ -169,13 +169,13 @@ void G4UIGAG::ExecuteCommand(G4String aCommand)
|
||||
|
||||
G4int G4UIGAG::ReceiveG4cout(G4String coutString)
|
||||
{
|
||||
G4std::cout << coutString << G4std::flush;
|
||||
std::cout << coutString << std::flush;
|
||||
return 0;
|
||||
}
|
||||
|
||||
G4int G4UIGAG::ReceiveG4cerr(G4String cerrString)
|
||||
{
|
||||
G4std::cerr << cerrString << G4std::flush;
|
||||
std::cerr << cerrString << std::flush;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -195,7 +195,7 @@ G4String G4UIGAG::GetCommand()
|
||||
G4cout << "@@PROMPT \"" << promptCharacter << "\"" << G4endl;
|
||||
}
|
||||
if ( uiMode != java_mode ){
|
||||
G4cout << promptCharacter << "> " << G4std::flush;
|
||||
G4cout << promptCharacter << "> " << std::flush;
|
||||
}else{
|
||||
G4cout << "@@Ready" << G4endl;
|
||||
}
|
||||
@@ -254,7 +254,7 @@ G4String G4UIGAG::GetCommand()
|
||||
G4String ss = nC(1,nC.length()-1);
|
||||
G4int vl;
|
||||
const char* tt = ss;
|
||||
G4std::istrstream is((char*)tt);
|
||||
std::istrstream is((char*)tt);
|
||||
is >> vl;
|
||||
G4int nh = UI->GetNumberOfHistory();
|
||||
if(vl>=0 && vl<nh)
|
||||
@@ -411,7 +411,7 @@ void G4UIGAG::TerminalHelp(G4String newCommand)
|
||||
{
|
||||
G4UIcommandTree * treeTop = UI->GetTree();
|
||||
/*int*/unsigned i = newCommand.index(" ");
|
||||
if( i != G4std::string::npos )
|
||||
if( i != std::string::npos )
|
||||
{
|
||||
G4String newValue = newCommand(i+1,newCommand.length()-(i+1));
|
||||
newValue.strip(G4String::both);
|
||||
@@ -446,7 +446,7 @@ void G4UIGAG::TerminalHelp(G4String newCommand)
|
||||
// 1998 Oct 2 non-number input
|
||||
while(1){
|
||||
int i;
|
||||
G4cout << G4endl << "Type the number ( 0:end, -n:n level back ) : "<<G4std::flush;
|
||||
G4cout << G4endl << "Type the number ( 0:end, -n:n level back ) : "<<std::flush;
|
||||
G4cin >> i;
|
||||
if(!G4cin.good()){
|
||||
G4cin.clear();
|
||||
|
||||
@@ -22,15 +22,15 @@
|
||||
//
|
||||
//
|
||||
// 12/06/2002 G4UIGainServer H. MInamimoto and H. Yoshida created
|
||||
// $Id: G4UIGainServer.cc,v 1.5 2002/12/05 16:33:42 asaim Exp $
|
||||
// $Name: geant4-05-01 $
|
||||
// $Id: G4UIGainServer.cc,v 1.7 2003/06/16 16:55:52 gunter Exp $
|
||||
// $Name: geant4-05-02 $
|
||||
//
|
||||
#ifndef WIN32
|
||||
|
||||
#include "G4UIGainServer.hh"
|
||||
#include <netdb.h>
|
||||
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
#include "G4StateManager.hh"
|
||||
#include "G4UIcommandTree.hh"
|
||||
#include "G4UIcommand.hh"
|
||||
@@ -262,7 +262,7 @@ G4String G4UIGainServer::GetCommand()
|
||||
G4String ss = nC(1,nC.length()-1);
|
||||
G4int vl;
|
||||
const char* tt = ss;
|
||||
G4std::istrstream is((char*)tt);
|
||||
std::istrstream is((char*)tt);
|
||||
is >> vl;
|
||||
G4int nh = UI->GetNumberOfHistory();
|
||||
if(vl>=0 && vl<nh)
|
||||
@@ -323,7 +323,7 @@ G4int G4UIGainServer::ReceiveG4cout(G4String coutString)
|
||||
|
||||
|
||||
|
||||
//G4std::cout << coutString << G4std::flush;
|
||||
//std::cout << coutString << std::flush;
|
||||
//return 0;
|
||||
}
|
||||
|
||||
@@ -338,7 +338,7 @@ G4int G4UIGainServer::ReceiveG4cerr(G4String cerrString)
|
||||
|
||||
|
||||
|
||||
//G4std::cerr << cerrString << G4std::flush;
|
||||
//std::cerr << cerrString << std::flush;
|
||||
//return 0;
|
||||
}
|
||||
|
||||
@@ -404,8 +404,11 @@ void G4UIGainServer::WaitingConnection(){
|
||||
len = sizeof(caddr);
|
||||
|
||||
for(int i=1;i<=2;i++){
|
||||
// if((socketD[i] = accept(socketD[0], (struct sockaddr *)&caddr,(int *)&len))<0){
|
||||
#ifndef __APPLE__
|
||||
if((socketD[i] = accept(socketD[0], (struct sockaddr *)&caddr,(socklen_t *)&len))<0){
|
||||
#else
|
||||
if((socketD[i] = accept(socketD[0], (struct sockaddr *)&caddr,(int *)&len))<0){
|
||||
#endif
|
||||
G4cerr<<"accept:"<<i<<G4endl;
|
||||
exit(1);
|
||||
}
|
||||
@@ -533,7 +536,7 @@ void G4UIGainServer::TerminalHelp(G4String newCommand){
|
||||
G4UIcommandTree* treeTop = UI->GetTree();
|
||||
unsigned i = newCommand.index(" ");
|
||||
|
||||
if(i!=G4std::string::npos){
|
||||
if(i!=std::string::npos){
|
||||
G4String newValue = newCommand(i+1,newCommand.length()-(i+1));
|
||||
newValue.strip(G4String::both);
|
||||
if(newValue(0)!='/'){
|
||||
@@ -564,7 +567,7 @@ void G4UIGainServer::TerminalHelp(G4String newCommand){
|
||||
floor[iFloor]->ListCurrentWithNum();
|
||||
while(1){
|
||||
int i;
|
||||
G4cout<<G4endl <<"Type the number (0:end, -n:n level back) :"<<G4std::flush;
|
||||
G4cout<<G4endl <<"Type the number (0:end, -n:n level back) :"<<std::flush;
|
||||
G4cin >> i;
|
||||
if(!G4cin.good()){
|
||||
G4cin.clear();
|
||||
|
||||
Reference in New Issue
Block a user