Skip to content

Commit

Permalink
Merge 28e7225 into 583feef
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sedictious
Sedictious committed Jul 11, 2019
2 parents 583feef + 28e7225 commit a55ad42
Show file tree
Hide file tree
Showing 11 changed files with 752 additions and 5 deletions.
2 changes: 2 additions & 0 deletions src/core/include/constants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
#define GENERAL_ATTR_GRAPHTYPE "graphType"
//! a command to AttrsGenerator
#define GENERAL_ATTR_EDGEATTRS "edgeAttrs"
//! number of edge attributes
#define GENERAL_ATTR_EDGE_NUM "edgeAttrsNumber"

//! path to the directory in which the file will be saved
#define OUTPUT_DIR "outputDirectory"
Expand Down
8 changes: 6 additions & 2 deletions src/gui/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ set(EVOPLEX_GUI_H
#contextmenutable.h
experimentdesigner.h
experimentwidget.h
graphdesigner.h
fontstyles.h
#linechart.h
linebutton.h
Expand All @@ -101,7 +102,7 @@ set(EVOPLEX_GUI_H
savedialog.h
tablewidget.h
graphtitlebar.h

graphdesignerpage.h
consolewidget.h
pluginspage.h
projectspage.h
Expand All @@ -117,6 +118,7 @@ set(EVOPLEX_GUI_CXX
attrwidget.cpp
attrsgendlg.cpp
experimentdesigner.cpp
graphdesigner.cpp
colormap.cpp
#contextmenutable.cpp
experimentwidget.cpp
Expand All @@ -134,7 +136,7 @@ set(EVOPLEX_GUI_CXX
savedialog.cpp
tablewidget.cpp
graphtitlebar.cpp

graphdesignerpage.cpp
consolewidget.cpp
pluginspage.cpp
projectspage.cpp
Expand All @@ -149,10 +151,12 @@ set(EVOPLEX_GUI_UIFORM
attrsgendlg
consoletitlebar
experimentdesigner
graphdesigner
basegraphgl
graphsettings
gridsettings
graphtitlebar
graphdesignerpage
#linechartsettings
outputwidget
pluginspage
Expand Down
99 changes: 99 additions & 0 deletions src/gui/forms/graphdesigner.ui
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>GraphDesigner</class>
<widget class="QWidget" name="GraphDesigner">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1054</width>
<height>395</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>300</width>
<height>137</height>
</size>
</property>
<property name="windowTitle">
<string>Experiment Designer</string>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<widget class="QWidget" name="cntGraphContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>491</width>
<height>411</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QTreeWidget" name="treeWidget">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
<property name="indentation">
<number>8</number>
</property>
<property name="animated">
<bool>true</bool>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerCascadingSectionResizes">
<bool>false</bool>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>120</number>
</attribute>
<column>
<property name="text">
<string/>
</property>
</column>
<column>
<property name="text">
<string/>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</widget>
<resources/>
<connections/>
</ui>
122 changes: 122 additions & 0 deletions src/gui/forms/graphdesignerpage.ui
View file
Original file line number Diff line number Diff line change
@@ -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>517</width>
<height>385</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>

0 comments on commit a55ad42

Please sign in to comment.