Update from original

README.md

@@ -1,8 +1,9 @@
 # DIANA
 
-Diana is the core visualisation tool from MET Norway (Norwegian Meteorological
-Institute) and is distributed under the GPL license. See gpl.txt for details
-concerning the GPL license.
+Diana is the core visualisation tool for StormGeo and is based on latest 
+release of DIANA from MET Norway (Norwegian Meteorological Institute) and is 
+distributed under the GPL license. See gpl.txt for details concerning the 
+GPL license.
 
 Diana is a graphical viewer and editor developed for use with meteorological
 and oceanographic data. It uses OpenGL and/or Qt for the graphics and Qt for
@@ -66,9 +67,9 @@ http://creativecommons.org/licenses/by/3.0/ page for the license terms.
 
 ## Contact
 
-Norwegian Meteorological Institute (met.no)
-Box 43 Blindern
-0313 OSLO
+StormGeo Group HQ
+Nordre Nøstekaien 1
+5011 Bergen
 NORWAY
 
-email:[email protected]
+email:[email protected]

src/bdiana_capi.cc

@@ -130,7 +130,11 @@ const std::string com_plotend = "plot.end";
 
 const std::string com_print_document = "print_document";
 
+const std::string com_wait_for_commands = "wait_for_commands";
+const std::string com_wait_end = "wait.end";
+
 const std::string com_setupfile = "setupfile";
+const std::string com_command_path = "command_path";
 const std::string com_buffersize = "buffersize";
 
 const std::string com_papersize = "papersize";
@@ -1102,6 +1106,20 @@ static void printUsage(bool showexample)
     "#  You can not mix map plots, cross sections or soundings in one file",
     "#",
     "#- Use of alpha-channel blending is not supported in postscript",
+    "#--------------------------------------------------------------   \n"
+    "#* Interactive batch-plotting *                  \n"
+    "#  To make plots on-demand, you will find this feature useful.  \n"
+    "#  Put this in the input-file:  \n"
+    "#    command_path=<some_path> \n"
+    "#    wait_for_commands \n"
+    "#  and bdiana will wait at the \'wait_for_commands\' line, periodically\n"
+    "#  checking \'<some_path>\' for a matching filename. When found, the \n"
+    "#  file(s) are read and the instructions within executed. If the line:\n"
+    "#    wait.end \n"
+    "#  is encountered, bdiana will stop waiting for commands. \n"
+    "#  The \'command_path\' must specify a complete filename - optionally \n"
+    "#  with wildcards. Example: \'/tmp/*.txt\' \n"
+    "#  NB: all files found are deleted immediately after reading.  \n"
     "#--------------------------------------------------------------",
     "#* Get Capabilities *",
     "#  Developed for use in WMS",
@@ -2201,6 +2219,93 @@ static int handlePrintDocument(int& k)
   return res;
 }
 
+static int handleWaitForCommands(int& k, int& linenum)
+{
+  if (command_path.empty()) {
+    METLIBS_LOG_ERROR("ERROR, wait_for_commands found, but command_path not set");
+    return 1;
+  }
+  static int prev_iclock = -1;
+  int iclock;
+  float diff = 0;
+  miTime nowtime = miTime::nowTime();
+
+  // using clock-cycle-command
+  iclock = clock();
+  if (prev_iclock > 0)
+    diff = float(iclock - prev_iclock) / float(CLOCKS_PER_SEC);
+
+  METLIBS_LOG_INFO("================ WAIT FOR COMMANDS, TIME is:" << nowtime
+        << ", seconds spent on previous command(s):" << diff);
+
+  std::string pattern = command_path;
+  vector<std::string> newlines;
+  std::string waitline = com_wait_for_commands;
+
+  diutil::string_v matches;
+  while ((matches = diutil::glob(pattern)).empty())
+    pu_sleep(1);
+
+  nowtime = miTime::nowTime();
+  prev_iclock = clock();
+  METLIBS_LOG_INFO("================ FOUND COMMAND-FILE(S), TIME is:" << nowtime);
+
+  vector<std::string> filenames;
+
+  //loop over files
+  for (diutil::string_v::const_iterator it = matches.begin(); it != matches.end(); ++it) {
+    const std::string& filename = *it;
+    METLIBS_LOG_INFO("==== Reading file: '" << filename << "'");
+    filenames.push_back(filename);
+    ifstream file(filename.c_str());
+    while (file) {
+      std::string str;
+      if (getline(file, str)) {
+        miutil::trim(str);
+        if (str.length() > 0 && str[0] != '#') {
+          if (miutil::contains(miutil::to_lower(str), com_wait_end))
+            waitline = ""; // blank out waitline
+          else
+            newlines.push_back(str);
+        }
+      }
+    }
+  }
+  // remove processed files
+  /*
+  for (unsigned int ik = 0; ik < filenames.size(); ik++) {
+    ostringstream ost;
+    ost << "rm -f " << filenames[ik];
+    std::string command = ost.str();
+
+    METLIBS_LOG_INFO("==== Cleaning up with: '" << command << "'");
+    int res = system(command.c_str());
+
+    if (res != 0){
+      METLIBS_LOG_WARN("Command:" << command << " failed");
+    }
+  }
+  */
+  for (unsigned int ik = 0; ik < filenames.size(); ik++) {
+    ostringstream ost;
+    ost << filenames[ik];
+    std::string command = ost.str();
+    METLIBS_LOG_INFO("==== Cleaning up with: '" << command << "'");
+    if( remove( command.c_str()  ) != 0 )
+       METLIBS_LOG_WARN("Error deleting file: '" << command << "'");
+  }
+
+  // add new wait-command
+  if (waitline.size() > 0)
+    newlines.push_back(waitline);
+  // insert commandlines into the command-queue
+  lines.erase(lines.begin() + k, lines.begin() + k + 1);
+  lines.insert(lines.begin() + k, newlines.begin(), newlines.end());
+  linenum = lines.size();
+  k--;
+  return 0;
+}
+
 static int handleFieldFilesCommand(int& k)
 {
   bool found_end = false;
@@ -2598,7 +2703,7 @@ static int parseAndProcess(istream &is)
   if (res != 0)
     return res;
 
-  const int linenum = lines.size();
+  int linenum = lines.size();
 
   // parse input - and perform plots
   for (int k = 0; k < linenum; k++) {// input-line loop
@@ -2647,6 +2752,11 @@ static int parseAndProcess(istream &is)
         return 99;
       continue;
 
+    } else if (command == com_wait_for_commands) {
+      if (handleWaitForCommands(k, linenum) != 0)
+        return 99;
+      continue;
+
     } else if (command == com_field_files) {
       if (handleFieldFilesCommand(k) != 0)
         return 99;
@@ -2697,6 +2807,9 @@ static int parseAndProcess(istream &is)
           return 99;
       }
 
+    } else if (key == com_command_path) {
+      command_path = value;
+
     } else if (key == com_buffersize) {
       if (handleBuffersize(k, value))
         return 99;

src/diFieldPlot.cc

@@ -869,7 +869,13 @@ void FieldPlot::getTableAnnotations(vector<string>& annos)
             float min = poptions.linevalues[i];
             float max = poptions.linevalues[i + 1];
             ostringstream ostr;
-            ostr << min << " - " << max << unit;
+            //ostr << min << " - " << max << unit;
+	    // Check for "less than" legend
+	    if (i==0 && min==-fieldUndef) {            
+	        ostr << " < " << max << unit;
+	    } else {
+	        ostr << min << " - " << max << unit;
+	    } 
             vtable[i].text = ostr.str();
           }
           float min = poptions.linevalues[ncodes - 1];

src/diPlotOptions.cc

@@ -789,6 +789,14 @@ vector<float> PlotOptions::autoExpandFloatVector(const std::string& str)
     }
 
     // try to add a whole interval (10,20,...50)
+    //-----------------------------------
+    // Check here for 2 dots   
+    //-----------------------------------
+    if (!values.size() and strcmp(t.c_str(),"..")==0) {
+        values.push_back(-fieldUndef);
+        continue;
+    }
+    //-----------------------------------
 
     if (values.size() < 2) {
       METLIBS_LOG_DEBUG("need 2 values yet to define step size");

src/diPrintOptions.cc

@@ -43,6 +43,7 @@
 #define MILOGGER_CATEGORY "diana.PrintOptions"
 #include <miLogger/miLogging.h>
 
+#include <iostream>
 using namespace d_print;
 using namespace::miutil;
 using namespace std;