Skip to content

Add horizontal lines to graphs #1107

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 26, 2024
Merged

Add horizontal lines to graphs #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e71880a
Add horizontal lines to graphs
jmthomas Feb 18, 2024
8555a38
Merge branch 'main' into grapher_line
jmthomas Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions docs.openc3.com/docs/development/developing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ You can now see the running containers (I removed CONTAINER ID, CREATED and STAT
```bash
% docker ps
IMAGE COMMAND PORTS NAMES
openc3/openc3-cmd-tlm-api:latest "/sbin/tini -- rails…" 127.0.0.1:2901->2901/tcp openc3_openc3-cmd-tlm-api_1
openc3/openc3-script-runner-api:latest "/sbin/tini -- rails…" 127.0.0.1:2902->2902/tcp openc3_openc3-script-runner-api_1
openc3/openc3-traefik:latest "/entrypoint.sh trae…" 0.0.0.0:2900->80/tcp openc3_openc3-traefik_1
openc3/openc3-operator:latest "/sbin/tini -- ruby …" openc3_openc3-operator_1
openc3/openc3-minio:latest "/usr/bin/docker-ent…" 127.0.0.1:9000->9000/tcp openc3_openc3-minio_1
openc3/openc3-redis:latest "docker-entrypoint.s…" 127.0.0.1:6379->6379/tcp openc3_openc3-redis_1
openc3/openc3-cmd-tlm-api:latest "/sbin/tini -- rails…" 127.0.0.1:2901->2901/tcp cosmos-openc3-cmd-tlm-api-1
openc3/openc3-script-runner-api:latest "/sbin/tini -- rails…" 127.0.0.1:2902->2902/tcp cosmos-openc3-script-runner-api-1
openc3/openc3-traefik:latest "/entrypoint.sh trae…" 0.0.0.0:2900->80/tcp cosmos-openc3-traefik-1
openc3/openc3-operator:latest "/sbin/tini -- ruby …" cosmos-openc3-operator-1
openc3/openc3-minio:latest "/usr/bin/docker-ent…" 127.0.0.1:9000->9000/tcp cosmos-openc3-minio-1
openc3/openc3-redis:latest "docker-entrypoint.s…" 127.0.0.1:6379->6379/tcp cosmos-openc3-redis-1
```

If you go to localhost:2900 you should see COSMOS up and running!
Expand Down Expand Up @@ -123,23 +123,28 @@ If the code you want to develop is the cmd-tlm-api or script-runner-api backend

```bash
% cd openc3-traefik
traefik % docker ps
openc3-traefik % docker ps
# Look for the container with name including traefik
traefik % docker stop openc3_openc3-traefik_1
traefik % docker build -f Dockerfile-dev -t openc3-traefik-dev .
traefik % docker run --network=openc3-cosmos-network -p 2900:2900 -it --rm openc3-traefik-dev
openc3-traefik % docker stop cosmos-openc3-traefik-1
openc3-traefik % docker build --build-arg TRAEFIK_CONFIG=traefik-dev.yaml -t openc3-traefik-dev .
openc3-traefik % docker run --network=openc3-cosmos-network -p 2900:2900 -it --rm openc3-traefik-dev
```

1. Run a local copy of the cmd-tlm-api or script-runner-api

```bash
% cd openc3-cmd-tlm-api
openc3-cmd-tlm-api % docker ps
% cd openc3-cosmos-cmd-tlm-api
openc3-cosmos-cmd-tlm-api % docker ps
# Look for the container with name including cmd-tlm-api
openc3-cmd-tlm-api % docker stop openc3_openc3-cmd-tlm-api_1
# Set all the environment variables in the .env file
openc3-cmd-tlm-api % bundle install
openc3-cmd-tlm-api % bundle exec rails s
openc3-cosmos-cmd-tlm-api % docker stop cosmos-openc3-cosmos-cmd-tlm-api-1
# Run the following on Windows:
openc3-cosmos-cmd-tlm-api> dev_server.bat
# In Linux, set all the environment variables in the .env file, but override REDIS to be local
openc3-cosmos-cmd-tlm-api % set -a; source ../.env; set +a
openc3-cosmos-cmd-tlm-api % export OPENC3_REDIS_HOSTNAME=127.0.0.1
openc3-cosmos-cmd-tlm-api % export OPENC3_REDIS_EPHEMERAL_HOSTNAME=127.0.0.1
openc3-cosmos-cmd-tlm-api % bundle install
openc3-cosmos-cmd-tlm-api % bundle exec rails s
```

1. Once the `rails s` command returns you should see API requests coming from interations in the frontend code. If you add code (like Ruby debugging statements) to the cmd-tlm-api code you need to stop the server (CTRL-C) and restart it to see the effect.
1. Once the `bundle exec rails s` command returns you should see API requests coming from interations in the frontend code. If you add code (like Ruby debugging statements) to the cmd-tlm-api code you need to stop the server (CTRL-C) and restart it to see the effect.
7 changes: 7 additions & 0 deletions openc3-cosmos-init/plugins/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,14 @@ NOTE: All commands are assumed to be executed from this (openc3-cosmos-init) dir
openc3-cosmos-cmd-tlm-api> docker ps
# Look for the container with name including cmd-tlm-api
openc3-cosmos-cmd-tlm-api> docker stop cosmos-openc3-cosmos-cmd-tlm-api-1
# Run the following on Windows:
openc3-cosmos-cmd-tlm-api> dev_server.bat
# On Linux execute the equivalent commands:
openc3-cosmos-cmd-tlm-api> set -a; source ../.env; set +a
openc3-cosmos-cmd-tlm-api> export OPENC3_REDIS_HOSTNAME=127.0.0.1
openc3-cosmos-cmd-tlm-api> export OPENC3_REDIS_EPHEMERAL_HOSTNAME=127.0.0.1
openc3-cosmos-cmd-tlm-api> bundle install
openc3-cosmos-cmd-tlm-api> bundle exec rails s

# MINIO development

Expand Down
15 changes: 14 additions & 1 deletion ...s-init/plugins/packages/openc3-cosmos-tool-tlmgrapher/src/tools/TlmGrapher/TlmGrapher.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@
</v-row>
</div>

<v-row v-show="this.selectedGraphId !== null" class="ma-1">
<v-row
v-show="this.selectedGraphId !== null"
class="ma-1"
style="flex-wrap: nowrap"
>
<target-packet-item-chooser
:initial-target-name="this.$route.params.target"
:initial-packet-name="this.$route.params.packet"
Expand Down Expand Up @@ -76,6 +80,9 @@
>
<v-icon large>mdi-pause</v-icon>
</v-btn>
<div class="graph-info">
Click item name in Legend to toggle. Right click to edit.
</div>
</v-row>
</v-expansion-panel-content>
</v-expansion-panel>
Expand Down Expand Up @@ -303,6 +310,7 @@ export default {
graphMinX: vueGraph.graphMinX,
graphMaxX: vueGraph.graphMaxX,
legendPosition: vueGraph.legendPosition,
lines: vueGraph.lines,
}
// Only add the start and end time if we have both
// This prevents adding just the start time and having the graph
Expand Down Expand Up @@ -490,6 +498,7 @@ export default {
vueGraph.graphEndDateTime = graph.graphEndDateTime
vueGraph.moveLegend(graph.legendPosition)
vueGraph.addItems([...graph.items])
vueGraph.lines = graph.lines
})
this.state = 'start'
this.dontSaveDefaultConfig = false
Expand Down Expand Up @@ -529,6 +538,10 @@ i.v-icon.mdi-chevron-down {
.control {
margin-top: 60px;
}
.graph-info {
width: 140px;
margin-left: 70px;
}
.v-expansion-panel-content {
.container {
margin: 0px;
Expand Down
Loading