Changeset 600
- Timestamp:
- Nov 15, 2007, 11:55:33 AM (17 years ago)
- Location:
- trunk/geant4
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/specific-geant4-dev.sh
r595 r600 27 27 export G4RADIOACTIVEDATA=$G4DATA/RadiativeDecay 28 28 export G4LEDATA=$G4DATA/G4EMLOW3.0 29 export QTHOME=/usr/local/Qt/4.3.029 # export QTHOME=/usr/local/Qt/4.3.0 30 30 #////////////////////////////////////////////////////////// 31 31 # GUI, Visualization : -
trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh
r595 r600 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateQtViewer.hh,v 1. 2 2007/11/08 17:00:51 lgarnier Exp $27 // $Id: G4OpenGLImmediateQtViewer.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/geant4/visualization/OpenGL/include/G4OpenGLQtExportDialog.hh
r595 r600 25 25 // 26 26 // 27 // $Id: G4OpenGLQtExportDialog.hh,v 1. 2 2007/11/08 17:00:51 lgarnier Exp $27 // $Id: G4OpenGLQtExportDialog.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $ 28 28 // GEANT4 tag $Name: 29 29 // -
trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh
r595 r600 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.hh,v 1. 2 2007/11/08 17:00:51 lgarnier Exp $27 // $Id: G4OpenGLQtViewer.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 48 48 class QDialog; 49 49 class QContextMenuEvent; 50 #if QT_VERSION < 0x040000 51 class QPopupMenu; 52 #else 50 53 class QMenu; 54 #endif 51 55 class QImage; 52 56 class QAction; … … 70 74 void manageContextMenuEvent(QContextMenuEvent *e); 71 75 void G4MousePressEvent(QPoint); 76 #if QT_VERSION < 0x040000 77 void G4MouseMoveEvent(int, int, Qt::ButtonState); 78 #else 72 79 void G4MouseMoveEvent(int, int, Qt::MouseButtons); 80 #endif 81 73 82 74 83 protected: … … 85 94 bool generatePS_PDF(QString,int,QImage); 86 95 96 #if QT_VERSION < 0x040000 97 QPopupMenu *fContextMenu; 98 #else 87 99 QMenu *fContextMenu; 100 #endif 88 101 bool fMouseAction; // 1: rotate 0:move 89 102 QPoint lastPos; 103 #if QT_VERSION < 0x040000 104 QPopupMenu *fDrawingWireframe; 105 QPopupMenu *fDrawingLineRemoval; 106 QPopupMenu *fDrawingSurfaceRemoval; 107 QPopupMenu *fDrawingLineSurfaceRemoval; 108 #else 90 109 QAction *fDrawingWireframe; 91 110 QAction *fDrawingLineRemoval; 92 111 QAction *fDrawingSurfaceRemoval; 93 112 QAction *fDrawingLineSurfaceRemoval; 113 #endif 94 114 95 115 private slots : -
trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredQtViewer.hh
r595 r600 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredQtViewer.hh,v 1. 2 2007/11/08 17:00:51 lgarnier Exp $27 // $Id: G4OpenGLStoredQtViewer.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r599 r600 698 698 699 699 if (aAction ==1) { 700 #if QT_VERSION < 0x040000 701 fDrawingWireframe->setItemChecked (0,true); 702 fDrawingLineRemoval->setItemChecked (0,false); 703 fDrawingSurfaceRemoval->setItemChecked (0,false); 704 fDrawingLineSurfaceRemoval->setItemChecked (0,false); 705 #else 700 706 fDrawingWireframe->setChecked (true); 701 707 fDrawingLineRemoval->setChecked (false); 702 708 fDrawingSurfaceRemoval->setChecked (false); 703 709 fDrawingLineSurfaceRemoval->setChecked (false); 710 #endif 704 711 705 712 d_style = G4ViewParameters::wireframe; 706 713 707 714 } else if (aAction ==2) { 715 #if QT_VERSION < 0x040000 716 fDrawingWireframe->setItemChecked (0,false); 717 fDrawingLineRemoval->setItemChecked (0,true); 718 fDrawingSurfaceRemoval->setItemChecked (0,false); 719 fDrawingLineSurfaceRemoval->setItemChecked (0,false); 720 #else 708 721 fDrawingWireframe->setChecked (false); 709 722 fDrawingLineRemoval->setChecked (true); 710 723 fDrawingSurfaceRemoval->setChecked (false); 711 724 fDrawingLineSurfaceRemoval->setChecked (false); 725 #endif 712 726 713 727 d_style = G4ViewParameters::hlr; 714 728 715 729 } else if (aAction ==3) { 730 #if QT_VERSION < 0x040000 731 fDrawingWireframe->setItemChecked (0,false); 732 fDrawingLineRemoval->setItemChecked (0,false); 733 fDrawingSurfaceRemoval->setItemChecked (0,true); 734 fDrawingLineSurfaceRemoval->setItemChecked (0,false); 735 #else 716 736 fDrawingWireframe->setChecked (false); 717 737 fDrawingLineRemoval->setChecked (false); 718 738 fDrawingSurfaceRemoval->setChecked (true); 719 739 fDrawingLineSurfaceRemoval->setChecked (false); 740 #endif 720 741 721 742 d_style = G4ViewParameters::hsr; 722 743 723 744 } else if (aAction ==4) { 745 #if QT_VERSION < 0x040000 746 fDrawingWireframe->setItemChecked (0,false); 747 fDrawingLineRemoval->setItemChecked (0,false); 748 fDrawingSurfaceRemoval->setItemChecked (0,false); 749 fDrawingLineSurfaceRemoval->setItemChecked (0,true); 750 #else 724 751 fDrawingWireframe->setChecked (false); 725 752 fDrawingLineRemoval->setChecked (false); 726 753 fDrawingSurfaceRemoval->setChecked (false); 727 754 fDrawingLineSurfaceRemoval->setChecked (true); 728 755 #endif 729 756 d_style = G4ViewParameters::hlhsr; 730 757 } … … 887 914 void G4OpenGLQtViewer::actionCreateEPS() { 888 915 QString filters; 916 #if QT_VERSION < 0x040000 917 QStrList listFormat=QImageIO::outputFormats(); 918 char *tmp=listFormat.first(); 919 while (tmp!=0) { 920 filters += QString(tmp) + ";;"; 921 tmp=listFormat.next(); 922 } 923 #else 889 924 QList<QByteArray> formats = QImageWriter::supportedImageFormats (); 890 925 for (int i = 0; i < formats.size(); ++i) { 891 filters +=formats.at(i)+";;"; 892 // if ((i+1) <formats.size()) { 893 // filters += ";;"; 894 // } 895 } 926 filters +=formats.at(i) + ";;"; 927 } 928 #endif 896 929 filters += "eps;;"; 897 930 filters += "ps;;"; 898 931 filters += "pdf"; 899 932 QString* selectedFilter = new QString(); 933 #if QT_VERSION < 0x040000 934 QString nomFich = QFileDialog::getSaveFileName ( ".", 935 filters, 936 GLWindow, 937 "Save file dialog", 938 tr("Save as ..."), 939 selectedFilter ); 940 #else 900 941 QString nomFich = QFileDialog::getSaveFileName ( GLWindow, 901 942 tr("Save as ..."), … … 903 944 filters, 904 945 selectedFilter ); 946 #endif 905 947 // bmp jpg jpeg png ppm xbm xpm 906 948 if (nomFich == "") { 907 949 return; 908 950 } 951 #if QT_VERSION < 0x040000 952 nomFich += "."+selectedFilter->lower(); 953 printf("G4OpenGLQtViewer::name %s\n",nomFich.ascii()); 954 #else 909 955 nomFich += "."+selectedFilter->toLower(); 910 printf("G4OpenGLQtViewer::name %s\n",nomFich.toStdString().c_str()); 956 printf("G4OpenGLQtViewer::name %s\n",nomFich.toAscii()); 957 #endif 911 958 G4OpenGLQtExportDialog* exportDialog= new G4OpenGLQtExportDialog(GLWindow,nomFich,fWindow->height(),fWindow->width()); 912 959 if( exportDialog->exec()) { … … 1110 1157 1111 1158 if ((!aImage.isGrayscale ()) &&(aInColor ==1 )) { 1159 #if QT_VERSION < 0x040000 1160 aImage.convertDepth(1,Qt::MonoOnly); 1161 #else 1112 1162 aImage.convertToFormat ( aImage.format(), Qt::MonoOnly); 1163 #endif 1113 1164 } 1114 1165 const uchar * pixels = aImage.bits (); … … 1117 1168 return false; 1118 1169 1119 fp = fopen (aFilename.toStdString().c_str(), "w"); 1170 #if QT_VERSION < 0x040000 1171 fp = fopen (aFilename.ascii(), "w"); 1172 #else 1173 fp = fopen (aFilename.toAscii(), "w"); 1174 #endif 1120 1175 if (fp == NULL) { 1121 1176 return false; … … 1123 1178 1124 1179 fprintf (fp, "%%!PS-Adobe-2.0 EPSF-1.2\n"); 1125 fprintf (fp, "%%%%Title: %s\n", aFilename.toStdString().c_str()); 1180 #if QT_VERSION < 0x040000 1181 fprintf (fp, "%%%%Title: %s\n", aFilename.ascii()); 1182 #else 1183 fprintf (fp, "%%%%Title: %s\n", aFilename.toAscii()); 1184 #endif 1126 1185 fprintf (fp, "%%%%Creator: OpenGL pixmap render output\n"); 1127 1186 fprintf (fp, "%%%%BoundingBox: 0 0 %d %d\n", aImage.width(), aImage.height()); … … 1246 1305 ) 1247 1306 { 1307 #if QT_VERSION < 0x040000 1308 #ifdef Q_WS_MAC || Q_WS_X11 1248 1309 QPrinter printer; 1249 1310 // printer.setPageSize(pageSize); … … 1254 1315 } 1255 1316 1256 if (aFilename.endsWith(".ps")) { 1257 printer.setOutputFormat(QPrinter::PostScriptFormat); 1258 } else { 1259 printer.setOutputFormat(QPrinter::PdfFormat); 1260 } 1317 /* FIXME : I don't know which format it will save... 1318 if (aFilename.endsWith(".ps")) { 1319 printer.setOutputFormat(QPrinter::PostScriptFormat); 1320 } else { 1321 printer.setOutputFormat(QPrinter::PdfFormat); 1322 } 1323 */ 1261 1324 printer.setOutputFileName(aFilename); 1262 1325 // printer.setFullPage ( true); … … 1264 1327 paint.drawImage (0,0,aImage ); 1265 1328 paint.end(); 1329 #else 1330 G4cerr << "This fonction is only supported on Mac OsX or X11 with Qt3. Full platform supported with Qt4" << G4endl; 1331 #endif 1332 #else 1333 QPrinter printer; 1334 // printer.setPageSize(pageSize); 1335 if (aInColor == 1) { 1336 printer.setColorMode(QPrinter::GrayScale); 1337 } else { 1338 printer.setColorMode(QPrinter::Color); 1339 } 1340 1341 if (aFilename.endsWith(".ps")) { 1342 printer.setOutputFormat(QPrinter::PostScriptFormat); 1343 } else { 1344 printer.setOutputFormat(QPrinter::PdfFormat); 1345 } 1346 printer.setOutputFileName(aFilename); 1347 // printer.setFullPage ( true); 1348 QPainter paint(&printer); 1349 paint.drawImage (0,0,aImage ); 1350 paint.end(); 1351 #endif 1266 1352 return true; 1267 1353 } -
trunk/geant4/visualization/management/include/G4VisExecutive.icc
r595 r600 25 25 // 26 26 // 27 // $Id: G4VisExecutive.icc,v 1.1 6 2007/10/03 14:20:23lgarnier Exp $27 // $Id: G4VisExecutive.icc,v 1.17 2007/11/09 15:03:22 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 //
Note: See TracChangeset
for help on using the changeset viewer.