reverted failed attempt, fixed callback release

This commit is contained in:
Hane 2023-08-12 17:29:01 +02:00
commit f21619aa1f
7 changed files with 51 additions and 30 deletions

View file

@ -1,6 +1,5 @@
#include "qtclasses.h"
EndpointWidget::EndpointWidget(EndpointHandler* eph, QWidget *parent) : QWidget(parent){
this->eph = eph;
layout = new QGridLayout();
@ -71,8 +70,6 @@ uint64_t EndpointWidget::getIndex(){
return idx;
}
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
// setWindowState(Qt::WindowFullScreen);
// setCentralWidget(centralWidget);
@ -84,10 +81,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
//layout->addWidget(pintas, 0, 0);
setWindowTitle("slidea resbala nu c");
reloadEndpointWidgets();
}
/*s
* setEndpointHandlers(ephs);
*/
void MainWindow::reloadEndpointWidgets() {
unsigned int i = 0;
for (; i < (osh->getEndpointHandlers().size()); i++) {
log_debugcpp("EPWidget creation");
@ -95,15 +93,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
ews.push_back(epw);
layout->addWidget(epw, i, 0);
}
//osh->setEndpointWidgets(ews);
layout->addItem(new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), i, 0);
}
/*
* void MainWindow::setEndpointHandlers(std::vector<EndpointHandler*> *ephs){
* this->ephs = ephs;
*/
//#include "qtclosemwh.h"
/*
* void MainWindow::setPlotButton() {

View file

@ -1,8 +1,8 @@
#pragma once
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
//#include <vector>
#include <QMainWindow>
#include <QApplication>
#include <QLabel>
@ -10,12 +10,20 @@
#include <QGridLayout>
#include <QPushButton>
//#include "debug.h"
/*
* #else
* class QSlider;
* class QLabel;
* class QGridLayout;
* class QPushButton;
* class QWidget;
* class QMainWindow;
* #endif
*/
#include "global.h"
#include "contclasses.h"
//#include <Q>
//#include <QWidgets>
//class EndpointHandler;
class EndpointWidget : public QWidget {
Q_OBJECT
@ -59,6 +67,8 @@ class MainWindow : public QMainWindow {
public:
MainWindow(QWidget *parent = nullptr);
void reloadEndpointWidgets();
//TODO: destroy/empty existing EndpointWidgets
//void setEndpointHandlers(std::vector<EndpointHandler*> *ephs);
private:
@ -77,4 +87,3 @@ private:
};
#endif