Merge 7ff65af into 583feef

evoplex · Jul 5, 2019 · e26c74e · e26c74e
2 parents 583feef + 7ff65af
commit e26c74e
Show file tree

Hide file tree

Showing 8 changed files with 330 additions and 4 deletions.
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -101,7 +101,7 @@ set(EVOPLEX_GUI_H
   savedialog.h
   tablewidget.h
   graphtitlebar.h
-
+  graphdesignerpage.h
   consolewidget.h
   pluginspage.h
   projectspage.h
@@ -134,7 +134,7 @@ set(EVOPLEX_GUI_CXX
   savedialog.cpp
   tablewidget.cpp
   graphtitlebar.cpp
-
+  graphdesignerpage.cpp
   consolewidget.cpp
   pluginspage.cpp
   projectspage.cpp
@@ -153,6 +153,7 @@ set(EVOPLEX_GUI_UIFORM
   graphsettings
   gridsettings
   graphtitlebar
+  graphdesignerpage
   #linechartsettings
   outputwidget
   pluginspage

diff --git a/src/gui/forms/graphdesignerpage.ui b/src/gui/forms/graphdesignerpage.ui
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GraphDesignerPage</class>
+ <widget class="QWidget" name="GraphDesignerPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>631</width>
+    <height>487</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="leftMargin">
+      <number>25</number>
+     </property>
+     <property name="topMargin">
+      <number>25</number>
+     </property>
+     <property name="rightMargin">
+      <number>400</number>
+     </property>
+     <property name="bottomMargin">
+      <number>20</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="labelGraphDesigner">
+       <property name="text">
+        <string>Graph Designer</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="gridLayout_2">
+     <property name="leftMargin">
+      <number>30</number>
+     </property>
+     <property name="topMargin">
+      <number>20</number>
+     </property>
+     <property name="rightMargin">
+      <number>20</number>
+     </property>
+     <property name="bottomMargin">
+      <number>20</number>
+     </property>
+     <property name="verticalSpacing">
+      <number>10</number>
+     </property>
+     <item row="1" column="0">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="spacing">
+        <number>12</number>
+       </property>
+       <property name="leftMargin">
+        <number>10</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>20</number>
+       </property>
+       <item>
+        <widget class="QPushButton" name="bNewGraph">
+         <property name="text">
+          <string>New Graph</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="bOpenGraph">
+         <property name="text">
+          <string>Open Graph</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item row="0" column="1" rowspan="2">
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::MinimumExpanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>246</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/gui/graphdesignerpage.cpp b/src/gui/graphdesignerpage.cpp
@@ -0,0 +1,44 @@
+/**
+*  This file is part of Evoplex.
+*
+*  Evoplex is a multi-agent system for networks.
+*  Copyright (C) 2018 - Marcos Cardinot <marcos@cardinot.net>
+*
+*  This program is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation, either version 3 of the License, or
+*  (at your option) any later version.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include <QDebug>
+
+#include "fontstyles.h"
+#include "ui_graphdesignerpage.h"
+#include "graphdesignerpage.h"
+
+namespace evoplex {
+
+GraphDesignerPage::GraphDesignerPage(MainGUI* mainGUI)
+    : QWidget(mainGUI),
+    m_ui(new Ui_GraphDesignerPage),
+    m_mainApp(mainGUI->mainApp()),
+    m_innerWindow(new QMainWindow())
+{
+    m_ui->setupUi(this);
+
+    m_ui->labelGraphDesigner->setFont(FontStyles::h4());
+}
+
+GraphDesignerPage::~GraphDesignerPage()
+{
+    delete m_ui;
+}
+
+}
diff --git a/src/gui/graphdesignerpage.h b/src/gui/graphdesignerpage.h
@@ -0,0 +1,50 @@
+/**
+*  This file is part of Evoplex.
+*
+*  Evoplex is a multi-agent system for networks.
+*  Copyright (C) 2018 - Marcos Cardinot <marcos@cardinot.net>
+*
+*  This program is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation, either version 3 of the License, or
+*  (at your option) any later version.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef GRAPHDESIGNERPAGE_H
+#define GRAPHDESIGNERPAGE_H
+
+#include <QWidget>
+
+#include "maingui.h"
+#include "core/mainapp.h"
+
+class Ui_GraphDesignerPage;
+
+class MainGUI;
+
+namespace evoplex {
+
+class GraphDesignerPage : public QWidget
+{
+	Q_OBJECT
+
+public:
+    explicit GraphDesignerPage(MainGUI* mainGUI);
+    ~GraphDesignerPage();
+
+private:
+    Ui_GraphDesignerPage * m_ui;
+    MainApp* m_mainApp;
+    QMainWindow* m_innerWindow;
+};
+
+}
+#endif // GRAPHDESIGNERPAGE_H
diff --git a/src/gui/graphdesignerwidget.cpp b/src/gui/graphdesignerwidget.cpp
@@ -0,0 +1,44 @@
+/**
+*  This file is part of Evoplex.
+*
+*  Evoplex is a multi-agent system for networks.
+*  Copyright (C) 2018 - Marcos Cardinot <marcos@cardinot.net>
+*
+*  This program is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation, either version 3 of the License, or
+*  (at your option) any later version.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <QDebug>
+#include <QHBoxLayout>
+#include <QMainWindow>
+#include <QMessageBox>
+#include <QTableWidgetItem>
+
+#include "graphdesignerwidget.h"
+#include "ui_projectwidget.h"
+
+namespace evoplex {
+
+GraphDesignerWidget::GraphDesignerWidget(MainGUI* mainGUI) 
+    : public QDockWidget(),
+    m_ui(new Ui_ProjectWidget),
+    m_mainGUI(mainGUI)
+{
+    m_ui->setupUi(this);
+
+    setFocusPolicy(Qt::StrongFocus);
+
+    //m_ui->labelExps->setFont(FontStyles::subtitle1());
+}
+
+} // evoplex
diff --git a/src/gui/graphdesignerwidget.h b/src/gui/graphdesignerwidget.h
@@ -0,0 +1,50 @@
+/**
+*  This file is part of Evoplex.
+*
+*  Evoplex is a multi-agent system for networks.
+*  Copyright (C) 2018 - Marcos Cardinot <marcos@cardinot.net>
+*
+*  This program is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation, either version 3 of the License, or
+*  (at your option) any later version.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef GRAPHDESIGNErWIDGET_H
+#define GRAPHDESIGNERWIDGET_H
+
+#include <QDockWidget>
+#include <QCloseEvent>
+#include <QMap>
+#include <QMainWindow>
+
+#include "maingui.h"
+
+class BaseGraphGL;
+class Ui_ProjectWidget;
+
+namespace evoplex {
+
+    class GraphDesignerWidget : public QDockWidget
+    {
+        Q_OBJECT
+
+    public:
+        explicit GraphDesignerWidget(MainGUI* mainGUI);
+        ~GraphDesignerWidget();
+
+private:
+    Ui_ProjectWidget * m_ui;
+    MainGUI* m_mainGUI;
+};
+
+} // evoplex
+#endif // GRAPHDESIGNERWIDGET_H