debug.h y endpointwidget

qtest.pro

@@ -4,5 +4,5 @@ INCLUDEPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" "$$PWD\src\cont"
 DESTPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" "$$PWD\src\cont"
 VPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" "$$PWD\src\cont"
 SOURCES += qtestmain.cpp qtclasses.cpp backlasses.cpp contclasses.cpp
-HEADERS += qtclasses.h backlasses.h contclasses.h global.h
+HEADERS += qtclasses.h backlasses.h contclasses.h global.h debug.h
 #DESTDIR += "build"

src/back/backlasses.cpp

@@ -21,6 +21,20 @@ float Endpoint::getVolume(){
 	return volume;
 }
 
+/*
+ * float Endpoint::getLeftChannelVolume(){
+ * 	float volume;
+ * 	if(FAILED(endpointVolume->GetMasterVolumeLevelScalar(&volume))) { log_debugcpp("si");}
+ * 	return volume;
+ * }
+ * 
+ * float Endpoint::getRightChannelVolume(){
+ * 	float volume;
+ * 	if(FAILED(endpointVolume->GetMasterVolumeLevelScalar(&volume))) { log_debugcpp("si");}
+ * 	return volume;
+ * }
+ */
+
 void Endpoint::setVolume(float volume) {
 	if(FAILED(endpointVolume->SetMasterVolumeLevelScalar(volume, NULL))) { log_debugcpp("si");  };
 }

src/back/backlasses.h

@@ -1,6 +1,7 @@
 #pragma once
 #define WIN32_LEAN_AND_MEAN
 
+#include "debug.h"
 #include "global.h"
 #include <vector>
 #include <iostream>

src/cont/contclasses.h

@@ -1,6 +1,5 @@
 #pragma once
 #include <QObject>
-#include "global.h"
 #include "backlasses.h"
 
 

src/debug.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#if defined (QT_DEBUG) || defined (DEBUG) || defined (_DEBUG)
+
+#define log_debugcpp(str) do {											\
+	 std::cout << "[DEBUG]" << "(" << __FILE__ << ":" << __LINE__ << "): " << str << std::endl; \
+	} while (0)
+#else 
+#define log_debugcpp(str) 
+#endif

src/global.h

@@ -1,4 +1,6 @@
 #pragma once
-#define log_debugcpp(str) do {											\
-	 std::cout << "[DEBUG]" << "(" << __FILE__ << ":" << __LINE__ << "): " << str << std::endl; \
-	} while (0)	
+
+//INIT BACK
+class OverseerHandler;
+extern OverseerHandler *osh;
+

src/qt/qtclasses.cpp

@@ -1,5 +1,50 @@
 #include "qtclasses.h"
 
+
+EndpointWidget::EndpointWidget(EndpointHandler* eph, QWidget *parent) : QWidget(parent){
+	layout = new QGridLayout();
+	this->setLayout(layout);
+	log_debugcpp("olaW");
+	if (parent == nullptr) { log_debugcpp("owo?"); }
+
+	mainLabel = new QLabel(eph->getName());
+	leftChannelLabel = new QLabel("88");
+	rightChannelLabel = new QLabel("77");
+	mainSlider = new QSlider(Qt::Horizontal);
+	leftChannelSlider = new QSlider(Qt::Horizontal);
+	rightChannelSlider = new QSlider(Qt::Horizontal);
+
+	mainSlider->setFocusPolicy(Qt::StrongFocus);
+	mainSlider->setTickPosition(QSlider::TicksBothSides);
+
+	mainSlider->setTickInterval(5);
+	mainSlider->setSingleStep(1);
+	mainSlider->setRange(0,100);
+	leftChannelSlider->setTickInterval(5);
+	leftChannelSlider->setSingleStep(1);
+	leftChannelSlider->setRange(0,100);
+	rightChannelSlider->setTickInterval(5);
+	rightChannelSlider->setSingleStep(1);
+	rightChannelSlider->setRange(0,100);
+	
+	float volume = eph->getVolume() * 100;
+	mainSlider->setValue((int)volume);
+	log_debugcpp("ENDPOINT SET WITH VOLUME " << volume);
+
+	layout->addWidget(mainLabel, 0, 0);
+	layout->addWidget(mainSlider, 0, 1);
+	layout->addWidget(leftChannelSlider, 1, 0);
+	layout->addWidget(leftChannelLabel, 2, 0);
+	layout->addWidget(rightChannelSlider, 1, 1);
+	layout->addWidget(rightChannelLabel, 2, 1);
+	layout->addItem(new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 3, 0);
+	layout->addItem(new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 3, 1);
+	
+	connect(mainSlider, &QSlider::valueChanged, eph, &EndpointHandler::setValue);
+	log_debugcpp("ENDPOINT_WIDGETED");
+}
+
+
 MainWindow::MainWindow(std::vector<EndpointHandler*> *ephs, QWidget *parent) : QMainWindow(parent)  {
 	// setWindowState(Qt::WindowFullScreen);
 	//	setCentralWidget(centralWidget);
@@ -12,27 +57,25 @@ MainWindow::MainWindow(std::vector<EndpointHandler*> *ephs, QWidget *parent) : Q
 
 	setWindowTitle("slidea resbala nu c");
 
-	setEndpointHandlers(ephs);
-	for (unsigned int i = 0; i < this->ephs->size(); i++){
-		QLabel *pintas = new QLabel(ephs->at(i)->getName());
-		QSlider *teSlider = new QSlider(Qt::Horizontal);
-		teSlider->setFocusPolicy(Qt::StrongFocus);
-		teSlider->setTickPosition(QSlider::TicksBothSides);
-		teSlider->setTickInterval(5);
-		teSlider->setSingleStep(1);
-		teSlider->setRange(0,100);
-		float volume = ephs->at(i)->getVolume() * 100;
-		teSlider->setValue((int)volume);
-		log_debugcpp("ENDPOINT SET WITH VOLUME " << volume);
-		layout->addWidget(pintas, i, 0);
-		layout->addWidget(teSlider, i, 1);
-		connect(teSlider, &QSlider::valueChanged, ephs->at(i), &EndpointHandler::setValue);
+	/*s
+	 * setEndpointHandlers(ephs);
+	 */
+	unsigned int i = 0;
+	for (; i < ephs->size(); i++) {
+		log_debugcpp("EPWidget creation");
+		EndpointWidget *epw = new EndpointWidget(ephs->at(i), widget);
+		ews.push_back(epw);
+		layout->addWidget(epw, i, 0);
 	}
+	layout->addItem(new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), i, 0);
 }
 
-void MainWindow::setEndpointHandlers(std::vector<EndpointHandler*> *ephs){
-	this->ephs = ephs;
-}
+/*
+ * void MainWindow::setEndpointHandlers(std::vector<EndpointHandler*> *ephs){
+ * 	this->ephs = ephs;
+ */
+
+
 
 /*
    * void MainWindow::setPlotButton() {

src/qt/qtclasses.h

@@ -8,23 +8,48 @@
 #include <QLabel>
 #include <QSlider>
 #include <QGridLayout>
-//#include "global.h"
 #include "contclasses.h"
 //#include <Q>
 //#include <QWidgets>
 
 
+class EndpointWidget : public QWidget {
+	Q_OBJECT
+	  	  
+public:
+	EndpointWidget(EndpointHandler* eph, QWidget *parent = nullptr);
+	//void populateEndpointWidget(EndpointHandler *eph);
+	//void setEndpointHandlers(std::vector<EndpointHandler*> *ephs);
+
+private:
+	QLabel *mainLabel = nullptr, *leftChannelLabel = nullptr, *rightChannelLabel = nullptr;
+	QSlider *mainSlider = nullptr;
+	QSlider *leftChannelSlider = nullptr;
+	QSlider *rightChannelSlider = nullptr;
+	QGridLayout *layout = nullptr;
+	//std::vector<EndpointHandler*> *ephs;
+	//std::vector<QSlider> *sliders;
+
+	//public slots:
+	//	void setEndpointHandlers(std::vector<EndpointHandler*> *ephs);
+	
+	//signals:
+    //void valueChanged(int value);
+
+};
+
+
 class MainWindow : public QMainWindow {
 	Q_OBJECT
 	//QWidget *centralWidget;
 	  	  
 public:
 	MainWindow(std::vector<EndpointHandler*> *ephs, QWidget *parent = nullptr);
-	void setEndpointHandlers(std::vector<EndpointHandler*> *ephs);
+	//void setEndpointHandlers(std::vector<EndpointHandler*> *ephs);
 
 private:
-	std::vector<EndpointHandler*> *ephs;
-	std::vector<QSlider> *sliders;
+	//std::vector<EndpointHandler*> *ephs;
+	std::vector<EndpointWidget*> ews;
 	QWidget *widget;
 	QGridLayout *layout;
 	//QLabel *pintas;

src/qtestmain.cpp

@@ -9,10 +9,7 @@
 #include <QMainWindow> 
 
 #include "qtclasses.h"
-//TODO david #include "backlasses.h"
 
-
-//INIT BACK
 OverseerHandler *osh = new OverseerHandler();
 	
 QApplication* createApplication(int &argc, char *argv[])