From e0017f8ebf05e554eb3d937a2f790bfdf8fa96c0 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sat, 24 Aug 2013 21:54:15 +0400 Subject: [PATCH] Added link to qwt Fixed bug in start_events --- mathmech/resources/translations/eng.qm | 1 + mathmech/resources/translations/rus.qm | Bin 0 -> 6586 bytes mathmech/src/CMakeLists.txt | 4 ++-- mathmech/src/mathmech.pro.user | 8 ++++---- mathmech/src/start_events.cpp | 8 ++++---- 5 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 mathmech/resources/translations/eng.qm create mode 100644 mathmech/resources/translations/rus.qm diff --git a/mathmech/resources/translations/eng.qm b/mathmech/resources/translations/eng.qm new file mode 100644 index 0000000..be651ee --- /dev/null +++ b/mathmech/resources/translations/eng.qm @@ -0,0 +1 @@ +<¸dÊÍ!¿`¡½Ý \ No newline at end of file diff --git a/mathmech/resources/translations/rus.qm b/mathmech/resources/translations/rus.qm new file mode 100644 index 0000000000000000000000000000000000000000..3b180b71fcd28e781b24a1fa6ebd9aa491322785 GIT binary patch literal 6586 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 a2$#wZ1_lORLB_wD-2X+GSpMp82?GF^PQ=v! literal 0 HcmV?d00001 diff --git a/mathmech/src/CMakeLists.txt b/mathmech/src/CMakeLists.txt index ff0b658..1c62faf 100644 --- a/mathmech/src/CMakeLists.txt +++ b/mathmech/src/CMakeLists.txt @@ -11,9 +11,9 @@ file (GLOB HEADERS *.h) file (GLOB FORMS *.ui) # set library if (CMAKE_COMPILER_IS_GNUCXX) - set (LIBRARIES m) + set (LIBRARIES m qwt) else () - set (LIBRARIES) + set (LIBRARIES qwt) endif() set (LANGUAGES eng diff --git a/mathmech/src/mathmech.pro.user b/mathmech/src/mathmech.pro.user index 08c9c90..79b43ea 100644 --- a/mathmech/src/mathmech.pro.user +++ b/mathmech/src/mathmech.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -226,15 +226,15 @@ mathmech - Qt4ProjectManager.Qt4RunConfiguration:/home/arcanis/Documents/github/moldyn/mathmech/mathmech.pro + Qt4ProjectManager.Qt4RunConfiguration:/home/arcanis/Documents/github/moldyn/mathmech/src/mathmech.pro mathmech.pro false false 3768 - true - false + false + true false false true diff --git a/mathmech/src/start_events.cpp b/mathmech/src/start_events.cpp index e4010dc..0e3f33d 100644 --- a/mathmech/src/start_events.cpp +++ b/mathmech/src/start_events.cpp @@ -242,8 +242,8 @@ bool Start_events::start_statgen_analysis(QString mm_statgen_path, QStringList inter_list = inter.split(QString(" -r "), QString::SkipEmptyParts); float *inter_list_one; inter_list_one = new float[16*inter_list.count()]; - for (i=0; i<16*inter_list.count(); i++) - inter_list_one = -1.0; + for (int i=0; i<16*inter_list.count(); i++) + inter_list_one[i] = -1.0; float item; int index; for (int i=0; i 0.0) - while (imax*int_step > inter_list_one) + if (inter_list_one[i] > 0.0) + while (imax*int_step > inter_list_one[i]) imax--; // exec