Changeset 134 for XMLIO_V2/dev/dev_rv/src/XMLIO/c_interface.cpp

Timestamp:

10/15/10 11:16:12 (14 years ago)

Author:

hozdoba

Message:

Pour sauvegarde

File:

• XMLIO_V2/dev/dev_rv/src/XMLIO/c_interface.cpp (modified) (8 diffs)

XMLIO_V2/dev/dev_rv/src/XMLIO/c_interface.cpp

@@ -5 +5 @@
 /* ********************************************************** */
 
-static inline std::string stringXtoStd(XString _str)
+static inline std::string stringXtoStd(const XString _str)
 {
    char * const temp = new char[_str.len+1]();
@@ -25 +25 @@
 }
 
+static inline Duration durationXtoXMLIO(const XDuration * const _xdur) // Non testée
+{
+   Duration __dur= { _xdur->year, _xdur->month , _xdur->day,
+                     _xdur->hour, _xdur->minute, _xdur->second };
+   return (__dur);
+}
+
 /* ********************************************************** */
 /*                      HANDLE INTERFACE                      */
 /* ********************************************************** */
 
-void xios_handle_create_(XHandle * _ret, const XDType * const _dtype, XString _id)
+void xios_handle_create_(XHandle * const _ret, const XDType * const _dtype, const XString _id)
 {
    // Si le handle n'est pas initialisé à 0, on ne fait aucun traitement.
@@ -54 +61 @@
 /* ********************************************************** */
 
-void xios_xml_parse_file_(XString _filename)
+void xios_xml_parse_file_(const XString _filename)
 {
    std::string   __filename = stringXtoStd(_filename);
@@ -67 +74 @@
 }
 
-void xios_xml_parse_string_(XString _xmlcontent)
+void xios_xml_parse_string_(const XString _xmlcontent)
 {
    std::string        __xmlcontent = stringXtoStd(_xmlcontent);
@@ -94 +101 @@
 }
 
-void xios_dtreatment_new_(XHandle * _dt, const XHandle * const _hd)
+void xios_dtreatment_new_(XHandle * const _dt, const XHandle * const _hd)
 {
    static bool called = false;
@@ -100 +107 @@
    // Si le handle de traitement n'est pas initialisé à 0, on ne fait aucun traitement.
    if (!isNullHandle(*_dt) || (_hd->data_type != ECONTEXT)) return;
-   Context* const __ctxt = (Context*) _hd->data_ptr;
+   Context       * const __ctxt = (Context*) _hd->data_ptr;
+   DataTreatment * const __dtrt =__ctxt->setDataTreatment<DataTreatment>();
 
-   _dt->data_type = DTREATMENT;
-   _dt->data_ptr  = new DataTreatment(__ctxt);
-
-   if (!called)
+   if (__dtrt != NULL)
    {
-      atexit (&deleteAllDataTreatment);
-      called = true;
+      AllDataTreatment.push_back(__dtrt);
+      _dt->data_type = DTREATMENT;
+      _dt->data_ptr  = __dtrt;
+      if (!called)
+      {
+         atexit (&deleteAllDataTreatment);
+         called = true;
+      }
    }
 }
@@ -116 +127 @@
    if (isNullHandle(*_hd) || (_hd->data_type != DTREATMENT)) return;
    DataTreatment * const __dt = (DataTreatment*)_hd->data_ptr;
-   AllDataTreatment.push_back (__dt);
    switch(*_ft)
    {
@@ -136 +146 @@
    bool __wswap = (_wswap == NULL) ? false : *_wswap;
    if (isNullHandle(*_ctxt) || (_ctxt->data_type != ECONTEXT)) return;
-
    Context* const __ctxt = (Context*) _ctxt->data_ptr;
    Context::SetCurrentContext(__ctxt->getId(), __wswap) ;
 }
 
+void xios_context_get_current_ (XHandle * _ctxt)
+{
+   // Si le handle de traitement n'est pas initialisé à 0, on ne fait aucun traitement.
+   if ((Context::GetAllListObject().size() == 0) ||
+         !isNullHandle(*_ctxt)) return;
+   _ctxt->data_type = ECONTEXT;
+   _ctxt->data_ptr  = Context::GetCurrentContext();
+}
+
+void xios_context_get_calendar_(const XHandle * const _ctxt, XHandle * _cal)
+{
+   if (!isNullHandle(*_cal)  || isNullHandle(*_ctxt) ||
+      (_ctxt->data_type != ECONTEXT)) return;
+   Context* const __ctxt = (Context*) _ctxt->data_ptr;
+   AbstractCalendar * const __cal  = __ctxt->getCalendar();
+   if (__cal != NULL)
+   {
+      _cal->data_type = CALENDAR;
+      _cal->data_ptr  = __cal;
+   }
+}
+
+/* ********************************************************** */
+/*                      CALENDAR INTERFACE                    */
+/* ********************************************************** */
+
+void xios_calendar_set_timestep_(const XHandle * const _cal, const XDuration * const _dur)
+{
+   if (isNullHandle(*_cal) || (_cal->data_type != CALENDAR)) return;
+   const Duration __dur = durationXtoXMLIO(_dur);
+   AbstractCalendar * const __cal = (AbstractCalendar*) _cal->data_ptr;
+   __cal->setTimeStep(__dur);
+}
+
+#undef isNullHandle