Skip to content

Commit c8622b0

Browse files
KuRRe8KuRRe8
committed
march commit
1 parent 5a69087 commit c8622b0

31 files changed

+507
-110
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -240,3 +240,6 @@ ModelManifest.xml
240240

241241
# FAKE - F# Make
242242
.fake/
243+
244+
#sliced picture&slicer engine
245+
slicer/

‎Gorld3D/Gorld3D.cpp

+124-4
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ void Gorld3D::UI_Construction()
2525

2626
ui.stackedWidget->removeWidget(ui.page_5);
2727
ui.stackedWidget->removeWidget(ui.page_6);// in .ui I just cant make a null stackedwidget
28-
28+
infobuttoncontainer_index = 1; //default to jobinfo tab, ui.stackedWidget->setCurrentIndex(infobuttoncontainer_index - 1)
2929
workinfotab = new workspaceinfo(this);
3030
ui.stackedWidget->addWidget(workinfotab);
31-
ui.stackedWidget->setCurrentIndex(0);
32-
int a = ui.stackedWidget->currentIndex();
33-
31+
ui.stackedWidget->setCurrentIndex(infobuttoncontainer_index - 1);
3432

33+
3534
}
3635

3736
void Gorld3D::Retranslate()
@@ -65,4 +64,125 @@ void Gorld3D::on_actionAdd_Components_triggered()
6564

6665
void Gorld3D::on_actiontest_btn_triggered()
6766
{
67+
s3d->slot_test();
68+
}
69+
70+
void Gorld3D::on_pushButton_1_1_4_settings_released()
71+
{
72+
settingDlg->show();
73+
}
74+
75+
void Gorld3D::on_jobinfo_pushButton_released()
76+
{
77+
if (infobuttoncontainer_index == 1)
78+
{
79+
ui.jobinfo_pushButton->setStyleSheet(QString::fromUtf8("QPushButton{background-color:rgb(240,240,240);\n"
80+
"color: white;\n"
81+
"/*border-radius:10px;\n"
82+
"border: 2px groove gray;*/\n"
83+
"border-style: outset;}\n"
84+
"QPushButton:hover{background-color:rgb(229,241,251);\n"
85+
"color: black;}\n"
86+
"QPushButton:pressed{background-color:rgb(119, 185, 252);}\n"
87+
""));
88+
infobuttoncontainer_index = 0;
89+
ui.stackedWidget->hide();
90+
}
91+
else
92+
{
93+
ui.jobinfo_pushButton->setStyleSheet(QString::fromUtf8("QPushButton{background-color:rgb(119, 185, 252);\n"
94+
"color: white;\n"
95+
"/*border-radius:10px;\n"
96+
"border: 2px groove gray;*/\n"
97+
"border-style: outset;}\n"
98+
"QPushButton:hover{background-color:rgb(119, 185, 252);\n"
99+
"color: black;}\n"
100+
"QPushButton:pressed{background-color:rgb(119, 185, 252);}\n"
101+
""));
102+
quint8 last_infobuttoncontainer_index = infobuttoncontainer_index;
103+
infobuttoncontainer_index = 1;
104+
ui.stackedWidget->setCurrentIndex(infobuttoncontainer_index - 1);
105+
if (last_infobuttoncontainer_index == 0)
106+
{
107+
ui.stackedWidget->show();
108+
}
109+
}
110+
}
111+
112+
void Gorld3D::on_components_pushButton_released()
113+
{
114+
if (infobuttoncontainer_index == 2)
115+
{
116+
ui.components_pushButton->setStyleSheet(QString::fromUtf8("QPushButton{background-color:rgb(240,240,240);\n"
117+
"color: white;\n"
118+
"/*border-radius:10px;\n"
119+
"border: 2px groove gray;*/\n"
120+
"border-style: outset;}\n"
121+
"QPushButton:hover{background-color:rgb(229,241,251);\n"
122+
"color: black;}\n"
123+
"QPushButton:pressed{background-color:rgb(119, 185, 252);}\n"
124+
""));
125+
infobuttoncontainer_index = 0;
126+
ui.stackedWidget->hide();
127+
}
128+
else
129+
{
130+
ui.components_pushButton->setStyleSheet(QString::fromUtf8("QPushButton{background-color:rgb(119, 185, 252);\n"
131+
"color: white;\n"
132+
"/*border-radius:10px;\n"
133+
"border: 2px groove gray;*/\n"
134+
"border-style: outset;}\n"
135+
"QPushButton:hover{background-color:rgb(119, 185, 252);\n"
136+
"color: black;}\n"
137+
"QPushButton:pressed{background-color:rgb(119, 185, 252);}\n"
138+
""));
139+
quint8 last_infobuttoncontainer_index = infobuttoncontainer_index;
140+
infobuttoncontainer_index = 2;
141+
ui.stackedWidget->setCurrentIndex(infobuttoncontainer_index - 1);
142+
if (last_infobuttoncontainer_index == 0)
143+
{
144+
ui.stackedWidget->show();
145+
}
146+
}
147+
}
148+
149+
void Gorld3D::on_scenesetting_pushButton_released()
150+
{
151+
if (infobuttoncontainer_index == 3)
152+
{
153+
ui.scenesetting_pushButton->setStyleSheet(QString::fromUtf8("QPushButton{background-color:rgb(240,240,240);\n"
154+
"color: white;\n"
155+
"/*border-radius:10px;\n"
156+
"border: 2px groove gray;*/\n"
157+
"border-style: outset;}\n"
158+
"QPushButton:hover{background-color:rgb(229,241,251);\n"
159+
"color: black;}\n"
160+
"QPushButton:pressed{background-color:rgb(119, 185, 252);}\n"
161+
""));
162+
infobuttoncontainer_index = 0;
163+
ui.stackedWidget->hide();
164+
}
165+
else
166+
{
167+
ui.scenesetting_pushButton->setStyleSheet(QString::fromUtf8("QPushButton{background-color:rgb(119, 185, 252);\n"
168+
"color: white;\n"
169+
"/*border-radius:10px;\n"
170+
"border: 2px groove gray;*/\n"
171+
"border-style: outset;}\n"
172+
"QPushButton:hover{background-color:rgb(119, 185, 252);\n"
173+
"color: black;}\n"
174+
"QPushButton:pressed{background-color:rgb(119, 185, 252);}\n"
175+
""));
176+
quint8 last_infobuttoncontainer_index = infobuttoncontainer_index;
177+
infobuttoncontainer_index = 3;
178+
ui.stackedWidget->setCurrentIndex(infobuttoncontainer_index - 1);
179+
if (last_infobuttoncontainer_index == 0)
180+
{
181+
ui.stackedWidget->show();
182+
}
183+
else
184+
{
185+
186+
}
187+
}
68188
}

‎Gorld3D/Gorld3D.h

+5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class Gorld3D : public QMainWindow
2929
SettingDlg* settingDlg;
3030
TransparentAndTools* transparentandtools;
3131
workspaceinfo* workinfotab;
32+
quint8 infobuttoncontainer_index; //0: none 1: jobinfo 2: components 3: scenesetting
3233

3334
signals:
3435
;
@@ -38,4 +39,8 @@ private slots:
3839
void on_actionAbout_triggered();
3940
void on_actionSettings_triggered();
4041
void on_actionAdd_Components_triggered();
42+
void on_pushButton_1_1_4_settings_released();
43+
void on_jobinfo_pushButton_released();
44+
void on_components_pushButton_released();
45+
void on_scenesetting_pushButton_released();
4146
};

0 commit comments

Comments
 (0)