Curve window, second mark and export dialog added

src/lib/co/src/co_dcli_file.c

@@ -219,6 +219,9 @@ int     dcli_replace_env( char *str, char *newstr)
     size = (long int) s - (long int) u;
     strncpy( symbol, u, size);
     symbol[size] = 0;
+    if ( strcmp( symbol, "HOME") == 0)
+      strcpy( lower_symbol, symbol);
+    else
       cdh_ToLower( lower_symbol, symbol);
     if ( (value = getenv( lower_symbol)) == NULL) {
       /* It was no symbol */
@@ -467,7 +470,13 @@ int dcli_translate_filename( char *out, const char *in)
   else
   {
     // Already unix syntax
+    if ( in[0] == '~') {
+      strcpy( out_name, "$HOME");
+      strcat( &out_name[5], &in[1]);
+    }
+    else
       strcpy( out_name, in);
+
     sts = dcli_replace_env( out_name, out);
     return sts;
   }

src/lib/co/src/co_time.c

@@ -171,7 +171,7 @@ time_Aadd (
 )
 {
   pwr_tTime   *r = result;
-  int     tv_nsec;
+  pwr_tInt64  tv_nsec;
 
   assertAbs(t);
   assertDelta(a);
@@ -231,8 +231,8 @@ time_Adiff (
   pwr_tTime   *s
 )
 {
-  int     tv_nsec = t->tv_nsec - s->tv_nsec;
-  int     tv_sec  = t->tv_sec  - s->tv_sec;
+  pwr_tInt64     tv_nsec = t->tv_nsec - s->tv_nsec;
+  pwr_tInt64     tv_sec  = t->tv_sec  - s->tv_sec;
 
   pwr_Assert(r != NULL);
   assertAbs(t);
@@ -267,8 +267,8 @@ time_Asub (
   pwr_tDeltaTime  *s
 )
 {
-  int     tv_nsec = t->tv_nsec - s->tv_nsec;
-  int     tv_sec  = (int)t->tv_sec  - s->tv_sec;
+  pwr_tInt64     tv_nsec = t->tv_nsec - s->tv_nsec;
+  pwr_tInt64     tv_sec  = t->tv_sec  - s->tv_sec;
   pwr_tTime   *r = result;
 
   assertAbs(t);
@@ -329,7 +329,7 @@ time_Dadd (
 )
 {
   pwr_tDeltaTime  *r = result;
-  int     tv_nsec, tv_sec;
+  pwr_tInt64     tv_nsec, tv_sec;
 
   assertDelta(t);
   assertDelta(a);
@@ -423,8 +423,8 @@ time_Dsub (
   pwr_tDeltaTime  *s
 )
 {
-  int     tv_nsec = t->tv_nsec - s->tv_nsec;
-  int     tv_sec  = t->tv_sec  - s->tv_sec;
+  pwr_tInt64     tv_nsec = t->tv_nsec - s->tv_nsec;
+  pwr_tInt64     tv_sec  = t->tv_sec  - s->tv_sec;
   pwr_tDeltaTime  *r = result;
 
   assertDelta(t);

src/lib/rt/src/rt_plc_thread.c

@@ -269,6 +269,8 @@ scan (
 /*  if (sts == TIME__CLKCHANGE) {
     tp->after_scan = tp->before_scan;
   }*/
+  //if ( tp->PlcThread->Count % 10000 == 0)
+  //  printf( "ba: %9lld %9lld    %9lld %9lld\n", tp->before_scan.tv_sec, tp->before_scan.tv_nsec, tp->after_scan.tv_sec, tp->after_scan.tv_nsec);
   time_GetTime(&tp->after_scan_abs);
   if (tp->log)
     pwrb_PlcThread_Exec(tp);
@@ -279,6 +281,8 @@ scan (
     plc_timerhandler(tp); 
     time_Aadd(NULL, &tp->sync_time, &tp->scan_time);
     time_Adiff(&delta, &tp->sync_time, &tp->after_scan);
+    //if ( tp->PlcThread->Count % 10000 == 0)
+    //  printf( "ff: %9lld %9lld    %9lld %9lld     %9lld %9lld\n", tp->sync_time.tv_sec, tp->sync_time.tv_nsec, tp->after_scan.tv_sec, tp->after_scan.tv_nsec, delta.tv_sec, delta.tv_nsec);
     if (time_Dcomp(&delta, NULL) > 0) {
       pwr_tStatus sts;
       int phase = 0;
@@ -312,11 +316,22 @@ scan (
        * END REMARK
        */
 //      phase = (int)que_Get(&sts, &tp->q_in, &delta, NULL);
+
       struct timespec ts;
       ts.tv_sec = tp->sync_time.tv_sec;
       ts.tv_nsec = tp->sync_time.tv_nsec;
+      //if ( tp->PlcThread->Count % 10000 == 0)
+      //printf( "st: %9d %9d %9lld %9lld\n", ts.tv_sec, ts.tv_nsec, tp->scan_time.tv_sec, tp->scan_time.tv_nsec);
+
+      pwr_tTime sleep1, sleep2;
+      time_GetTimeMonotonic(&sleep1);
+
       clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &ts, NULL);
       
+      time_GetTimeMonotonic(&sleep2);
+      if ( tp->PlcThread->Count % 10000 == 0)
+	printf( "st: %9lld  %9lld %9lld %9lld  %9d %9d   %11.9f\n", sleep1.tv_sec, sleep1.tv_nsec, sleep2.tv_sec, sleep2.tv_nsec, ts.tv_sec, ts.tv_nsec, ((float)sleep2.tv_nsec-sleep1.tv_nsec)/1000000000);
+
 #endif
       if (phase > 0) {
 	tp->exit = TRUE;

src/msg/rt/src/rt_sev_msg.msg

@@ -29,6 +29,7 @@ nodatatime	<No data found in this time interval>			/error
 noitems		<No items found>					/error
 unknownnode     <Unknown server nodename>				/error
 init		<Initialization done>					/info
+exportfile	<Unable to open export file>				/error
 .end
 
 

xtt/lib/cow/gtk/cow_wow_gtk.cpp

@@ -734,6 +734,23 @@ void CoWowGtk::CreateFileSelDia( const char *title, void *parent_ctx,
     gtk_file_filter_add_pattern( filter, "*");
     gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(dialog), filter);
   }
+  else if ( file_type == wow_eFileSelType_History) {
+    pwr_tFileName folder;
+    dcli_translate_filename( folder, "~");
+    gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(dialog), folder);
+
+    GtkFileFilter *filter = gtk_file_filter_new();
+    gtk_file_filter_set_name( filter,  "*.txt,*.csv,*.skv");
+    gtk_file_filter_add_pattern( filter, "*.txt");
+    gtk_file_filter_add_pattern( filter, "*.csv");
+    gtk_file_filter_add_pattern( filter, "*.skv");
+    gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(dialog), filter);
+
+    filter = gtk_file_filter_new();
+    gtk_file_filter_set_name( filter,  "All Files");
+    gtk_file_filter_add_pattern( filter, "*");
+    gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(dialog), filter);
+  }
 
   if ( gtk_dialog_run( GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
     char *filename;

xtt/lib/cow/src/cow_wow.h

@@ -32,6 +32,7 @@ typedef enum {
   wow_eFileSelType_WblClass,
   wow_eFileSelType_Graph,
   wow_eFileSelType_Image,
+  wow_eFileSelType_History,
   wow_eFileSelType__
 } wow_eFileSelType;
 

xtt/lib/ge/gtk/ge_curve_gtk.h

@@ -47,6 +47,13 @@ class GeCurveGtk : public GeCurve {
     GtkWidget   *minmax_widget;
     GtkWidget   *minmax_textmin_widget;
     GtkWidget   *minmax_textmax_widget;
+    GtkWidget   *menu_export;
+    GtkWidget   *export_widget;
+    GtkWidget   *export_attrcombo_widget;
+    GtkWidget   *export_fromtime_widget;
+    GtkWidget   *export_totime_widget;
+    GtkWidget   *export_rows_widget;
+    GtkWidget   *export_filename_widget;
     GtkWidget   *sea_timebox;
     GtkWidget   *timebox_start_time;
     GtkWidget   *timebox_stop_time;
@@ -58,10 +65,13 @@ class GeCurveGtk : public GeCurve {
     void write_title( char *str);
     void resize();
     void open_minmax( int idx);
+    void open_export( pwr_tTime *from, pwr_tTime *to, int rows, char *filename);
     void axis_set_width( int width);
     void create_minmax_dialog();
+    void create_export_dialog();
     void set_inputfocus();
     void enable_timebox();
+    void enable_export();
     void set_times( pwr_tTime *from, pwr_tTime *to);
     void set_times_sensitivity( int sensitive);
     pwr_tStatus get_times( pwr_tTime *from, pwr_tTime *to);
@@ -73,6 +83,7 @@ class GeCurveGtk : public GeCurve {
     static void activate_exit( GtkWidget *w, gpointer data);
     static void activate_configure( GtkWidget *w, gpointer data);
     static void activate_print( GtkWidget *w, gpointer data);
+    static void activate_export( GtkWidget *w, gpointer data);
     static void activate_zoomin( GtkWidget *w, gpointer data);
     static void activate_zoomout( GtkWidget *w, gpointer data);
     static void activate_zoomreset( GtkWidget *w, gpointer data);
@@ -95,6 +106,10 @@ class GeCurveGtk : public GeCurve {
     static void activate_help( GtkWidget *w, gpointer data);
     static void activate_minmax_ok( GtkWidget *w, gpointer data);
     static void activate_minmax_cancel( GtkWidget *w, gpointer data);
+    static void activate_export_ok( GtkWidget *w, gpointer data);
+    static void activate_export_cancel( GtkWidget *w, gpointer data);
+    static void activate_export_browse( GtkWidget *w, gpointer data);
+    static void export_file_selected_cb( void *ctx, char *filename, wow_eFileSelType file_type);
     static gboolean action_inputfocus( GtkWidget *w, GdkEvent *event, gpointer data);
 };
 

xtt/lib/ge/src/ge_curve.h

@@ -124,7 +124,8 @@ class GeCurve {
     glow_eDrawType border_bright;
     grow_tObject curve_object;
     grow_tObject curve_axisobject;
-    grow_tObject curve_markobject;
+    grow_tObject curve_markobject1;
+    grow_tObject curve_markobject2;
     GeCurveData *cd;
     double       axis_window_width;
     int          hide[CURVE_MAX_COLS];
@@ -133,7 +134,8 @@ class GeCurve {
     grow_tObject hide_l1[CURVE_MAX_COLS+1];
     grow_tObject hide_l2[CURVE_MAX_COLS+1];
     grow_tObject scale_rect[CURVE_MAX_COLS+1];
-    grow_tObject mark_annot[CURVE_MAX_COLS+1];
+    grow_tObject mark1_annot[CURVE_MAX_COLS+1];
+    grow_tObject mark2_annot[CURVE_MAX_COLS+1];
     grow_tObject cursor_annot[CURVE_MAX_COLS+1];
     grow_tObject axis_rect[CURVE_MAX_COLS+1];
     grow_tObject axis_object[CURVE_MAX_COLS+1];
@@ -150,10 +152,12 @@ class GeCurve {
     void 	 (*next_period_cb)( void *);
     void 	 (*add_cb)( void *);
     void 	 (*remove_cb)( void *);
+    int 	 (*export_cb)( void *, pwr_tTime *, pwr_tTime *, int, int, char *);
     int          initial_right_position;
     char	 title[300];
     double  	 last_cursor_x;
-    double  	 last_mark_x;
+    double  	 last_mark1_x;
+    double  	 last_mark2_x;
     int		 deferred_configure_axes;
     CoWow	 *wow;
     int		 center_from_window;
@@ -165,8 +169,10 @@ class GeCurve {
     virtual void pop() {}
     virtual void resize() {}
     virtual void open_minmax( int idx) {}
+    virtual void open_export( pwr_tTime *from, pwr_tTime *to, int rows, char *filename) {}
     virtual void axis_set_width( int width) {}  
     virtual void enable_timebox() {}
+    virtual void enable_export() {}
     virtual void set_times( pwr_tTime *from, pwr_tTime *to) {}
     virtual void set_times_sensitivity( int sensitive) {}
     virtual pwr_tStatus get_times( pwr_tTime *from, pwr_tTime *to) {return 0;}
@@ -186,6 +192,7 @@ class GeCurve {
     void measure_window( double *ll_x, double *ll_y, double *ur_x, double *ur_y);
     void activate_exit();
     void activate_configure();
+    void activate_export();
     void activate_print();
     void activate_background();
     void activate_filledcurves( int set);

xtt/lib/xtt/gtk/xtt_sevhist_gtk.cpp

@@ -76,7 +76,9 @@ XttSevHistGtk::XttSevHistGtk( void *parent_ctx,
   curve->next_period_cb = sevhist_next_period_cb;
   curve->add_cb = sevhist_add_cb;
   curve->remove_cb = sevhist_remove_cb;
+  curve->export_cb = sevhist_export_cb;
   curve->enable_timebox();
+  curve->enable_export();
 
   wow = new CoWowGtk( parent_widget);
   timerid = wow->timer_new();

xtt/lib/xtt/src/xtt_sevhist.cpp

@@ -29,6 +29,7 @@
 #include "rt_gdh_msg.h"
 #include "co_cdh.h"
 #include "co_time.h"
+#include "co_dcli.h"
 #include "cow_wow.h"
 #include "rt_sev_msg.h"
 
@@ -827,6 +828,78 @@ void XttSevHist::sevhist_remove_cb( void *ctx)
   // Do do
 }
 
+int XttSevHist::sevhist_export_cb( void *ctx, pwr_tTime *from, pwr_tTime *to, int rows, int idx, 
+				   char *filename)
+{
+  XttSevHist *sevhist = (XttSevHist *) ctx;
+  pwr_tFileName fname;
+  pwr_tTime *tbuf;
+  void *vbuf;
+  pwr_eType	vtype;
+  unsigned int  vsize;
+  pwr_tStatus sts;
+  int rrows;
+  char timestr[40];
+  FILE *fp;
+
+  dcli_translate_filename( fname, filename);
+
+
+  sevcli_get_itemdata( &sts, sevhist->scctx, sevhist->oidv[idx], sevhist->anamev[idx], *from, *to, 
+		       rows, &tbuf, &vbuf, &rrows, &vtype, &vsize);
+  if ( EVEN(sts))
+    return sts;
+
+  if( rrows == 0 ) {
+    return SEV__NODATATIME;
+  }
+
+  fp = fopen( fname, "w");
+  if ( !fp)
+    return SEV__EXPORTFILE;
+
+  for ( int i = 0; i < rrows; i++) {
+    time_AtoAscii( &tbuf[i], time_eFormat_DateAndTime, timestr, sizeof(timestr));
+    fprintf( fp, "%s, ", timestr);
+    switch ( vtype) {
+    case pwr_eType_Int32:
+    case pwr_eType_Int64:
+    case pwr_eType_Int16:
+    case pwr_eType_Int8:
+      fprintf( fp, "%d", ((pwr_tInt32 *)vbuf)[i]);
+      break;
+    case pwr_eType_UInt64:
+    case pwr_eType_UInt32:
+    case pwr_eType_UInt16:
+    case pwr_eType_UInt8:
+      fprintf( fp, "%u", ((pwr_tUInt32 *)vbuf)[i]);
+      break;
+    case pwr_eType_Float32:
+      fprintf( fp, "%g", ((pwr_tFloat32 *)vbuf)[i]);
+      break;
+    case pwr_eType_Float64:
+      fprintf( fp, "%g", ((pwr_tFloat64 *)vbuf)[i]);
+      break;
+    case pwr_eType_Boolean:
+      fprintf( fp, "%d", ((pwr_tBoolean *)vbuf)[i]);
+      break;
+    default: 
+      sts = SEV__CURVETYPE;
+    }
+    fprintf( fp, "\n");
+  }
+  free( tbuf);
+  free( vbuf);
+  fclose( fp);
+
+  printf( "Exported %d rows to file \"%s\" (%d)\n", rrows, fname, idx);
+
+  if ( EVEN(sts))
+    return sts;
+
+  return SEV__SUCCESS;
+}
+
 void XttSevHist::sevhist_help_cb( void *ctx)
 {
   XttSevHist *sevhist = (XttSevHist *) ctx;

xtt/lib/xtt/src/xtt_sevhist.h

@@ -107,6 +107,8 @@ class XttSevHist {
   static void sevhist_next_period_cb( void *ctx);
   static void sevhist_add_cb( void *ctx);
   static void sevhist_remove_cb( void *ctx);
+  static int sevhist_export_cb( void *ctx, pwr_tTime *from, pwr_tTime *to, 
+				int rows, int idx, char *filename);
   static void sevhist_help_cb( void *ctx);
   static void sevhist_scan( void *data);