Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-20 00:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc bugfixes (#39)

Browse Source 
* Selectively send pipeline changes

* Make input and output both rotated

* Notify UI of driver mode change over NT

* Fix "show multiple"

* Rename extent to fullness, fix area filtering

This is a breaking change to docs (make sure we note area is out of 100 and is percentage)

* Apply stream divisor to both streams

Co-authored-by: Banks T <btrout.dhrs@gmail.com>
This commit is contained in:
Matt
2020-07-17 20:05:03 -07:00
committed by GitHub
parent 0d155d9c6a
commit 768964c8fc
19 changed files with 231 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
photon-server/src/main/java/org/photonvision/server/SocketHandler.java
View File

@@ -139,7 +139,8 @@ public class SocketHandler {
DataChangeDestination.DCD_ACTIVEMODULE,
"cameraNickname",
(String) entryValue,
cameraIndex);
cameraIndex,
context);
dcService.publishEvent(ccnEvent);
break;
}
@@ -150,7 +151,8 @@ public class SocketHandler {
DataChangeDestination.DCD_ACTIVEMODULE,
"pipelineName",
(String) entryValue,
cameraIndex);
cameraIndex,
context);
dcService.publishEvent(cpnEvent);
break;
}
@@ -169,7 +171,8 @@ public class SocketHandler {
DataChangeDestination.DCD_ACTIVEMODULE,
"newPipelineInfo",
Pair.of(name, type),
cameraIndex);
cameraIndex,
context);
dcService.publishEvent(newPipelineEvent);
break;
}
@@ -184,7 +187,8 @@ public class SocketHandler {
DataChangeDestination.DCD_ACTIVEMODULE,
"deleteCurrPipeline",
0,
cameraIndex);
cameraIndex,
context);
dcService.publishEvent(deleteCurrentPipelineEvent);
break;
}
@@ -213,7 +217,8 @@ public class SocketHandler {
DataChangeDestination.DCD_ACTIVEMODULE,
"changePipeline",
(Integer) entryValue,
cameraIndex);
cameraIndex,
context);
dcService.publishEvent(changePipelineEvent);
break;
}
@@ -224,7 +229,8 @@ public class SocketHandler {
DataChangeDestination.DCD_ACTIVEMODULE,
"changePipeline",
PipelineManager.CAL_3D_INDEX,
cameraIndex);
cameraIndex,
context);
dcService.publishEvent(changePipelineEvent);
break;
}
@@ -232,7 +238,11 @@ public class SocketHandler {
{
var takeCalSnapshotEvent =
new IncomingWebSocketEvent<>(
DataChangeDestination.DCD_ACTIVEMODULE, "takeCalSnapshot", 0, cameraIndex);
DataChangeDestination.DCD_ACTIVEMODULE,
"takeCalSnapshot",
0,
cameraIndex,
context);
dcService.publishEvent(takeCalSnapshotEvent);
break;
}
@@ -251,7 +261,8 @@ public class SocketHandler {
DataChangeDestination.DCD_ACTIVEPIPELINESETTINGS,
dataEntry.getKey(),
dataEntry.getValue(),
cameraIndex2);
cameraIndex2,
context);
dcService.publishEvent(pipelineSettingChangeEvent);
}
} else {

4
photon-server/src/main/java/org/photonvision/server/UIInboundSubscriber.java
View File

@@ -43,7 +43,9 @@ public class UIInboundSubscriber extends DataChangeSubscriber {
|| incomingWSEvent.propertyName.equals("sendFullSettings")) {
// Send full settings
var settings = ConfigManager.getInstance().getConfig().toHashMap();
var message = new OutgoingUIEvent<>(UIUpdateType.BROADCAST, "fullsettings", settings);
var message =
new OutgoingUIEvent<>(
UIUpdateType.BROADCAST, "fullsettings", settings, incomingWSEvent.originContext);
DataChangeService.getInstance().publishEvent(message);
}
}