Changeset 1228 for trunk/source/visualization/gMocren

Timestamp:

Jan 8, 2010, 11:56:51 AM (16 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/visualization/gMocren

Files:

• History (modified) (2 diffs)
• include/G4GMocrenIO.hh (modified) (2 diffs)
• src/G4GMocrenFileCTtoDensityMap.cc (modified) (1 diff)
• src/G4GMocrenFileSceneHandler.cc (modified) (3 diffs)
• src/G4GMocrenFileViewer.cc (modified) (2 diffs)
• src/G4GMocrenIO.cc (modified) (3 diffs)

trunk/source/visualization/gMocren/History

@@ -1 @@
-$Id: History,v 1.7 2009/11/05 11:37:12 gcosmo Exp $
+$Id: History,v 1.9 2009/12/03 11:44:42 akimura Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/gMocren sub-category
 ---------------------------------------------------
+
+3 December 2009  Akinori Kimura
+Line 363 of G4GMocrenFileSceneHandler.cc was deleted.
+It was a debug code with G4cout.
+Another file I/O bug was fixed. The following files were committed.
+G4GMocrenFileViewer.cc
+G4GMocrenFileSceneHandler.cc
+G4GMocrenIO.{cc,hh}
 
 5 November 2009  Gabriele Cosmo (gMocren-V09-02-03)

trunk/source/visualization/gMocren/include/G4GMocrenIO.hh

@@ -43 +43 @@
 
   void clear();
+  void clearImage();
   void setSize(int _size[3]);
   void getSize(int _size[3]);
@@ -292 +293 @@
   void setModalityImage(short * _image);
   short * getModalityImage(int _z);
+  void clearModalityImage();
   // set/get the modality image density map
   void setModalityImageDensityMap(std::vector<float> & _map);

trunk/source/visualization/gMocren/src/G4GMocrenFileCTtoDensityMap.cc

@@ +1 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
 #include "G4GMocrenFileCTtoDensityMap.hh"
 

trunk/source/visualization/gMocren/src/G4GMocrenFileSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4GMocrenFileSceneHandler.cc,v 1.10 2009/11/05 11:34:01 gcosmo Exp $
+// $Id: G4GMocrenFileSceneHandler.cc,v 1.12 2009/12/03 11:44:42 akimura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -301 +301 @@
     
     // initializations
+    //kgMocrenIO->clearModalityImage();
     kgMocrenIO->clearDoseDistAll();
     kgMocrenIO->clearROIAll();
@@ -361 +362 @@
             modality[ixy] = kgMocrenIO->convertDensityToHU(itr->second);
           } else {
-            G4cout << "ABC : " << x << ", " <<  y << ", " << z << G4endl;
             modality[ixy] = -1024;
           }

trunk/source/visualization/gMocren/src/G4GMocrenFileViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4GMocrenFileViewer.cc,v 1.2 2009/10/12 10:04:35 akimura Exp $
+// $Id: G4GMocrenFileViewer.cc,v 1.3 2009/12/03 11:44:42 akimura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -107 +107 @@
     G4cerr << "***** G4GMocrenFileViewer::ClearView (): No effects " << G4endl;
 
-  if(kSceneHandler.kGddDest) {
-    kSceneHandler.kGddDest.close();
+  //if(kSceneHandler.kGddDest) {
+    //kSceneHandler.kGddDest.close();
     // Re-open with same filename...
-    kSceneHandler.kGddDest.open(kSceneHandler.kGddFileName);
+    //kSceneHandler.kGddDest.open(kSceneHandler.kGddFileName);
     kSceneHandler.kFlagInModeling = false;
     kSceneHandler.GFBeginModeling();
-  }
+    //}
 }
 

trunk/source/visualization/gMocren/src/G4GMocrenIO.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4GMocrenIO.cc,v 1.4 2009/11/05 03:14:12 akimura Exp $
+// $Id: G4GMocrenIO.cc,v 1.5 2009/12/03 11:44:42 akimura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -170 +170 @@
   kMinmax[1] = (T)-32109;
 
-  /*
-    if(!image.empty()) {
-    typename std::vector<T *>::iterator itr;
-    for(itr = image.begin(); itr != image.end(); itr++) {
+  clearImage();
+}
+template <typename T> 
+void GMocrenDataPrimitive<T>::clearImage() {
+  typename std::vector<T *>::iterator itr;
+  for(itr = kImage.begin(); itr != kImage.end(); itr++) {
     delete [] *itr;
-    }
-    }
-  */
+  }
   kImage.clear();
 }
@@ -3368 +3368 @@
   return kModality.getImage(_z);
 }
+void G4GMocrenIO::clearModalityImage() {
+  
+  kModality.clearImage();
+}
 // set/get the modality image density map
 void G4GMocrenIO::setModalityImageDensityMap(std::vector<float> & _map) {