Commit 875d1736 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 1.63+dfsg

parent da2787da
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ openSUSE: sudo zypper install -t pattern devel_basis
#                                                                                           #
# This will not mess with your system libraries. The new compiled libraries will be stored  #
#                                                                                           #
# in a new and separate directory: /usr/local/Qt-5.9.3                                      #
# in a new and separate directory: /usr/local/Qt-5.9.4                                      #
#                                                                                           #
# It will not interfere with other Qt programs.                                             #
#                                                                                           #
@@ -105,14 +105,14 @@ mkdir Qt5-source

cd Qt5-source

wget http://ftp1.nluug.nl/languages/qt/official_releases/qt/5.9/5.9.3/single/qt-everywhere-opensource-src-5.9.3.tar.xz
wget http://ftp1.nluug.nl/languages/qt/official_releases/qt/5.9/5.9.4/single/qt-everywhere-opensource-src-5.9.4.tar.xz

here is a list of download mirrors: https://download.qt.io/static/mirrorlist/
The Qt source package you are going to need is: qt-everywhere-opensource-src-5.9.3.tar.xz
The Qt source package you are going to need is: qt-everywhere-opensource-src-5.9.4.tar.xz

tar -xvf qt-everywhere-opensource-src-5.9.3.tar.xz
tar -xvf qt-everywhere-opensource-src-5.9.4.tar.xz

cd qt-everywhere-opensource-src-5.9.3
cd qt-everywhere-opensource-src-5.9.4

./configure -v -release -opensource -confirm-license -c++std c++11 -static -accessibility -fontconfig -skip qtdeclarative -skip qtconnectivity -skip qtmultimedia -no-qml-debug -qt-zlib -no-mtdev -no-journald -qt-libpng -qt-libjpeg -system-freetype -qt-harfbuzz -no-openssl -no-libproxy -no-glib -nomake examples -nomake tests -no-compile-examples -cups -no-evdev -no-dbus -no-eglfs -qreal double -no-opengl -skip qtlocation -skip qtsensors -skip qtwayland -skip qtgamepad -skip qtserialbus

@@ -126,7 +126,7 @@ sudo make install

Now go to the directory that contains the EDFbrowser sourcecode and enter the following commands:

/usr/local/Qt-5.9.3/bin/qmake
/usr/local/Qt-5.9.4/bin/qmake

make -j8

+15 −15
Original line number Diff line number Diff line
@@ -1662,7 +1662,7 @@ int UI_ASCII2EDFapp::check_input(void)
      QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", "Separator must be one character or tab.");
      messagewindow.exec();

      return(1);
      return 1;
    }

    if((str[0]<32)||(str[0]>126))
@@ -1670,7 +1670,7 @@ int UI_ASCII2EDFapp::check_input(void)
      QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", "Separator character is not a valid ASCII character.");
      messagewindow.exec();

      return(1);
      return 1;
    }

    if(str[0]=='.')
@@ -1678,7 +1678,7 @@ int UI_ASCII2EDFapp::check_input(void)
      QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", "Separator character can not be a dot.");
      messagewindow.exec();

      return(1);
      return 1;
    }

    if((str[0]>47)&&(str[0]<58))
@@ -1686,7 +1686,7 @@ int UI_ASCII2EDFapp::check_input(void)
      QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", "Separator character can not be a number.");
      messagewindow.exec();

      return(1);
      return 1;
    }

    separator = str[0];
@@ -1703,7 +1703,7 @@ int UI_ASCII2EDFapp::check_input(void)
      QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", "Only samplefrequencies below 1 Hz can have a decimal fraction.");
      messagewindow.exec();

      return(1);
      return 1;
    }
  }

@@ -1733,7 +1733,7 @@ int UI_ASCII2EDFapp::check_input(void)
          QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", big_str);
          messagewindow.exec();

          return(1);
          return 1;
        }

        for(k=0; k<len; k++)
@@ -1747,7 +1747,7 @@ int UI_ASCII2EDFapp::check_input(void)
            QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", big_str);
            messagewindow.exec();

            return(1);
            return 1;
          }

          if(str[k]==' ')
@@ -1761,7 +1761,7 @@ int UI_ASCII2EDFapp::check_input(void)
              QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", big_str);
              messagewindow.exec();

              return(1);
              return 1;
            }
          }

@@ -1777,7 +1777,7 @@ int UI_ASCII2EDFapp::check_input(void)
              QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", big_str);
              messagewindow.exec();

              return(1);
              return 1;
            }

            if((str[k]<48)||(str[k]>57))
@@ -1794,7 +1794,7 @@ int UI_ASCII2EDFapp::check_input(void)
                  QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", big_str);
                  messagewindow.exec();

                  return(1);
                  return 1;
                }
                else
                {
@@ -1808,7 +1808,7 @@ int UI_ASCII2EDFapp::check_input(void)
                    QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", big_str);
                    messagewindow.exec();

                    return(1);
                    return 1;
                  }

                  dot = 1;
@@ -1824,7 +1824,7 @@ int UI_ASCII2EDFapp::check_input(void)
                QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", big_str);
                messagewindow.exec();

                return(1);
                return 1;
              }
            }
          }
@@ -1842,7 +1842,7 @@ int UI_ASCII2EDFapp::check_input(void)
            QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", big_str);
            messagewindow.exec();

            return(1);
            return 1;
          }
        }
      }
@@ -1862,10 +1862,10 @@ int UI_ASCII2EDFapp::check_input(void)
    QMessageBox messagewindow(QMessageBox::Critical, "Invalid input", "At least one row needs to be checked.");
    messagewindow.exec();

    return(1);
    return 1;
  }

  return(0);
  return 0;
}


+12 −12
Original line number Diff line number Diff line
@@ -66,12 +66,12 @@ int BDF_triggers::get_triggers(struct edfhdrblock *hdr)

  if(edfsignals < 1)
  {
    return(0);
    return 0;
  }

  if(long_data_record_duration != TIME_DIMENSION)
  {
    return(0);
    return 0;
  }

  sf = hdr->edfparam[0].smp_per_record;
@@ -80,7 +80,7 @@ int BDF_triggers::get_triggers(struct edfhdrblock *hdr)
  {
    if(hdr->edfparam[i].smp_per_record != sf)
    {
      return(0);
      return 0;
    }
  }

@@ -112,7 +112,7 @@ int BDF_triggers::get_triggers(struct edfhdrblock *hdr)

  if(error)
  {
    return(0);
    return 0;
  }

  for(i=0; i<edfsignals; i++)
@@ -127,7 +127,7 @@ int BDF_triggers::get_triggers(struct edfhdrblock *hdr)

  if(i == edfsignals)
  {
    return(0);
    return 0;
  }

  bufsize = sf * 3;
@@ -137,7 +137,7 @@ int BDF_triggers::get_triggers(struct edfhdrblock *hdr)
  {
    QMessageBox messagewindow(QMessageBox::Critical, "Error", "Memory allocation error occurred when trying to read triggers.\n(buf)");
    messagewindow.exec();
    return(1);
    return 1;
  }

  if(fseeko(inputfile, ((long long)edfsignals + 1LL) * 256LL, SEEK_SET))
@@ -145,7 +145,7 @@ int BDF_triggers::get_triggers(struct edfhdrblock *hdr)
    QMessageBox messagewindow(QMessageBox::Critical, "Error", "An error occurred when reading inputfile triggers.");
    messagewindow.exec();
    free(buf);
    return(2);
    return 2;
  }

  jump_file = status_signal * sf * 3;
@@ -194,7 +194,7 @@ int BDF_triggers::get_triggers(struct edfhdrblock *hdr)
      QMessageBox messagewindow(QMessageBox::Critical, "Error", "An error occurred when reading inputfile triggers.");
      messagewindow.exec();
      free(buf);
      return(2);
      return 2;
    }

    if(fread(buf, bufsize, 1, inputfile)!=1)
@@ -203,7 +203,7 @@ int BDF_triggers::get_triggers(struct edfhdrblock *hdr)
      QMessageBox messagewindow(QMessageBox::Critical, "Error", "An error occurred when reading inputfile triggers.");
      messagewindow.exec();
      free(buf);
      return(2);
      return 2;
    }

    for(i=0; i<bufsize; i+=3)
@@ -223,7 +223,7 @@ int BDF_triggers::get_triggers(struct edfhdrblock *hdr)
            QMessageBox messagewindow(QMessageBox::Critical, "Error", "Malloc error (annotation).");
            messagewindow.exec();
            free(buf);
            return(1);
            return 1;
          }

          trigger_cnt++;
@@ -255,7 +255,7 @@ int BDF_triggers::get_triggers(struct edfhdrblock *hdr)
              QMessageBox messagewindow(QMessageBox::Critical, "Error", "Malloc error (annotation).");
              messagewindow.exec();
              free(buf);
              return(1);
              return 1;
            }

            trigger_cnt++;
@@ -280,7 +280,7 @@ int BDF_triggers::get_triggers(struct edfhdrblock *hdr)

  hdr->genuine_biosemi = 1;

  return(0);
  return 0;
}


+97 −97

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ void Check_for_updates::replyFinished()
    return;
  }

  QDesktopServices::openUrl(QUrl("http://www.teuniz.net/edfbrowser/"));
  QDesktopServices::openUrl(QUrl("https://www.teuniz.net/edfbrowser/"));
}


Loading