Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fox grid2 #59

Merged
merged 10 commits into from
Aug 28, 2024
Merged

Fox grid2 #59

merged 10 commits into from
Aug 28, 2024

Commits on May 27, 2024

  1. Configuration menu
    Copy the full SHA
    f3bfc94 View commit details
    Browse the repository at this point in the history
  2. Old files deleted, new files added

    code is based on project https://github.com/janrohlicek/GridLib
    files are the separate forlder foxgrid
    janrohlicek committed May 27, 2024
    Configuration menu
    Copy the full SHA
    1ee6958 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4e031e9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b347541 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Show result bug repaired

    It did not add the folder location to the filename and the result was not shown
    janrohlicek committed May 28, 2024
    Configuration menu
    Copy the full SHA
    31435d5 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2024

  1. Merge branch 'master' into FOXGrid2

    * master:
      Update wxWidgets to version 3.2.5
    vincefn committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    3311f1f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b9f22fa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7560c8c View commit details
    Browse the repository at this point in the history
  4. Merge commit '6770100aee1a7814f2f82a8a8cece6e4199a25de' into FOXGrid2

    * commit '6770100aee1a7814f2f82a8a8cece6e4199a25de':
      Correct mutable vector<vector<int> > (missing space between >>)
      Remove IMD in GUI and one bug
      Removing mName from ScatteringComponent
      Getting back one change that should not be in ssNMR branch
      InterMolDistPar::mAt1 -> vector
      Fine tunning
      speeding up
      Updating project file
      Bug repaired
      Trying to rewrite/restore the lost code
      changes from GUI
      Update Crystal.cpp
      InterMolDistPar XML input and output InterMolDistCost and Scale in GUI
      ssNMR: user-input introduced window with a list of intermolecular restraints
      **The aim of this branch is to introduce intermolecular distances (conditions) between selected atoms and calculation of additional cost function based on that. Intermolecular distances can be measured by ssNMR.**
    
    # Conflicts:
    #	.gitignore
    #	Fox/Fox_vc12.vcxproj
    vincefn committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    aa319e0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d5b2bff View commit details
    Browse the repository at this point in the history