- Timestamp:
- 02/25/13 03:10:18 (11 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/calendar_util.cpp
r423 r424 12 12 CDuration dur(ddr); 13 13 dur.year -= dr.year; dur.month -= dr.month ; dur.day -= dr.day; 14 dur.hour -= dr.hour; dur.minute -= dr.minute; dur.second -= dr.second; 14 dur.hour -= dr.hour; dur.minute -= dr.minute; dur.second -= dr.second; dur.timestep -= dr.timestep; 15 15 return (dur); 16 16 } … … 20 20 CDuration dur(ddr); 21 21 dur.year += dr.year; dur.month += dr.month ; dur.day += dr.day; 22 dur.hour += dr.hour; dur.minute += dr.minute; dur.second += dr.second; 22 dur.hour += dr.hour; dur.minute += dr.minute; dur.second += dr.second; dur.timestep += dr.timestep; 23 23 return (dur); 24 24 } … … 28 28 CDuration dur(ddr); 29 29 dur.year *= scal; dur.month *= scal; dur.day *= scal; 30 dur.hour *= scal; dur.minute *= scal; dur.second *= scal; 30 dur.hour *= scal; dur.minute *= scal; dur.second *= scal; dur.timestep *= scal; 31 31 return (dur); 32 32 } … … 41 41 dur.minute = -dur.minute; 42 42 dur.second = -dur.second; 43 dur.second = -dur.timestep; 43 44 return (dur); 44 45 } … … 51 52 int year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0; 52 53 const CCalendar & c = dt.getRelCalendar(); 53 54 55 drr.timestep=0 ; 56 drr=drr+dr.timestep*dt.getRelCalendar().getTimeStep() ; 57 54 58 drr.resolve(dt.getRelCalendar()); 55 59 -
XIOS/trunk/src/duration.cpp
r343 r424 6 6 { 7 7 /// ////////////////////// Définitions ////////////////////// /// 8 const CDuration Year = {1.0, 0.0, 0.0, 0.0, 0.0, 0.0}, 9 Month = {0.0, 1.0, 0.0, 0.0, 0.0, 0.0}, 10 Week = {0.0, 0.0, 7.0, 0.0, 0.0, 0.0}, 11 Day = {0.0, 0.0, 1.0, 0.0, 0.0, 0.0}, 12 Hour = {0.0, 0.0, 0.0, 1.0, 0.0, 0.0}, 13 Minute = {0.0, 0.0, 0.0, 0.0, 1.0, 0.0}, 14 Second = {0.0, 0.0, 0.0, 0.0, 0.0, 1.0}, 15 NoneDu = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; 8 const CDuration Year = {1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}, 9 Month = {0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0}, 10 Week = {0.0, 0.0, 7.0, 0.0, 0.0, 0.0, 0.0}, 11 Day = {0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0}, 12 Hour = {0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0}, 13 Minute = {0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0}, 14 Second = {0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0}, 15 NoneDu = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}, 16 TimeStep = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0}; 16 17 17 18 ///--------------------------------------------------------------- … … 20 21 { 21 22 year = duration.year; month = duration.month ; day = duration.day; 22 hour = duration.hour; minute = duration.minute; second = duration.second; 23 hour = duration.hour; minute = duration.minute; second = duration.second; timestep=duration.timestep ; 23 24 return (*this); 24 25 } … … 34 35 if(duration.minute != 0.0) { testValue = false; sout << duration.minute << "mi "; } 35 36 if(duration.second != 0.0 || testValue) { sout << duration.second << "s " ; } 37 if(duration.timestep != 0.0 || testValue) { sout << duration.timestep << "ts " ; } 36 38 37 39 // << suppression de l'espace en fin de chaîne. … … 77 79 break; 78 80 } 81 case 't' : 82 { 83 in >> c; 84 if (c=='s') duration.timestep = v; 85 break; 86 } 87 79 88 default: 80 89 StdString valc; valc.append(1, c); … … 91 100 { 92 101 if ((year == 0) && (month == 0) && (day == 0) && 93 (hour == 0) && (minute == 0) && (second == 0) )102 (hour == 0) && (minute == 0) && (second == 0) && (timestep == 0)) 94 103 return (true); 95 104 return (false); … … 131 140 CDuration CDuration::FromString(const StdString & str) 132 141 { 133 CDuration dr = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };142 CDuration dr = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; 134 143 StdIStringStream iss(str); iss >> dr; 135 144 return (dr); -
XIOS/trunk/src/duration.hpp
r343 r424 37 37 38 38 /// Propriétés publiques /// 39 double year, month, day, hour, minute, second ;39 double year, month, day, hour, minute, second, timestep; 40 40 41 41 } CDuration; … … 44 44 45 45 const extern CDuration Year, Month , Week , Day , 46 Hour, Minute, Second, NoneDu ;46 Hour, Minute, Second, NoneDu, TimeStep ; 47 47 ///--------------------------------------------------------------- 48 48
Note: See TracChangeset
for help on using the changeset viewer.