Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 15fb2f653ade
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 47c1abe655f2
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Sep 1, 2019

  1. Initial skeleton of psuclient

    @azonenberg
    azonenberg committed Sep 1, 2019
    Copy the full SHA
    47c1abe View commit details
Showing with 651 additions and 0 deletions.
  1. +19 −0 psuclient/CMakeLists.txt
  2. +180 −0 psuclient/MainWindow.cpp
  3. +78 −0 psuclient/MainWindow.h
  4. +327 −0 psuclient/main.cpp
  5. +47 −0 psuclient/psuclient.h
19 changes: 19 additions & 0 deletions psuclient/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#Set up include paths
include_directories(${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS})
link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})

###############################################################################
#C++ compilation
add_executable(psuclient
MainWindow.cpp
main.cpp
)

###############################################################################
#Linker settings
target_link_libraries(psuclient
scopehal
${GTKMM_LIBRARIES}
${SIGCXX_LIBRARIES}
)

180 changes: 180 additions & 0 deletions psuclient/MainWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
/***********************************************************************************************************************
* *
* ANTIKERNEL v0.1 *
* *
* Copyright (c) 2012-2019 Andrew D. Zonenberg *
* All rights reserved. *
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
* following conditions are met: *
* *
* * Redistributions of source code must retain the above copyright notice, this list of conditions, and the *
* following disclaimer. *
* *
* * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the *
* following disclaimer in the documentation and/or other materials provided with the distribution. *
* *
* * Neither the name of the author nor the names of any contributors may be used to endorse or promote products *
* derived from this software without specific prior written permission. *
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE AUTHORS BE HELD LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES *
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR *
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
***********************************************************************************************************************/

/**
@file
@author Andrew D. Zonenberg
@brief Implementation of main application window class
*/

#include "psuclient.h"
#include "../scopehal/Instrument.h"
#include "../scopehal/Graph.h"
#include "MainWindow.h"

using namespace std;

////////////////////////////////////////////////////////////////////////////////////////////////////
// Construction / destruction

/**
@brief Initializes the main window
*/
MainWindow::MainWindow(vector<PowerSupply*> psus)
: m_psus(psus)
{
//Set title
string title = "Power Supply: ";
for(size_t i=0; i<psus.size(); i++)
{
auto psu = psus[i];

char tt[256];
snprintf(tt, sizeof(tt), "%s (%s %s, serial %s)",
psu->m_nickname.c_str(),
psu->GetVendor().c_str(),
psu->GetName().c_str(),
psu->GetSerial().c_str()
);

if(i > 0)
title += ", ";
title += tt;
}
set_title(title);

//Initial setup
set_reallocate_redraws(true);
set_default_size(1280, 800);

//Add widgets
CreateWidgets();
}

/**
@brief Application cleanup
*/
MainWindow::~MainWindow()
{

}

/**
@brief Helper function for creating widgets and setting up signal handlers
*/
void MainWindow::CreateWidgets()
{
//Set up window hierarchy
add(m_vbox);
m_vbox.pack_start(m_menu, Gtk::PACK_SHRINK);
m_menu.append(m_fileMenuItem);
m_fileMenuItem.set_label("File");
m_fileMenuItem.set_submenu(m_fileMenu);
auto item = Gtk::manage(new Gtk::MenuItem("Quit", false));
item->signal_activate().connect(
sigc::mem_fun(*this, &MainWindow::OnQuit));
m_fileMenu.append(*item);

/*
m_vbox.pack_start(m_statusbar, Gtk::PACK_SHRINK);
m_statusbar.pack_end(m_triggerConfigLabel, Gtk::PACK_SHRINK);
m_triggerConfigLabel.set_size_request(75, 1);
*/

//Process all of the channels
for(auto psu : m_psus)
{
for(int i=0; i<psu->GetPowerChannelCount(); i++)
{
//Create the top level frame for all of our control widgets
char name[256];
snprintf(name, sizeof(name), "%s %s", psu->m_nickname.c_str(), psu->GetPowerChannelName(i).c_str());

auto frame = Gtk::manage(new Gtk::Frame);
frame->set_label(name);

m_vbox.pack_start(*frame, Gtk::PACK_SHRINK);

//Horizontal box with controls on the left and load graph on the right
auto hbox = Gtk::manage(new Gtk::HBox);
frame->add(*hbox);

//Vertical box for I/V settings
auto vbox = Gtk::manage(new Gtk::VBox);
hbox->pack_start(*vbox, Gtk::PACK_SHRINK);

//Voltage and current ACTUAL box
auto aframe = Gtk::manage(new Gtk::Frame);
aframe->set_label("Actual");
vbox->pack_start(*aframe, Gtk::PACK_SHRINK);

//Voltage and current SET POINT box
auto tframe = Gtk::manage(new Gtk::Frame);
tframe->set_label("Target");
vbox->pack_start(*tframe, Gtk::PACK_SHRINK);

//Miscellaneous settings box
auto sframe = Gtk::manage(new Gtk::Frame);
sframe->set_label("Settings");
vbox->pack_start(*sframe, Gtk::PACK_SHRINK);

//Vertical box for graphs
auto gbox = Gtk::manage(new Gtk::VBox);
hbox->pack_start(*gbox, Gtk::PACK_SHRINK);

//Graphs for I/V
auto vgraph = Gtk::manage(new Graph);
vgraph->set_size_request(400, 100);
vgraph->m_units = "V";
vgraph->m_minScale = 0;
vgraph->m_maxScale = 5;
vgraph->m_scaleBump = 1;
gbox->pack_start(*vgraph, Gtk::PACK_SHRINK);

auto igraph = Gtk::manage(new Graph);
igraph->set_size_request(400, 100);
igraph->m_units = "A";
igraph->m_minScale = 0;
igraph->m_maxScale = 5;
igraph->m_scaleBump = 1;
gbox->pack_start(*igraph, Gtk::PACK_SHRINK);
}
}

//Done adding widgets
show_all();
}

////////////////////////////////////////////////////////////////////////////////////////////////////
// Message handlers

void MainWindow::OnQuit()
{
close();
}
78 changes: 78 additions & 0 deletions psuclient/MainWindow.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/***********************************************************************************************************************
* *
* ANTIKERNEL v0.1 *
* *
* Copyright (c) 2012-2019 Andrew D. Zonenberg *
* All rights reserved. *
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
* following conditions are met: *
* *
* * Redistributions of source code must retain the above copyright notice, this list of conditions, and the *
* following disclaimer. *
* *
* * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the *
* following disclaimer in the documentation and/or other materials provided with the distribution. *
* *
* * Neither the name of the author nor the names of any contributors may be used to endorse or promote products *
* derived from this software without specific prior written permission. *
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE AUTHORS BE HELD LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES *
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR *
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
***********************************************************************************************************************/

/**
@file
@author Andrew D. Zonenberg
@brief Top-level window for the application
*/

#ifndef MainWindow_h
#define MainWindow_h

#include "../scopehal/PowerSupply.h"

/**
@brief Main application window class for a power supply
*/
class MainWindow : public Gtk::Window
{
public:
MainWindow(std::vector<PowerSupply*> psus);
~MainWindow();

size_t GetPSUCount()
{ return m_psus.size(); }

PowerSupply* GetPSU(size_t i)
{ return m_psus[i]; }

protected:
void OnQuit();

//Initialization
void CreateWidgets();

//Widgets
Gtk::VBox m_vbox;
Gtk::MenuBar m_menu;
Gtk::MenuItem m_fileMenuItem;
Gtk::Menu m_fileMenu;
/*
Gtk::HBox m_toolbox;
Gtk::Toolbar m_toolbar;
*/

protected:

//Our PSU connections
std::vector<PowerSupply*> m_psus;
};

#endif
Loading