diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,32 +32,34 @@ find_package(KF5 REQUIRED COMPONENTS Crash - KHtml Config + I18n IconThemes + KIO NewStuff Plotting + TextWidgets ) find_package(Eigen3 3.2.2 REQUIRED) find_package(GSL) find_package(Qalculate) set_package_properties(EIGEN3 PROPERTIES - DESCRIPTION "Eigen3" + DESCRIPTION "Eigen3" URL "http://eigen.tuxfamily.org" TYPE OPTIONAL PURPOSE "Required to build step") set_package_properties(QALCULATE PROPERTIES # REQUIRED_VERSION "0.9.5" - DESCRIPTION "Qalculate" + DESCRIPTION "Qalculate" URL "http://qalculate.sourceforge.net/" TYPE OPTIONAL PURPOSE "Unit conversion support in Step") set_package_properties(GSL PROPERTIES # REQUIRED_VERSION "1.8" - DESCRIPTION "GSL" + DESCRIPTION "GSL" URL "http://eigen.tuxfamily.org" TYPE OPTIONAL PURPOSE "Provides a GSL-powered solver for Step") diff --git a/step/CMakeLists.txt b/step/CMakeLists.txt --- a/step/CMakeLists.txt +++ b/step/CMakeLists.txt @@ -60,8 +60,9 @@ add_definitions (-fexceptions) endif(STEP_WITH_QALCULATE) -ki18n_wrap_ui( step_SRCS ${step_UIS} ) -kconfig_add_kcfg_files( step_SRCS ${step_KCFGS} ) +qt5_add_resources(step_SRCS data/resources.qrc) +ki18n_wrap_ui(step_SRCS ${step_UIS}) +kconfig_add_kcfg_files(step_SRCS ${step_KCFGS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -73,8 +74,11 @@ target_link_libraries(step stepcore KF5::Crash + KF5::I18n KF5::IconThemes - KF5::KHtml + KF5::KIOCore + KF5::KIOWidgets + KF5::TextWidgets KF5::Plotting KF5::NewStuff Qt5::OpenGL diff --git a/step/data/CMakeLists.txt b/step/data/CMakeLists.txt --- a/step/data/CMakeLists.txt +++ b/step/data/CMakeLists.txt @@ -21,7 +21,7 @@ set(_addToAll ALL) list(REMOVE_AT _args 0) endif("${_tmp}" STREQUAL "ALL") - + list(GET _args 0 _tmp) if("${_tmp}" STREQUAL "INSTALL_DESTINATION") list(GET _args 1 _installDest ) @@ -65,7 +65,7 @@ endif(STEP_BUILD_TRANSLATIONS) -add_subdirectory(objinfo) +add_subdirectory(objectinfo) add_subdirectory(examples) add_subdirectory(tutorials) diff --git a/step/data/objectinfo/.objinfo.qrc.kate-swp b/step/data/objectinfo/.objinfo.qrc.kate-swp new file mode 100644 index 0000000000000000000000000000000000000000..e882c8c8b30f4a4550db740b3059c85f91f9b717 GIT binary patch literal 219 zc${NkU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?VnnbmT0TgRf7-??Y3@;BMBZ28U-Y!(~@ zlwky72_TmDMB*^!y9UGfk{~(>!IuKjSqQ!~h)zZDWk7T?f-eiAOAvfH5S@wO%Y*1V P1YZF}ry=-?5cdE8<0~G+ literal 0 Hc$@Coulomb force is a force of interaction between charged particles.

Coulomb's law

  • The magnitude of the electrostatic force between two point electric charges is directly proportional to the product of the magnitudes of each of the charges and inversely proportional to the square of the distance between the two charges.
  • -

    For more details, please refer to the Coulomb Force.

    +

    For more details, please refer to the Coulomb Force.

    diff --git a/step/data/objinfo/Disk.html b/step/data/objectinfo/disk.html rename from step/data/objinfo/Disk.html rename to step/data/objectinfo/disk.html diff --git a/step/data/objinfo/Gas.html b/step/data/objectinfo/gas.html rename from step/data/objinfo/Gas.html rename to step/data/objectinfo/gas.html --- a/step/data/objinfo/Gas.html +++ b/step/data/objectinfo/gas.html @@ -7,6 +7,6 @@

    A gas is a collection of gasoline particles. Associated with the gas is a force. To add gas particles rightclick the gas and click on "Create particles".

    -

    For details about the math used to calculate the forces, please refer to the Lennard-Jones potential.

    +

    For details about the math used to calculate the forces, please refer to the Lennard-Jones potential.

    diff --git a/step/data/objinfo/GasLJForce.html b/step/data/objectinfo/gasljforce.html rename from step/data/objinfo/GasLJForce.html rename to step/data/objectinfo/gasljforce.html --- a/step/data/objinfo/GasLJForce.html +++ b/step/data/objectinfo/gasljforce.html @@ -6,7 +6,7 @@ Force -

    This force simulates the Lennard-Jones potential. There are three parameters for this force:

    +

    This force simulates the Lennard-Jones potential. There are three parameters for this force: