Changeset 2727 for trunk

Timestamp:

Dec 12, 2011 5:44:55 PM (12 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• configure.in (modified) (1 diff)
• gui/scripts/field.tcl (modified) (3 diffs)
• gui/scripts/vtkvolumeviewer.tcl (modified) (2 diffs)
• gui/src/RpConvertDxToVtk.c (modified) (3 diffs)
• packages/vizservers/configure (modified) (1 diff)
• packages/vizservers/configure.in (modified) (1 diff)

trunk/configure.in

@@ -286 +286 @@
 #--------------------------------------------------------------------
 
-AC_CHECK_HEADERS(ffmpeg/avcodec.h,[],[],
-[[#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_FFMPEG_AVCODEC_H
-  # include <ffmpeg/avcodec.h>
-  #endif
-]])
-
-AC_CHECK_HEADERS(libavcodec/avcodec.h,[],[],
-[[#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_LIBAVCODEC_AVCODEC_H
-  # include <libavcodec/avcodec.h>
-  #endif
-]])
-
-AC_CHECK_HEADERS([ffmpeg/avformat.h],[],[],
-[[#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_FFMPEG_AVFORMAT_H
-  # include <ffmpeg/avformat.h>
-  #endif
-]])
-
-AC_CHECK_HEADERS([libavformat/avformat.h],[],[],
-[[#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-  # include <libavformat/avformat.h>
-  #endif
-]])
-
-AC_CHECK_HEADERS([ffmpeg/avutil.h],[],[],
-[[#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_FFMPEG_AVUTIL_H
-  # include <ffmpeg/avutil.h>
-  #endif
-]])
-
-AC_CHECK_HEADERS([libavutil/avutil.h],[],[],
-[[#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_LIBAVUTIL_AVUTIL_H
-  # include <libavutil/avutil.h>
-  #endif
-]])
-
-AC_CHECK_HEADERS([ffmpeg/swscale.h],[],[],
-[[#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_FFMPEG_SWSCALE_H
-  # include <ffmpeg/swscale.h>
-  #endif
-]])
-
-AC_CHECK_HEADERS([libswscale/swscale.h],[],[],
-[[#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_LIBSWSCALE_SWSCALE_H
-  # include <libswscale/swscale.h>
-  #endif
-]])
+AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h],,,[
+#define __STDC_CONSTANT_MACROS 1
+])
 
 HAVE_FFMPEG_LIBS=""

trunk/gui/scripts/field.tcl

@@ -204 +204 @@
         return ""  ;# no mesh -- it's embedded in the value data
     }
+    if {[info exists _comp2vtkvolume($what)]} {
+        return ""  ;# no mesh -- it's embedded in the value data
+    }
     if {[info exists _comp2unirect2d($what)]} {
         set mobj [lindex $_comp2unirect2d($what) 0]
@@ -264 +267 @@
     if { [info exists _comp2vtk($what)] } {
         return ""
+    }
+    if { [info exists _comp2vtkvolume($what)] } {
+        return $_comp2vtkvolume($what)
     }
     if { [info exists _comp2vtkstreamlines($what)] } {
@@ -821 +827 @@
             }
             set data [Rappture::ConvertDxToVtk $data]
+            if 1 {
+            set file "/tmp/junk.vtk"
+            set f [open $file "w"]
+            puts $f $data
+            close $f
+            }
             set _comp2vtkvolume($cname) $data
             set _comp2style($cname) [$_field get $cname.style]

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -1003 +1003 @@
     set _limits(zmax) ""
     set _first ""
+
     foreach dataobj [get -objects] {
         if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
@@ -1804 +1805 @@
 
 itcl::body Rappture::VtkVolumeViewer::limits { dataobj } {
-    return
     array unset _limits $dataobj-*
     foreach comp [$dataobj components] {

trunk/gui/src/RpConvertDxToVtk.c

@@ -95 +95 @@
     int count[3];
     int length, nComponents, nValues, nPoints;
-
+    char *name;
+
+    name = "myScalar";
     nComponents = nPoints = 0;
     delta[0] = delta[1] = delta[2] = 0.0; /* Suppress compiler warning. */
@@ -198 +200 @@
     }
 
-    objPtr = Tcl_NewStringObj("vtk DataFile Version 2.0\n", -1);
+    objPtr = Tcl_NewStringObj("# vtk DataFile Version 2.0\n", -1);
     Tcl_AppendToObj(objPtr, "Converted from DX file\n", -1);
     Tcl_AppendToObj(objPtr, "ASCII\n", -1);
@@ -209 +211 @@
     Tcl_AppendToObj(objPtr, mesg, -1);
     sprintf(mesg, "POINT_DATA %d\n", nPoints);
+    Tcl_AppendToObj(objPtr, mesg, -1);
+    sprintf(mesg, "SCALARS %s float 1\n", name);
+    Tcl_AppendToObj(objPtr, mesg, -1);
+    sprintf(mesg, "LOOKUP_TABLE default\n");
     Tcl_AppendToObj(objPtr, mesg, -1);
     Tcl_AppendObjToObj(objPtr, pointsObjPtr);

trunk/packages/vizservers/configure

@@ -8529 +8529 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-#define SIZEOF_LONG ${ac_cv_sizeof_long}
-#if SIZEOF_LONG == 8
-#  define INT64_C(c)  c ## L
-#  define UINT64_C(c) c ## UL
-#else
-#  define INT64_C(c)  c ## LL
-#  define UINT64_C(c) c ## ULL
-#endif
+#define __STDC_CONSTANT_MACROS 1
 
 "

trunk/packages/vizservers/configure.in

@@ -275 +275 @@
 
 AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h],,,[
-#define SIZEOF_LONG ${ac_cv_sizeof_long}
-#if SIZEOF_LONG == 8
-#  define INT64_C(c)  c ## L
-#  define UINT64_C(c) c ## UL
-#else
-#  define INT64_C(c)  c ## LL
-#  define UINT64_C(c) c ## ULL
-#endif
+#define __STDC_CONSTANT_MACROS 1
 ])
 CPPFLAGS=$save_CPPFLAGS