Changeset 6bef16c in tol

Timestamp:

Nov 4, 2009, 6:36:11 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

251e783

Parents:

1908267

Message:

Fixed #762

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

Location:

tol

Files:

• bmath/mathobjects/dat.cpp (modified) (1 diff)
• bmath/mathobjects/tol_bdat.h (modified) (1 diff)
• btol/real_type/datgrav.cpp (modified) (1 diff)

tol/bmath/mathobjects/dat.cpp

@@ -1198 +1198 @@
 
 //--------------------------------------------------------------------
+void BDat::PutValue(const BText& name, const BText& format)
+
+/*! Puts the real value of name in this or unknown if name is not
+ *  a valid real number
+ * \param name Value thet is assigned to BDat
+ */
+//--------------------------------------------------------------------
+{
+  value_ = nan_;
+  int ret = sscanf(name.String(),format.String(),&value_);
+  if(ret!=1)
+  {
+    value_ = nan_;
+  }
+}
+
+//--------------------------------------------------------------------
 ostream& operator<< (ostream& os, const BArray<BDat>& arr)
 

tol/bmath/mathobjects/tol_bdat.h

@@ -192 +192 @@
 
   //! Updates with the values of BChar
-  void   PutValue (const BChar* name);
+  void PutValue (const BChar* name);
   //! Updates with the values of BText
-  void   PutValue (const BText& expr);    //dattext.cpp
+  void PutValue (const BText& expr);    //dattext.cpp
+  //! Updates with the values of BText and specified format
+  void PutValue(const BText& name, const BText& format);
   //! Updates \a value_ attribute with \a x
   void   PutValue (BReal x) { value_ = x; }

tol/btol/real_type/datgrav.cpp

@@ -1680 +1680 @@
 
 
+//--------------------------------------------------------------------
+DeclareContensClass(BDat, BDatTemporary, BDatTextToReal);
+DefExtOpr(1, BDatTextToReal, "TextToReal", 1, 2, "Text Text",
+  "(Text txt [, Text format=\"%lg\"])",
+  I2("Convers to real a formatted text. You can specify any standard "
+     "C format for type double.",
+     "Convierte a real un texto formateado. Se puede especificar un "
+     "formato estándar cualquiera de C para el tipo double ")+
+  I2("\nWARNING: Not all formats are inversible. "
+     "For example, format strings with literals "
+     "they must be separated with a specified separator character.",
+     "\nCUIDADO: No todas las cadenas de formato tienen porqué ser inversibles. "
+     "Por ejemplo, si usan literales "
+     "éstos deben estar separados del resto por un caracter especificado."),
+          BOperClassify::TimeAlgebra_);
+//--------------------------------------------------------------------
+void BDatTextToReal::CalcContens()
+//--------------------------------------------------------------------
+{
+  BText& txt = Text(Arg(1));
+  if(!Arg(2))
+  {
+    contens_.PutValue(txt);
+  }
+  else
+  {
+    BText& fmt = Text(Arg(2));
+    contens_.PutValue(txt,fmt);
+  }
+}
 
 //--------------------------------------------------------------------