Changeset 4224 for branches/1.3

Timestamp:

Mar 11, 2014, 9:25:44 AM (11 years ago)

Author:

ldelgass

Message:

merge r3926:3929 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• packages/vizservers/vtkvis/RendererCmd.cpp (modified) (2 diffs)
• src/core/RpUnits.cc (modified) (6 diffs)
• video/RpVideo.c (modified) (3 diffs)

branches/1.3/packages/vizservers/vtkvis/RendererCmd.cpp

@@ -1317 +1317 @@
 {
     const char *title = Tcl_GetString(objv[3]);
-    if (strlen(title) > 30) {
+    if (strlen(title) > 60) {
         Tcl_AppendResult(interp, "axis name \"", title,
                          "\" is too long", (char*)NULL);
@@ -1601 +1601 @@
 {
     const char *units = Tcl_GetString(objv[3]);
-    if (strlen(units) > 10) {
+    if (strlen(units) > 20) {
         Tcl_AppendResult(interp, "axis units name \"", units,
                          "\" is too long", (char*)NULL);

branches/1.3/src/core/RpUnits.cc

@@ -2698 +2698 @@
     // RpUnits* cubic_meter  = RpUnits::define("m3", NULL, RP_TYPE_VOLUME);
     // RpUnits* cubic_feet   = RpUnits::define("ft3", NULL, RP_TYPE_VOLUME);
-    RpUnits* us_gallon    = NULL;
-    RpUnits* liter        = NULL;
-
-    us_gallon    = RpUnits::define("gal", NULL, RP_TYPE_VOLUME);
-    liter        = RpUnits::define("L", NULL, RP_TYPE_VOLUME, RPUNITS_METRIC);
+    // RpUnits* us_gallon    = NULL;
+    // RpUnits* liter        = NULL;
+
+    RpUnits::define("gal", NULL, RP_TYPE_VOLUME);
+    RpUnits::define("L", NULL, RP_TYPE_VOLUME, RPUNITS_METRIC);
 
     /*
@@ -2783 +2783 @@
 RpUnitsPreset::addPresetMass () {
 
-    RpUnits* gram  = NULL;
-
-    gram  = RpUnits::define("g", NULL, RP_TYPE_MASS, RPUNITS_METRIC,!RPUNITS_CASE_INSENSITIVE);
+    RpUnits::define("g", NULL, RP_TYPE_MASS, RPUNITS_METRIC,!RPUNITS_CASE_INSENSITIVE);
 
     return 0;
@@ -2885 +2883 @@
 RpUnitsPreset::addPresetForce () {
 
-    RpUnits* newton = NULL;
-
-    newton = RpUnits::define("N",  NULL, RP_TYPE_FORCE, RPUNITS_METRIC);
+    RpUnits::define("N",  NULL, RP_TYPE_FORCE, RPUNITS_METRIC);
 
     return 0;
@@ -2935 +2931 @@
 /**
  * Defines the following units:
+ *   volt  (V)
  *   mole  (mol)
- *
+ *   hertz (Hz)
+ *   becquerel (Bq)
+ *   amu
+ *   bel (B)
+ *   amp
+ *   ohm
  * Return codes: 0 success, anything else is error
  */
@@ -2943 +2945 @@
 RpUnitsPreset::addPresetMisc () {
 
-    RpUnits* volt      = NULL;
-    RpUnits* mole      = NULL;
-    RpUnits* hertz     = NULL;
-    RpUnits* becquerel = NULL;
-    RpUnits* amu       = NULL;
-    RpUnits* bel       = NULL;
-    RpUnits* amp       = NULL;
-    RpUnits* ohm       = NULL;
-
-    volt      = RpUnits::define("V",  NULL, RP_TYPE_EPOT, RPUNITS_METRIC);
-    mole      = RpUnits::define("mol",NULL, "quantity", RPUNITS_METRIC);
-    hertz     = RpUnits::define("Hz", NULL, "frequency", RPUNITS_METRIC);
-    becquerel = RpUnits::define("Bq", NULL, "radioactivity", RPUNITS_METRIC);
-    amu       = RpUnits::define("amu", NULL, "mass_unit", !RPUNITS_METRIC);
-    bel       = RpUnits::define("B", NULL, "audio_transmission", RPUNITS_METRIC);
-    amp       = RpUnits::define("amp", NULL, "electric_current", RPUNITS_METRIC);
-    ohm       = RpUnits::define("ohm", NULL, "electric_resistance", RPUNITS_METRIC);
+    RpUnits::define("V",  NULL, RP_TYPE_EPOT, RPUNITS_METRIC);
+    RpUnits::define("mol",NULL, "quantity", RPUNITS_METRIC);
+    RpUnits::define("Hz", NULL, "frequency", RPUNITS_METRIC);
+    RpUnits::define("Bq", NULL, "radioactivity", RPUNITS_METRIC);
+    RpUnits::define("amu", NULL, "mass_unit", !RPUNITS_METRIC);
+    RpUnits::define("B", NULL, "audio_transmission", RPUNITS_METRIC);
+    RpUnits::define("amp", NULL, "electric_current", RPUNITS_METRIC);
+    RpUnits::define("ohm", NULL, "electric_resistance", RPUNITS_METRIC);
 
     // RpUnits* percent   = RpUnits::define("%",  NULL, RP_TYPE_MISC);
@@ -2979 +2972 @@
 RpUnitsPreset::addPresetPower () {
 
-    RpUnits* watt      = NULL;
-
     // watts are derived units = J/s = kg*m2/s3 = Newton*m/s and Amps*Volt
-    watt      = RpUnits::define("W",  NULL, RP_TYPE_POWER, RPUNITS_METRIC);
+    RpUnits::define("W",  NULL, RP_TYPE_POWER, RPUNITS_METRIC);
 
     return 0;

branches/1.3/video/RpVideo.c

@@ -123 +123 @@
 static int VideoAllocImgBuffer (VideoObj *vidPtr, int width, int height);
 static int VideoFreeImgBuffer (VideoObj *vidPtr);
+
+#ifdef notdef
 static double VideoTransformFrames2Duration (VideoObj *vidPtr, int frame);
 static int VideoTransformDuration2Frames (VideoObj *vidPtr, double duration);
+#endif
 
 /*
@@ -1521 +1524 @@
 }
 
+#ifdef notdef
 /*
  * ------------------------------------------------------------------------
@@ -1597 +1601 @@
     return frames;
 }
+#endif
 
 /*