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

0.10.0 #29

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
3ef838a
New branch
Apr 27, 2023
ab2198d
Updating background image
jsimpsonUoA May 3, 2023
6c49e2d
Merge branch '0.10.0' of https://github.com/PALab/place into 0.10.0
jsimpsonUoA May 3, 2023
be611f7
Updating main GUI
jsimpsonUoA May 7, 2023
8f39cbd
Adding action buttons
jsimpsonUoA May 8, 2023
dc350d2
Working on new Add Module button
jsimpsonUoA May 10, 2023
80e3d8f
Adding add module dropdown
jsimpsonUoA May 10, 2023
f09b875
Finishing new Add Module list
jsimpsonUoA May 10, 2023
b38b0f5
Updating modified helper_functions.js
jsimpsonUoA May 11, 2023
5952691
Updating delete button
jsimpsonUoA May 12, 2023
bd84103
Fixed repeat aborted experiment bug
jsimpsonUoA May 15, 2023
b13661f
Adding upload config functionality
jsimpsonUoA May 15, 2023
3a1505d
Adding upload config functionality
jsimpsonUoA May 16, 2023
10ab0ac
Implemented upload from config functionality
jsimpsonUoA May 17, 2023
b30df42
Tidying up upload config functionality and display elements
jsimpsonUoA May 17, 2023
f965318
Adding PLACE configuration view
jsimpsonUoA May 18, 2023
4d378d3
Implementing edits of .place.cfg file in browser
jsimpsonUoA May 18, 2023
3fb922a
Adding saving confirmation on Place configuration page
jsimpsonUoA May 19, 2023
8d8fb78
Updating tweaks
jsimpsonUoA May 19, 2023
f40b5ab
Adding status symbol indicator to history table view
jsimpsonUoA May 22, 2023
d8bba77
Working on serial_search functionality
jsimpsonUoA May 22, 2023
acd2155
Updating serial_search
jsimpsonUoA May 22, 2023
9430bd8
Updating modules to include serial_search functionality
jsimpsonUoA May 23, 2023
948fc72
Updating serial_search function
jsimpsonUoA May 23, 2023
9e2ef35
Updating Polytec serial_query functions
jsimpsonUoA May 23, 2023
fdec513
Updating QuantaRay serial_search
jsimpsonUoA May 23, 2023
af1224c
Fixing Polytec serial_search bug
jsimpsonUoA May 23, 2023
d4381fe
Fixing QuantaRay serial_search
jsimpsonUoA May 23, 2023
eac381f
Adding better error handling for missing .place.cfg values
jsimpsonUoA May 23, 2023
ff5e26f
Adding further serial search functionality
jsimpsonUoA May 24, 2023
96c28bb
Adding serial_search to more modules
May 24, 2023
dd08e44
Testing of serial port search function complete
May 24, 2023
4f13c0f
Adding Crtl+S to save place cfg
jsimpsonUoA May 25, 2023
a9f3076
Updating 0.10.0 documentation
jsimpsonUoA May 25, 2023
73f8476
Updated documentation
jsimpsonUoA May 26, 2023
f8bc6fc
Updating configuration tab buttons
jsimpsonUoA May 28, 2023
ff851c6
updating SR560 preamp
jsimpsonUoA May 29, 2023
2302017
Fixing a bug in SR560 module
jsimpsonUoA May 29, 2023
8067f37
Replacing readline() with read_until()
jsimpsonUoA Jun 13, 2023
236e563
Fixing MokuLab closing module bug and updating relevant documentation
jsimpsonUoA Jun 15, 2023
f8b8323
update dependencies
paul-freeman Jan 30, 2024
09cde39
add github and devcontainer files
paul-freeman Feb 25, 2024
709319f
Migrate to LICENSE file
paul-freeman Feb 25, 2024
5910b9c
add dash
paul-freeman Feb 25, 2024
fe6aac2
remove old license files
paul-freeman Feb 25, 2024
7fed4ef
update setup.py
paul-freeman Feb 25, 2024
7aadda0
update meta.yaml
paul-freeman Feb 25, 2024
96cd00f
update manifest
paul-freeman Feb 25, 2024
9ae155b
add sample dash entrypoint
paul-freeman Feb 25, 2024
bab6b1f
get basic dash app started
paul-freeman Feb 26, 2024
dba59e4
sync up package versions
paul-freeman Feb 26, 2024
76d594e
add vscode settings
paul-freeman Feb 26, 2024
83210fe
cleanup
paul-freeman Feb 26, 2024
3e2de4a
streamline build process
paul-freeman Feb 27, 2024
a66db30
adjust some build settings
paul-freeman Feb 27, 2024
6041d0a
outline first dash page
paul-freeman Feb 27, 2024
53869b3
add some dash stuff
paul-freeman Mar 2, 2024
6de89fd
latest dash
paul-freeman Mar 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ place.egg-info/*
elm-stuff/
place_db.sqlite3

.vscode/
placeweb/static/placeweb/documentation/.doctrees
placeweb/static/placeweb/documentation/.buildinfo
placeweb/static/placeweb/documentation/objects.inv
7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"recommendations": [
"ms-python.python",
"ms-python.vscode-pylance",
"ms-python.black-formatter"
]
}
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
}
}
166 changes: 0 additions & 166 deletions COPYING.LESSER

This file was deleted.

8 changes: 4 additions & 4 deletions COPYING → LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper mail.

Expand All @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
<https://www.gnu.org/licenses/>.

The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
<https://www.gnu.org/licenses/why-not-lgpl.html>.
3 changes: 1 addition & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
include README.md
include COPYING
include COPYING.LESSER
include LICENSE
recursive-include placeweb/templates *
recursive-include placeweb/static *
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ All the configuration options for PLACE are put into a file in your home
directory named `~/.place.cfg`. Typically, this file includes information
needed to connect to the various hardware components running in PLACE. It is
not mandatory to set this up before running PLACE, but PLACE will display an
error message if it is unable to find a needed value.
error message if it is unable to find a needed value. Note that the settings
in `~/.place.cfg` can also be conveniently edited in the "PLACE Configuration"
tab of the web interface.

To find out which values are needed for the instruments you are using, read the
documentation for the PLACE plugin for that instrument. Alternatively, ask
Expand Down Expand Up @@ -114,13 +116,13 @@ immediately in PLACE.
To install a development build, from the ``place`` directory, run:

```
python setup.py develop
pip install -e .
```

When you are finished running the development build, you run:

```
python setup.py develop --uninstall
pip uninstall place
```

And then, to check the uninstallation you may need to ensure the PLACE
Expand All @@ -141,7 +143,7 @@ better if you are going to be using the build for more than just testing.
Run the following build command:

```
conda build place
conda build .
```

Install the local build:
Expand Down Expand Up @@ -284,3 +286,5 @@ Henrik tom Wörden
Kasper van Wijk

Paul Freeman

Jonathan Simpson
14 changes: 10 additions & 4 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
python:
- 3.5
- 3.6
- 3.7
- 3.12
- 3.11
- 3.10
- 3.9

target_platform:
numpy:
- 1.26.4

platform:
- linux-64
- osx-64
- osx-arm64
15 changes: 15 additions & 0 deletions elm-package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": "1.0.0",
"summary": "helpful summary of your project, less than 80 characters",
"repository": "https://github.com/user/project.git",
"license": "BSD3",
"source-directories": [
"."
],
"exposed-modules": [],
"dependencies": {
"elm-lang/core": "5.1.1 <= v < 6.0.0",
"elm-lang/html": "2.0.0 <= v < 3.0.0"
},
"elm-version": "0.18.0 <= v < 0.19.0"
}
Loading