diff --git a/Builds/Linux/build/windowState.xml b/Builds/Linux/build/windowState.xml index d2a9ab3cf8ea74aa93821e26a67040d31fad411e..006863ef19ea7708a8002391dba857c2c1a340a7 100644 --- a/Builds/Linux/build/windowState.xml +++ b/Builds/Linux/build/windowState.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <MAINWINDOW> - <BOUNDS x="1600" y="52" w="1680" h="973" fullscreen="0"/> + <BOUNDS x="488" y="277" w="1036" h="798" fullscreen="0"/> </MAINWINDOW> diff --git a/Source/UI/FilterList.cpp b/Source/UI/FilterList.cpp index 4ab3451b8e56b5d1dae3ba775c011f1197be1985..f8c94ea595dff3496132ed6b661751c06346ecee 100644 --- a/Source/UI/FilterList.cpp +++ b/Source/UI/FilterList.cpp @@ -29,27 +29,29 @@ FilterList::FilterList() : isDragging(false) FilterListItem* sources = new FilterListItem("Sources"); sources->addSubItem(new FilterListItem("Intan Demo Board")); sources->addSubItem(new FilterListItem("Signal Generator")); - //sources->addSubItem(new FilterListItem("Custom FPGA")); - //sources->addSubItem(new FilterListItem("File Reader")); + sources->addSubItem(new FilterListItem("Custom FPGA")); + sources->addSubItem(new FilterListItem("File Reader")); + sources->addSubItem(new FilterListItem("Network Source")); FilterListItem* filters = new FilterListItem("Filters"); filters->addSubItem(new FilterListItem("Bandpass Filter")); - //filters->addSubItem(new FilterListItem("Resampler")); - //filters->addSubItem(new FilterListItem("Spike Detector")); + filters->addSubItem(new FilterListItem("Resampler")); + filters->addSubItem(new FilterListItem("Spike Detector")); FilterListItem* sinks = new FilterListItem("Sinks"); sinks->addSubItem(new FilterListItem("LFP Viewer")); - //sinks->addSubItem(new FilterListItem("Spike Display")); + sinks->addSubItem(new FilterListItem("Spike Display")); + sinks->addSubItem(new FilterListItem("WiFi Output")); - //FilterListItem* utilities = new FilterListItem("Utilities"); - //utilities->addSubItem(new FilterListItem("Splitter")); - //utilities->addSubItem(new FilterListItem("Merger")); + FilterListItem* utilities = new FilterListItem("Utilities"); + utilities->addSubItem(new FilterListItem("Splitter")); + utilities->addSubItem(new FilterListItem("Merger")); baseItem = new FilterListItem("Processors"); baseItem->addSubItem(sources); baseItem->addSubItem(filters); baseItem->addSubItem(sinks); - //baseItem->addSubItem(utilities); + baseItem->addSubItem(utilities); } diff --git a/Source/UI/UIComponent.cpp b/Source/UI/UIComponent.cpp index 827e860874a5596a2e008e63db07b60e57fe57fd..55fb816ec9e6b4ee7e9de333d95d85b8272dd8c9 100644 --- a/Source/UI/UIComponent.cpp +++ b/Source/UI/UIComponent.cpp @@ -119,7 +119,10 @@ void UIComponent::resized() if (filterList != 0) { if (filterList->isOpen()) - filterList->setBounds(5,5,195,h-205); + if (filterViewportButton->isOpen()) + filterList->setBounds(5,5,195,h-200); + else + filterList->setBounds(5,5,195,h-50); else filterList->setBounds(5,5,195,34); }