Changeset 05d3c2d in tol

Timestamp:

Aug 12, 2013, 2:46:25 PM (13 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

88d8fd9

Parents:

d4ea7bd

Message:

Refs #1720
Se redondean los segundos hasta las centésimas mediante la macro SECONDROUND, de acuerdo con la constante: SECONDPARTS.
Las fechas se muestran con los segundos enteros (si son enteros) o hasta las centésimas de segundo en otro caso.
El valor del índice utilizado en PutIndex se redondea (en lugar de usar floor) para evitar el problema que origina el tique.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@5984 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/bbasic

Files:

• dte.cpp (modified) (1 diff)
• dtealgeb.cpp (modified) (5 diffs)
• tol_bdate.h (modified) (4 diffs)

tol/bbasic/dte.cpp

@@ -268 +268 @@
  */
 //--------------------------------------------------------------------
-    : year_(y), month_(m), day_(d), hour_(h), minute_(mi), second_(s)
+    : year_(y), month_(m), day_(d), hour_(h), minute_(mi), second_(SECONDROUND(s))
 {
 }

tol/bbasic/dtealgeb.cpp

@@ -31 +31 @@
 BTraceInit("dtealgeb.cpp");
 
-static const BInt  dsByDay_  = 24*3600*100;
+static const BInt  dsByDay_  = 24*3600*SECONDPARTS;
 static const BReal dsScale_  = 1.0/dsByDay_;
 static BDateFormat dateFormat_[] =
@@ -268 +268 @@
 //  txt = BText("y")+year_+txt;
 
-    if(second_+minute_+hour_             >0)
-    {
-      char theTime[64];
-      BInt n = sprintf(theTime,"h%02di%02ds%06.3lf",hour_,minute_,second_);
-      txt.Copy(theTime,n);
+    if(second_+minute_+hour_>0)
+    {
+      if(round(second_)==second_)
+      {
+        char theTime[64];
+        BInt n = sprintf(theTime,"h%02di%02ds%02d",hour_,minute_,int(round(second_)));
+        txt.Copy(theTime,n);
+      }
+      else 
+      {
+        char theTime[64];
+        BInt n = sprintf(theTime,"h%02di%02ds%05.2lf",hour_,minute_,second_);
+        txt.Copy(theTime,n);
+      }
     }
     char theDate[64];
@@ -615 +624 @@
 {
         double idx = index;
-  if(index == -300000) { *this = unknown_; return; }
-  if(index <= -115782) { *this = begin_; return; }
-  if(index >=  219147) { *this = end_; return; }
-        double frac = modf(floor(index*dsByDay_)/dsByDay_, &idx);
-
+        if(index == -300000) { *this = unknown_; return; }
+        if(index <= -115782) { *this = begin_; return; }
+        if(index >=  219147) { *this = end_; return; }
+        double frac = modf(round(index*dsByDay_)/dsByDay_, &idx);
         PutDayIndex(int(idx));
         PutFraction(frac);
@@ -1003 +1011 @@
     if(fraction>0)
     {
-        BInt fr = int(round(dsByDay_*fraction));
-        hour_ = 24*fr/dsByDay_;
-        fr -= hour_*dsByDay_/24;
-        minute_ = 24*60*fr/dsByDay_;
-        fr -= minute_*dsByDay_/(24*60);
-        second_ = BReal(24*3600*fr)/dsByDay_;
+                BInt fr = int(round(dsByDay_*fraction));
+                hour_ = int(floor(fr/double(round(dsByDay_/24))));
+                fr -= hour_*int(round(dsByDay_/24));
+                minute_ = int(floor(fr/double(round(dsByDay_/(24*60)))));
+                fr -= minute_*int(round(dsByDay_/(24*60)));
+                second_ = BReal(SECONDROUND(fr/double(round(dsByDay_/(24*60*60)))));
     }
     else
     {
-        hour_ = minute_ = 0;
-        second_ = 0.0;
+                hour_ = minute_ = 0;
+                second_ = 0.0;
     }
 }
@@ -1082 +1090 @@
     min = ((long int)(ss-sec))/60;
     IncMinute(min);
-    second_ = sec;
+    second_ = SECONDROUND(sec);
     /*BInt  s  = (ss>0)?1:-1;
     IncMinute(s*Div(s*ss,60));

tol/bbasic/tol_bdate.h

@@ -29 +29 @@
 // types
 //--------------------------------------------------------------------
-#define BMonth BInt
-#define JANUARY    1
+#define BMonth  BInt
+#define JANUARY    1
 #define FEBRUARY   2
-#define MARCH        3
-#define APRIL        4
-#define MAY            5
-#define JUNE         6
-#define JULY         7
-#define AUGUST     8
+#define MARCH      3
+#define APRIL      4
+#define MAY        5
+#define JUNE       6
+#define JULY       7
+#define AUGUST     8
 #define SEPTEMBER  9
-#define OCTOBER   10
+#define OCTOBER   10
 #define NOVEMBER  11
 #define DECEMBER  12
 
 #define BWeekDay BInt
-#define MONDAY     1
-#define TUESDAY    2
-#define WEDNESDAY  3
-#define THURSDAY   4
-#define FRIDAY     5
-#define SATURDAY   6
-#define SUNDAY     7
+#define MONDAY      1
+#define TUESDAY     2
+#define WEDNESDAY   3
+#define THURSDAY    4
+#define FRIDAY      5
+#define SATURDAY    6
+#define SUNDAY      7
 
 
@@ -67 +67 @@
 #define DAYSCICLE1   (BInt)    365
 
+#define SECONDPARTS 100
+#define SECONDROUND(S) round(S*SECONDPARTS)/SECONDPARTS
 
 //--------------------------------------------------------------------
@@ -280 +282 @@
   void  PutMinute   (BInt    minute) { minute_  = minute; }
   //! Sets second to the actual date
-  void  PutSecond   (BReal   second) { second_  = second; }
+  void  PutSecond   (BReal   second) { second_  = SECONDROUND(second); }
   //! Sets hours, minutes and seconds corresponding to a given day fraction
   void  PutFraction (BReal   fraction);
@@ -298 +300 @@
     hour_=h;
     minute_=mi;
-    second_=s;
+    second_=SECONDROUND(s);
   }
   //! Sets date attributes from a Text \a txt (containig a date) and a DateFormat \a format