<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/49a91998adf8cbdd31ef315d93240d8960b173d0">https://github.com/macports/macports-ports/commit/49a91998adf8cbdd31ef315d93240d8960b173d0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 49a9199  scidavis: update to version 1.25
</span>49a9199 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 49a91998adf8cbdd31ef315d93240d8960b173d0
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Mon Apr 1 00:59:26 2019 +0900

<span style='display:block; white-space:pre;color:#404040;'>    scidavis: update to version 1.25
</span>---
 science/scidavis/Portfile                        | 11 +++--
 science/scidavis/files/patch-nullComparison.diff | 58 ++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scidavis/Portfile b/science/scidavis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 706f81d..8d332e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/scidavis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/scidavis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup           compiler_blacklist_versions 1.0
</span> PortGroup           cxx11 1.1
 
 name                scidavis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             1.23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             1.25
</span> categories          science
 license             GPL-2+
 maintainers         {nicos @NicosPavlov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,13 +34,14 @@ depends_lib-append  port:qwt52 \
</span>                     port:zlib \
                     port:libGLU
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  9d046cf2196c4a109f800446cefbff623dda11df \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  4cd8d39e8392f9ba9aaa80c2a42836e23307cce28001833f41bf8cf9908de0b1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    3167963
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  8a09d65a53f1280cbca929ef89bb2a4be36aebd0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  7b363e7e9ad7223134f781a04c8da1808efb815fa125fc1ad76fe239b4babf11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    9714594
</span> 
 universal_variant   no
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-OriginObj.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-OriginObj.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-nullComparison.diff
</span> 
 configure.pre_args-append   "'CONFIG+=osx_dist noassistant'"
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scidavis/files/patch-nullComparison.diff b/science/scidavis/files/patch-nullComparison.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..badc0d0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/scidavis/files/patch-nullComparison.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,58 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../scidavis-1.25-orig/libscidavis/src/ApplicationWindow.cpp ./libscidavis/src/ApplicationWindow.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../scidavis-1.25-orig/libscidavis/src/ApplicationWindow.cpp    2019-03-05 08:49:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libscidavis/src/ApplicationWindow.cpp        2019-04-01 00:27:10.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5173,7 +5173,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (w->inherits("Table")){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           QStringList labels=((Table *)w)->colNames();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          if (labels.contains(newName)>0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          if (labels.contains(newName)!=NULL){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   QMessageBox::critical(this, tr("Error"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                   tr("The table name must be different from the names of its columns!")+"<p>"+tr("Please choose another name!"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7849,13 +7849,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           Graph *g = (Graph *)widget;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           onPlot = g->curvesList();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           onPlot = onPlot.filter(QRegExp("^"+name+"_.*"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                          if (onPlot.count() > 0 && plots.contains(w->name()) <= 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                          if (onPlot.count() > 0 && plots.contains(w->name()) == NULL )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                   plots << w->name();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           else if (w->inherits("Graph3D"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                  if ((((Graph3D*)w)->formula()).contains(name,Qt::CaseSensitive) && plots.contains(w->name())<=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  if ((((Graph3D*)w)->formula()).contains(name,Qt::CaseSensitive) && plots.contains(w->name())==NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           plots << w->name();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7874,7 +7874,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           for (int j=0; j<onPlot.count(); j++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   QStringList tl = onPlot[j].split("_", QString::SkipEmptyParts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                  if (tables.contains(tl[0])<=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  if (tables.contains(tl[0])==NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           tables << tl[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10088,7 +10088,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (fList[1].endsWith("(Y)",Qt::CaseSensitive))//Ribbon plot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           plot=app->dataPlot3D(caption, fList[1],fList[2].toDouble(),fList[3].toDouble(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           fList[4].toDouble(),fList[5].toDouble(),fList[6].toDouble(),fList[7].toDouble());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  else if (fList[1].contains("(Z)",Qt::CaseSensitive) > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  else if (fList[1].contains("(Z)",Qt::CaseSensitive) != NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           plot=app->dataPlotXYZ(caption, fList[1], fList[2].toDouble(),fList[3].toDouble(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           fList[4].toDouble(),fList[5].toDouble(),fList[6].toDouble(),fList[7].toDouble());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   else if (fList[1].startsWith("matrix<",Qt::CaseSensitive) && fList[1].endsWith(">",Qt::CaseInsensitive))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../scidavis-1.25-orig/libscidavis/src/FitDialog.cpp ./libscidavis/src/FitDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../scidavis-1.25-orig/libscidavis/src/FitDialog.cpp    2019-03-05 08:49:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libscidavis/src/FitDialog.cpp        2019-04-01 00:31:31.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1035,7 +1035,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   QString curve = boxCurve->currentText();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   QStringList curvesList = d_graph->curvesList();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  if (curvesList.contains(curve) <= 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  if (curvesList.contains(curve) == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           QMessageBox::critical(this,tr("Warning"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           tr("The curve <b> %1 </b> doesn't exist anymore! Operation aborted!").arg(curve));
</span></pre><pre style='margin:0'>

</pre>