arcanis/moldyn
1
0
Fork 0
mirror of https://github.com/arcan1s/moldyn.git synced 2025-11-13 03:23:41 +00:00
Code Issues Projects Releases Wiki Activity

Added link to qwt

Browse Source 
Fixed bug in start_events
This commit is contained in:
arcan1s
2013-08-24 21:54:15 +04:00
parent d870b0377d
commit e0017f8ebf
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mathmech/resources/translations/eng.qm Normal file
View File

@ -0,0 +1 @@
<<3C>d<18><EFBFBD>!<1C>`<60><><EFBFBD>

BIN
mathmech/resources/translations/rus.qm Normal file
View File

Binary file not shown.

4
mathmech/src/CMakeLists.txt
View File

@ -11,9 +11,9 @@ file (GLOB HEADERS *.h)
file (GLOB FORMS *.ui) file (GLOB FORMS *.ui)
# set library # set library
if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_COMPILER_IS_GNUCXX)
set (LIBRARIES m) set (LIBRARIES m qwt)
else () else ()
set (LIBRARIES) set (LIBRARIES qwt)
endif() endif()
set (LANGUAGES set (LANGUAGES
eng eng

8
mathmech/src/mathmech.pro.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 2.8.0, 2013-08-23T22:01:33. --> <!-- Written by QtCreator 2.8.0, 2013-08-24T21:49:26. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>ProjectExplorer.Project.ActiveTarget</variable> <variable>ProjectExplorer.Project.ActiveTarget</variable>
@ -226,15 +226,15 @@
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">mathmech</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">mathmech</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/arcanis/Documents/github/moldyn/mathmech/mathmech.pro</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/arcanis/Documents/github/moldyn/mathmech/src/mathmech.pro</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">mathmech.pro</value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">mathmech.pro</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">true</value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">false</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value> <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>

8
mathmech/src/start_events.cpp
View File

@ -242,8 +242,8 @@ bool Start_events::start_statgen_analysis(QString mm_statgen_path,
QStringList inter_list = inter.split(QString(" -r "), QString::SkipEmptyParts); QStringList inter_list = inter.split(QString(" -r "), QString::SkipEmptyParts);
float *inter_list_one; float *inter_list_one;
inter_list_one = new float[16*inter_list.count()]; inter_list_one = new float[16*inter_list.count()];
for (i=0; i<16*inter_list.count(); i++) for (int i=0; i<16*inter_list.count(); i++)
inter_list_one = -1.0; inter_list_one[i] = -1.0;
float item; float item;
int index; int index;
for (int i=0; i<inter_list.count(); i++) for (int i=0; i<inter_list.count(); i++)
@ -260,8 +260,8 @@ bool Start_events::start_statgen_analysis(QString mm_statgen_path,
inter_list_one[16*i+index] = item; inter_list_one[16*i+index] = item;
} }
for (int i=0; i<16*inter_list.count(); i++) for (int i=0; i<16*inter_list.count(); i++)
if (inter_list_one > 0.0) if (inter_list_one[i] > 0.0)
while (imax*int_step > inter_list_one) while (imax*int_step > inter_list_one[i])
imax--; imax--;
// exec // exec