[Kst] kdeextragear-2/kst/kst

[Barth Netterfield]

CVS commit by netterfield: 

Fix modality bug in label dialog
Fix compilation bugs with --enable-final


  M +0 -5      d2asc.cpp   1.11
  M +5 -0      genterStacks.h   1.2
  M +1 -1      kstfile.cpp   1.15
  M +2 -1      kstlabeldialog_i.cpp   1.7
  M +9 -2      kstrvector.cpp   1.27


--- kdeextragear-2/kst/kst/d2asc.cpp  #1.10:1.11
@@ -6,9 +6,4 @@
 #include "kstrvector.h"
 
-/* we don't use i18n, but the linker tries to link to it.... */
-int i18n(const char *) {
-  return (0);
-}
-
 void Usage() {
   fprintf(stderr, "usage: d2asc filename [-f <first frame>]\n");

--- kdeextragear-2/kst/kst/genterStacks.h  #1.1.1.1:1.2
@@ -20,4 +20,7 @@
  *@author C. Barth Netterfield
  */
+#ifndef GENTERSTACKS_H
+#define GENTERSTACKS_H
+
 #define STACKDEPTH 30
 #define STRLEN 160
@@ -86,2 +89,4 @@ int IsMonop(char*);
 int IsBinop(char*);
 int Precedence(char*);
+
+#endif

--- kdeextragear-2/kst/kst/kstfile.cpp  #1.14:1.15
@@ -29,5 +29,5 @@
 #include <qfile.h>
 #include <ktempfile.h>
-#include <klocale.h>
+//#include <klocale.h>
 
 #include "creaddata_cpp.h"

--- kdeextragear-2/kst/kst/kstlabeldialog_i.cpp  #1.6:1.7
@@ -117,5 +117,4 @@ void KstLabelDialogI::apply() {
   } else{
     applyAsNew();
-    close(); // FIXME: need to be able to edit after a new...
   }
 
@@ -147,4 +146,6 @@ void KstLabelDialogI::applyAsNew() {
 
   KST::plotList.at(_i_plot)->labelList.append(new_label);
+  _i_label = KST::plotList.at(_i_plot)->labelList.count()-1;
+  _editing = true;
 }
 

--- kdeextragear-2/kst/kst/kstrvector.cpp  #1.26:1.27
@@ -525,8 +525,15 @@ KstObject::UpdateType KstRVector::update
     _numSamples += n_read;
 
-    // FIXME: if the files in a dirfile read are not up to date with each
+    // FIXME: if the files in a dirfile read are not up to date
     // with each other, then we will have troubles.  This is common with
     // an nfs mounted file.  As a first fix, mount with "-o noac" but
-    // this does not solve the basic problem....
+    // this does not solve the basic problem.... the current implementation
+    // will defer reading the data until it arrives - which could cause
+    // some interesting pathologies (ie, old data hanging around
+    if (_numSamples!=_size) {
+      NF = int(float(_numSamples)/float(SPF));
+      _numSamples = NF * SPF;
+    }
+
     if (_size != new_nf*SPF) {
       NF = int(float(_numSamples)*(1.0/float(SPF)));