From 5e763b7e428a1fff7e0e016a28fda64531c4054e Mon Sep 17 00:00:00 2001 From: William Wood Date: Fri, 22 Mar 2024 12:03:11 +0000 Subject: [PATCH 01/16] Update README.md --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 61d55aa4..355f88b5 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,18 @@ # JISA - "LabVIEW? Never heard of her." `JISA` is a library that I created, here in the Cavendish Laboratory, because I really (really really really) do not like LabVIEW. If you're ever in the mood to be forcibly bored into an early grave, ask me why. -In essence then, the purpose of `JISA` is to act as an alternative (and standardised) means of creating experimental control systems. It comprises, largely, of three sections: +In essence then, the purpose of `JISA` is to act as an alternative (and standardised) means of creating experimental control systems. Written in Java, it can be used in a variety of different languages, but works particularly well in: + +- Java +- Kotlin (Used in examples below) +- Python (See [PyJISA](https://github.com/OE-FET/PyJISA)) + +It comprises, largely, of three sections: + +1. [Standardised Instrument Control](#1-standardised-instrument-control) +2. [Data Handling](#2-data-handling) +3. [GUI Building Blocks](#3-gui-building-blocks) + ### 1. Standardised Instrument Control `JISA` implements standard interfaces for each "type" of instrument, meaning that instruments are easily interchangeable. For instance: From 4a2fccc6d1cee430ad4bc70313515687b5b85dae Mon Sep 17 00:00:00 2001 From: William Wood Date: Thu, 4 Apr 2024 11:14:29 +0100 Subject: [PATCH 02/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 355f88b5..c6e6b1fa 100644 --- a/README.md +++ b/README.md @@ -269,7 +269,7 @@ Otherwise, take a look at GraalPy [here](https://www.graalvm.org/python/). ```python # Import and start PyJISA -import pyjisa; pyjisa.load() +import pyjisa.autoload # Import JISA classes as if they're Python classes from jisa.devices.smu import K2450 From 09c380cbb7e374593950eaa9333f88151c461571 Mon Sep 17 00:00:00 2001 From: William Wood Date: Wed, 10 Apr 2024 17:16:03 +0100 Subject: [PATCH 03/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c6e6b1fa..9d2404c9 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

# JISA - "LabVIEW? Never heard of her." -`JISA` is a library that I created, here in the Cavendish Laboratory, because I really (really really really) do not like LabVIEW. If you're ever in the mood to be forcibly bored into an early grave, ask me why. +`JISA` is a library that I created, here in the Cavendish Laboratory, because I really (really really really) do not like LabVIEW. If you're ever in the mood to be forcibly bored into an early grave, ask me why. You can read all about it, as well as how to use it, on the [JISA Wiki](https://github.com/OE-FET/JISA/wiki). In essence then, the purpose of `JISA` is to act as an alternative (and standardised) means of creating experimental control systems. Written in Java, it can be used in a variety of different languages, but works particularly well in: From 2a85385f4b792289a196c1ffa620737b200d1ccb Mon Sep 17 00:00:00 2001 From: William Wood Date: Fri, 19 Apr 2024 22:46:33 +0100 Subject: [PATCH 04/16] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 9d2404c9..c54f3f89 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,9 @@

# JISA - "LabVIEW? Never heard of her." + +

+ `JISA` is a library that I created, here in the Cavendish Laboratory, because I really (really really really) do not like LabVIEW. If you're ever in the mood to be forcibly bored into an early grave, ask me why. You can read all about it, as well as how to use it, on the [JISA Wiki](https://github.com/OE-FET/JISA/wiki). In essence then, the purpose of `JISA` is to act as an alternative (and standardised) means of creating experimental control systems. Written in Java, it can be used in a variety of different languages, but works particularly well in: From 78a878974e5e9b43a353d5dfe8c59ec14e9209c7 Mon Sep 17 00:00:00 2001 From: William Wood Date: Fri, 19 Apr 2024 22:47:37 +0100 Subject: [PATCH 05/16] Add files via upload --- JISA.svg | 209 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 209 insertions(+) create mode 100644 JISA.svg diff --git a/JISA.svg b/JISA.svg new file mode 100644 index 00000000..502f2e58 --- /dev/null +++ b/JISA.svg @@ -0,0 +1,209 @@ + + + +Standardised Instrument ControlBasic Data HandlingEasy GUI Building From 6ee7458ce93de93b3cded677546d45281afb7d7e Mon Sep 17 00:00:00 2001 From: William Wood Date: Fri, 19 Apr 2024 22:48:02 +0100 Subject: [PATCH 06/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c54f3f89..8c10e80c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # JISA - "LabVIEW? Never heard of her." -

+

`JISA` is a library that I created, here in the Cavendish Laboratory, because I really (really really really) do not like LabVIEW. If you're ever in the mood to be forcibly bored into an early grave, ask me why. You can read all about it, as well as how to use it, on the [JISA Wiki](https://github.com/OE-FET/JISA/wiki). From e3397c04375951597c4923a71844e157b37b21aa Mon Sep 17 00:00:00 2001 From: William Wood Date: Fri, 19 Apr 2024 22:52:18 +0100 Subject: [PATCH 07/16] Add files via upload --- JISA.svg | 294 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 175 insertions(+), 119 deletions(-) diff --git a/JISA.svg b/JISA.svg index 502f2e58..dee25d3d 100644 --- a/JISA.svg +++ b/JISA.svg @@ -2,40 +2,15 @@ Standardised Instrument ControlBasic Data HandlingEasy GUI Building + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16px;font-family:'CMU Sans Serif';-inkscape-font-specification:'CMU Sans Serif Bold';text-align:center;white-space:pre;shape-inside:url(#rect3);display:inline;fill:#ffffff;fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8;paint-order:stroke markers fill" />Standardised Instrument ControlBasic Data HandlingEasy GUI Building From 2c2197070b43b5bbcc8d2817c124f1f49f811124 Mon Sep 17 00:00:00 2001 From: William Wood Date: Fri, 19 Apr 2024 22:53:25 +0100 Subject: [PATCH 08/16] Rename JISA.svg to JISAInfo.svg --- JISA.svg => JISAInfo.svg | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename JISA.svg => JISAInfo.svg (100%) diff --git a/JISA.svg b/JISAInfo.svg similarity index 100% rename from JISA.svg rename to JISAInfo.svg From a7686dd8cfb2dd6bfb5571f049b679a5a44dfd07 Mon Sep 17 00:00:00 2001 From: William Wood Date: Fri, 19 Apr 2024 22:53:39 +0100 Subject: [PATCH 09/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c10e80c..1e6bc517 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # JISA - "LabVIEW? Never heard of her." -

+

`JISA` is a library that I created, here in the Cavendish Laboratory, because I really (really really really) do not like LabVIEW. If you're ever in the mood to be forcibly bored into an early grave, ask me why. You can read all about it, as well as how to use it, on the [JISA Wiki](https://github.com/OE-FET/JISA/wiki). From 19155ce4bb56ffdce423cdfe6dd1761cefba958a Mon Sep 17 00:00:00 2001 From: William Wood Date: Sun, 12 May 2024 12:12:42 +0100 Subject: [PATCH 10/16] Add files via upload --- tiles.svg | 289 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 289 insertions(+) create mode 100644 tiles.svg diff --git a/tiles.svg b/tiles.svg new file mode 100644 index 00000000..e6e28969 --- /dev/null +++ b/tiles.svg @@ -0,0 +1,289 @@ + + + +Standardised Instrument ControlBasic Data HandlingEasy GUI Building From 02911c82e23f562c7ec3348d6447f2eb0516ac8d Mon Sep 17 00:00:00 2001 From: William Wood Date: Sun, 12 May 2024 12:13:34 +0100 Subject: [PATCH 11/16] Add files via upload From 46219d8cd7b143bc5da8c470732e06cea6c09f81 Mon Sep 17 00:00:00 2001 From: William Wood Date: Sun, 12 May 2024 12:13:57 +0100 Subject: [PATCH 12/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e6bc517..2f37fc9c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # JISA - "LabVIEW? Never heard of her." -

+

`JISA` is a library that I created, here in the Cavendish Laboratory, because I really (really really really) do not like LabVIEW. If you're ever in the mood to be forcibly bored into an early grave, ask me why. You can read all about it, as well as how to use it, on the [JISA Wiki](https://github.com/OE-FET/JISA/wiki). From 1ca84646403a8e726bd5490e1dc3bf36ce4281cf Mon Sep 17 00:00:00 2001 From: William Wood Date: Sun, 12 May 2024 12:18:49 +0100 Subject: [PATCH 13/16] Delete tiles.svg --- tiles.svg | 289 ------------------------------------------------------ 1 file changed, 289 deletions(-) delete mode 100644 tiles.svg diff --git a/tiles.svg b/tiles.svg deleted file mode 100644 index e6e28969..00000000 --- a/tiles.svg +++ /dev/null @@ -1,289 +0,0 @@ - - - -Standardised Instrument ControlBasic Data HandlingEasy GUI Building From fba01c39647923b421f4324aba9c6c1a2014c3db Mon Sep 17 00:00:00 2001 From: William Wood Date: Sun, 12 May 2024 12:19:01 +0100 Subject: [PATCH 14/16] Delete JISAInfo.svg --- JISAInfo.svg | 265 --------------------------------------------------- 1 file changed, 265 deletions(-) delete mode 100644 JISAInfo.svg diff --git a/JISAInfo.svg b/JISAInfo.svg deleted file mode 100644 index dee25d3d..00000000 --- a/JISAInfo.svg +++ /dev/null @@ -1,265 +0,0 @@ - - - -Standardised Instrument ControlBasic Data HandlingEasy GUI Building From 4dd7ec8f5852ae0b1f4e018ad69dced9d3cc426b Mon Sep 17 00:00:00 2001 From: William Wood Date: Sun, 12 May 2024 12:19:14 +0100 Subject: [PATCH 15/16] Add files via upload --- info.svg | 289 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 289 insertions(+) create mode 100644 info.svg diff --git a/info.svg b/info.svg new file mode 100644 index 00000000..e6e28969 --- /dev/null +++ b/info.svg @@ -0,0 +1,289 @@ + + + +Standardised Instrument ControlBasic Data HandlingEasy GUI Building From 8fcf93a0f837682553841e2b0fced6b33b60ad04 Mon Sep 17 00:00:00 2001 From: William Wood Date: Sun, 12 May 2024 12:19:28 +0100 Subject: [PATCH 16/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2f37fc9c..92b4c628 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # JISA - "LabVIEW? Never heard of her." -

+

`JISA` is a library that I created, here in the Cavendish Laboratory, because I really (really really really) do not like LabVIEW. If you're ever in the mood to be forcibly bored into an early grave, ask me why. You can read all about it, as well as how to use it, on the [JISA Wiki](https://github.com/OE-FET/JISA/wiki).