Commit 012a5d1c authored by Tao Zhong's avatar Tao Zhong

Edit table with buttons - #135 Update ini file writer/reader for models

parent 6dee7446
Pipeline #20389 passed with stages
in 25 seconds
......@@ -35,7 +35,7 @@
<string notr="true"/>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab_general">
<attribute name="title">
......@@ -539,37 +539,11 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Groups of pedestrian&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_groups_1">
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>121</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Number of groups</string>
</property>
</widget>
<widget class="QSpinBox" name="spinBox_groups_1">
<property name="geometry">
<rect>
<x>130</x>
<y>50</y>
<width>111</width>
<height>21</height>
</rect>
</property>
<property name="minimum">
<number>1</number>
</property>
</widget>
<widget class="QTableWidget" name="tableWidget_groups_1">
<property name="geometry">
<rect>
<x>10</x>
<y>90</y>
<y>50</y>
<width>1121</width>
<height>251</height>
</rect>
......@@ -660,6 +634,32 @@
</property>
</item>
</widget>
<widget class="QPushButton" name="pushButton_addGroupRow">
<property name="geometry">
<rect>
<x>20</x>
<y>320</y>
<width>114</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Add row</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_deleteGroupRow">
<property name="geometry">
<rect>
<x>150</x>
<y>320</y>
<width>114</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Delete row</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_model_gcfm">
<attribute name="title">
......@@ -2356,7 +2356,7 @@
<property name="geometry">
<rect>
<x>10</x>
<y>90</y>
<y>50</y>
<width>1121</width>
<height>251</height>
</rect>
......@@ -2515,30 +2515,30 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Agent parameters&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_agents">
<widget class="QPushButton" name="pushButton_addAgentRow">
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>101</width>
<height>21</height>
<x>20</x>
<y>320</y>
<width>114</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Parameter sets</string>
<string>Add row</string>
</property>
</widget>
<widget class="QSpinBox" name="spinBox_agents">
<widget class="QPushButton" name="pushButton_deleteAgentRow">
<property name="geometry">
<rect>
<x>120</x>
<y>50</y>
<width>111</width>
<height>21</height>
<x>150</x>
<y>320</y>
<width>114</width>
<height>32</height>
</rect>
</property>
<property name="minimum">
<number>1</number>
<property name="text">
<string>Delete row</string>
</property>
</widget>
</widget>
......@@ -3068,7 +3068,6 @@
<tabstop>lineEdit_general_10</tabstop>
<tabstop>comboBox_general_03</tabstop>
<tabstop>lineEdit_general_12</tabstop>
<tabstop>spinBox_groups_1</tabstop>
<tabstop>comboBox_groups_1</tabstop>
<tabstop>tableWidget_groups_1</tabstop>
<tabstop>lineEdit_model_gcfm_01</tabstop>
......@@ -3124,7 +3123,6 @@
<tabstop>lineEdit_model_krausz_03</tabstop>
<tabstop>lineEdit_model_krausz_04</tabstop>
<tabstop>lineEdit_model_krausz_05</tabstop>
<tabstop>spinBox_agents</tabstop>
<tabstop>tableWidget_agents</tabstop>
<tabstop>lineEdit_global_navi</tabstop>
</tabstops>
......
This diff is collapsed.
......@@ -24,19 +24,18 @@ public slots:
//Inside Tab General
//Inside Tab Groups
void on_spinBox_groups_1_valueChanged(int);
void on_comboBox_groups_1_currentIndexChanged(int index);
//Inside Tab Agents
void on_spinBox_agents_valueChanged(int);
//External file
void pushButton_GeomeryClicked();
void pushButton_GoalClicked();
void pushButton_SourceClicked();
void pushButton_TrafficClicked();
void pushButton_RoutingClicked();
void pushButton_addGroupRowClicked();
void pushButton_deleteGrouprowClicked();
void pushButton_addAgentRowClicked();
void pushButton_deleteAgentRowClicked();
//Read inifile
bool readInifile(QXmlStreamReader *reader);
......@@ -74,18 +73,18 @@ public slots:
void readForceWall(QXmlStreamReader *reader, int modelindex);
void readAntiClipping(QXmlStreamReader *reader);
void readFloorfield(QXmlStreamReader *reader);
void readAgentParamaters(QXmlStreamReader *reader, int modelindex);
void readV0(QXmlStreamReader *reader, int modelindex);
void readV0Upstairs(QXmlStreamReader *reader, int modelindex);
void readV0Downstars(QXmlStreamReader *reader, int modelindex);
void readV0IdleUpstairs(QXmlStreamReader *reader, int modelindex);
void readV0Idledownstairs(QXmlStreamReader *reader, int modelindex);
void readBmax(QXmlStreamReader *reader, int modelindex);
void readBmin(QXmlStreamReader *reader, int modelindex);
void readAmin(QXmlStreamReader *reader, int modelindex);
void readTau(QXmlStreamReader *reader, int modelindex);
void readAtou(QXmlStreamReader *reader, int modelindex);
void readT(QXmlStreamReader *reader, int modelindex);
void readAgentParamaters(QXmlStreamReader *reader);
void readV0(QXmlStreamReader *reader);
void readV0Upstairs(QXmlStreamReader *reader);
void readV0Downstars(QXmlStreamReader *reader);
void readV0IdleUpstairs(QXmlStreamReader *reader);
void readV0Idledownstairs(QXmlStreamReader *reader);
void readBmax(QXmlStreamReader *reader);
void readBmin(QXmlStreamReader *reader);
void readAmin(QXmlStreamReader *reader);
void readTau(QXmlStreamReader *reader);
void readAtou(QXmlStreamReader *reader);
void readT(QXmlStreamReader *reader);
void readSway(QXmlStreamReader *reader);
void readRouteChoiceModels(QXmlStreamReader *reader);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment