projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r122: *** empty log message ***
[ctsim.git]
/
libctsim
/
projections.cpp
diff --git
a/libctsim/projections.cpp
b/libctsim/projections.cpp
index cd151be0e18013b9936bd0103ecc7822ef832857..7b13546bf19ab8c711e8ae1baa81f05fd8ab5b5c 100644
(file)
--- a/
libctsim/projections.cpp
+++ b/
libctsim/projections.cpp
@@
-8,7
+8,7
@@
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: projections.cpp,v 1.
5 2000/06/25 17:32:24
kevin Exp $
+** $Id: projections.cpp,v 1.
6 2000/06/27 10:48:11
kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
@@
-132,18
+132,26
@@
Projections::deleteProjData (void)
/* NAME
/* NAME
- *
projections_write_header
Write data header for projections file
+ *
Projections::headerWwrite
Write data header for projections file
*
*/
bool
Projections::headerWrite (fnetorderstream& fs)
{
*
*/
bool
Projections::headerWrite (fnetorderstream& fs)
{
- kuint32 _hsize = m_headerSize;
+ kuint16 _hsize = m_headerSize;
+ kuint16 _signature = m_signature;
kuint32 _nView = m_nView;
kuint32 _nDet = m_nDet;
kuint32 _geom = m_geometry;
kuint32 _nView = m_nView;
kuint32 _nDet = m_nDet;
kuint32 _geom = m_geometry;
- kuint32 _remarksize = m_remark.length();
+ kuint16 _remarksize = m_remark.length();
+ kuint16 _year = m_year;
+ kuint16 _month = m_month;
+ kuint16 _day = m_day;
+ kuint16 _hour = m_hour;
+ kuint16 _minute = m_minute;
+ kuint16 _second = m_second;
+
kfloat64 _calcTime = m_calcTime;
kfloat64 _rotStart = m_rotStart;
kfloat64 _rotInc = m_rotInc;
kfloat64 _calcTime = m_calcTime;
kfloat64 _rotStart = m_rotStart;
kfloat64 _rotInc = m_rotInc;
@@
-155,7
+163,8
@@
Projections::headerWrite (fnetorderstream& fs)
if (! fs)
return false;
if (! fs)
return false;
- fs.writeInt32 (_hsize);
+ fs.writeInt16 (_hsize);
+ fs.writeInt16 (_signature);
fs.writeInt32 (_nView);
fs.writeInt32 (_nDet);
fs.writeInt32 (_geom);
fs.writeInt32 (_nView);
fs.writeInt32 (_nDet);
fs.writeInt32 (_geom);
@@
-165,13
+174,19
@@
Projections::headerWrite (fnetorderstream& fs)
fs.writeFloat64 (_detStart);
fs.writeFloat64 (_detInc);
fs.writeFloat64 (_phmLen);
fs.writeFloat64 (_detStart);
fs.writeFloat64 (_detInc);
fs.writeFloat64 (_phmLen);
- fs.writeInt32 (_remarksize);
+ fs.writeInt16 (_year);
+ fs.writeInt16 (_month);
+ fs.writeInt16 (_day);
+ fs.writeInt16 (_hour);
+ fs.writeInt16 (_minute);
+ fs.writeInt16 (_second);
+ fs.writeInt16 (_remarksize);
fs.write (m_remark.c_str(), _remarksize);
m_headerSize = fs.tellp();
_hsize = m_headerSize;
fs.seekp(0);
fs.write (m_remark.c_str(), _remarksize);
m_headerSize = fs.tellp();
_hsize = m_headerSize;
fs.seekp(0);
- fs.writeInt
32
(_hsize);
+ fs.writeInt
16
(_hsize);
if (! fs)
return false;
if (! fs)
return false;
@@
-185,24
+200,17
@@
Projections::headerWrite (fnetorderstream& fs)
bool
Projections::headerRead (fnetorderstream& fs)
{
bool
Projections::headerRead (fnetorderstream& fs)
{
- kuint32 _hsize;
- kuint32 _nView;
- kuint32 _nDet;
- kuint32 _geom;
- kuint32 _remarksize = 0;
- kfloat64 _calcTime;
- kfloat64 _rotStart;
- kfloat64 _rotInc;
- kfloat64 _detStart;
- kfloat64 _detInc;
- kfloat64 _phmLen;
+ kuint16 _hsize, _signature, _year, _month, _day, _hour, _minute, _second, _remarksize = 0;
+ kuint32 _nView, _nDet, _geom;
+ kfloat64 _calcTime, _rotStart, _rotInc, _detStart, _detInc, _phmLen;
fs.seekg(0);
if (! fs)
return false;
off_t testPos;
fs.seekg(0);
if (! fs)
return false;
off_t testPos;
- fs.readInt32 (_hsize);
+ fs.readInt16 (_hsize);
+ fs.readInt16 (_signature);
fs.readInt32 (_nView);
fs.readInt32 (_nDet);
fs.readInt32 (_geom);
fs.readInt32 (_nView);
fs.readInt32 (_nDet);
fs.readInt32 (_geom);
@@
-212,17
+220,24
@@
Projections::headerRead (fnetorderstream& fs)
fs.readFloat64 (_detStart);
fs.readFloat64 (_detInc);
fs.readFloat64 (_phmLen);
fs.readFloat64 (_detStart);
fs.readFloat64 (_detInc);
fs.readFloat64 (_phmLen);
- fs.readInt32 (_remarksize);
- if (_remarksize > 100000) {
- sys_error (ERR_SEVERE, "Insane _remarksize %d [projections::headerRead]", _remarksize);
- return false;
- }
+ fs.readInt16 (_year);
+ fs.readInt16 (_month);
+ fs.readInt16 (_day);
+ fs.readInt16 (_hour);
+ fs.readInt16 (_minute);
+ fs.readInt16 (_second);
+ fs.readInt16 (_remarksize);
if (! fs) {
sys_error (ERR_SEVERE, "Error reading header information , _remarksize=%d [projections_read_header]", _remarksize);
return false;
}
if (! fs) {
sys_error (ERR_SEVERE, "Error reading header information , _remarksize=%d [projections_read_header]", _remarksize);
return false;
}
+ if (_signature != m_signature) {
+ sys_error (ERR_SEVERE, "File %s does not have a valid projection file signature", m_filename.c_str());
+ return false;
+ }
+
char remarkStorage[_remarksize+1];
fs.read (remarkStorage, _remarksize);
if (! fs) {
char remarkStorage[_remarksize+1];
fs.read (remarkStorage, _remarksize);
if (! fs) {
@@
-248,6
+263,17
@@
Projections::headerRead (fnetorderstream& fs)
m_detStart = _detStart;
m_detInc = _detInc;
m_phmLen = _phmLen;
m_detStart = _detStart;
m_detInc = _detInc;
m_phmLen = _phmLen;
+ m_year = _year;
+ m_month = _month;
+ m_day = _day;
+ m_hour = _hour;
+ m_minute = _minute;
+ m_second = _second;
+
+ m_label.setLabelType (Array2dFileLabel::L_HISTORY);
+ m_label.setLabelString (m_remark);
+ m_label.setCalcTime (m_calcTime);
+ m_label.setDateTime (m_year, m_month, m_day, m_hour, m_minute, m_second);
return true;
}
return true;
}
@@
-256,6
+282,7
@@
bool
Projections::read (const char* filename)
{
frnetorderstream fileRead (filename, ios::in | ios::binary);
Projections::read (const char* filename)
{
frnetorderstream fileRead (filename, ios::in | ios::binary);
+ m_filename = filename;
if (! fileRead)
return false;
if (! fileRead)
return false;
@@
-280,11
+307,21
@@
bool
Projections::write (const char* filename)
{
frnetorderstream fs (filename, ios::out | ios::binary | ios::trunc | ios::ate);
Projections::write (const char* filename)
{
frnetorderstream fs (filename, ios::out | ios::binary | ios::trunc | ios::ate);
-
+ m_filename = filename;
if (! fs) {
sys_error (ERR_SEVERE, "Error opening file %s for output [projections_create]", filename);
return false;
}
if (! fs) {
sys_error (ERR_SEVERE, "Error opening file %s for output [projections_create]", filename);
return false;
}
+
+ time_t t = time(NULL);
+ tm* lt = localtime(&t);
+ m_year = lt->tm_year;
+ m_month = lt->tm_mon;
+ m_day = lt->tm_mday;
+ m_hour = lt->tm_hour;
+ m_minute = lt->tm_min;
+ m_second = lt->tm_sec;
+
if (! headerWrite (fs))
return false;
if (! headerWrite (fs))
return false;