diff --git a/Matlab/lab1.m b/Matlab/lab1.m new file mode 100644 index 0000000..9579464 --- /dev/null +++ b/Matlab/lab1.m @@ -0,0 +1,55 @@ +figure(1); +syms x; +t=-5:0.0001:5; +fx=heaviside(x+2)-heaviside(x-2); +ezplot(fx,[-5,5]); + +figure(2); +fy=heaviside(x+0.2)-heaviside(x-0.2); +ezplot(fy,[-5,5]); + +figure(3); +fz=heaviside(x+0.1)-heaviside(x-0.1); +ezplot(fz,[-5,5]); + +figure(4); +subplot(2,1,1); +fa=5*cos(12*pi*t)+6*cos(18*pi*t); +plot(t,fa); + +subplot(2,1,2); +xcorr1=autocorr(fa,t); +plot(corr1); + +figure(5); +fb=(cos(2*pi*t)).*(cos(2*pi*t)); +plot(t,fb); + +figure(6); +t = 0:0.1:10; +b1=[1,5,6]; +a1=[1,5]; +sys=tf(a1,b1); +y1=step(sys,t); +a2=[1,5]; +b2=[1,2,5]; +sys=tf(a2,b2); +y2=step(sys,t); +a3=[1.5]; +b3=[1,2,1]; +sys=tf(a3,b3); +y3=step(sys,t); +plot(t,y1,t,y2,'--',t,y3,'+'); + +figure(7); +sys=tf([1,2],[1,3,2]); +y=impulse(sys,t); +plot(t,y); + +f=cos(t); +sys=tf([-1,2],[1,3,2]); +y=lsim(sys,f,t); +plot(t,f); + + + diff --git a/SoftwareDesign/Doc/软件设计综合实验_实验报告1.docx b/SoftwareDesign/Doc/软件设计综合实验_实验报告1.docx deleted file mode 100644 index 5919ebc..0000000 Binary files a/SoftwareDesign/Doc/软件设计综合实验_实验报告1.docx and /dev/null differ diff --git a/SoftwareDesign/Code/1-1a/main.cpp b/SoftwareDesign/Lab1/1-1a/main.cpp similarity index 100% rename from SoftwareDesign/Code/1-1a/main.cpp rename to SoftwareDesign/Lab1/1-1a/main.cpp diff --git a/SoftwareDesign/Code/1-1b/main.cpp b/SoftwareDesign/Lab1/1-1b/main.cpp similarity index 100% rename from SoftwareDesign/Code/1-1b/main.cpp rename to SoftwareDesign/Lab1/1-1b/main.cpp diff --git a/SoftwareDesign/Code/1-1c/main.cpp b/SoftwareDesign/Lab1/1-1c/main.cpp similarity index 100% rename from SoftwareDesign/Code/1-1c/main.cpp rename to SoftwareDesign/Lab1/1-1c/main.cpp diff --git a/SoftwareDesign/Code/1-1d/main.cpp b/SoftwareDesign/Lab1/1-1d/main.cpp similarity index 100% rename from SoftwareDesign/Code/1-1d/main.cpp rename to SoftwareDesign/Lab1/1-1d/main.cpp diff --git a/SoftwareDesign/Code/1-2/main.cpp b/SoftwareDesign/Lab1/1-2/main.cpp similarity index 100% rename from SoftwareDesign/Code/1-2/main.cpp rename to SoftwareDesign/Lab1/1-2/main.cpp diff --git a/SoftwareDesign/Code/1-3a/main.cpp b/SoftwareDesign/Lab1/1-3a/main.cpp similarity index 100% rename from SoftwareDesign/Code/1-3a/main.cpp rename to SoftwareDesign/Lab1/1-3a/main.cpp diff --git a/SoftwareDesign/Code/1-3b/main.cpp b/SoftwareDesign/Lab1/1-3b/main.cpp similarity index 100% rename from SoftwareDesign/Code/1-3b/main.cpp rename to SoftwareDesign/Lab1/1-3b/main.cpp diff --git a/SoftwareDesign/Code/inc/matrix.hpp b/SoftwareDesign/Lab1/inc/matrix.hpp similarity index 100% rename from SoftwareDesign/Code/inc/matrix.hpp rename to SoftwareDesign/Lab1/inc/matrix.hpp diff --git a/SoftwareDesign/Code/inc/vector.hpp b/SoftwareDesign/Lab1/inc/vector.hpp similarity index 100% rename from SoftwareDesign/Code/inc/vector.hpp rename to SoftwareDesign/Lab1/inc/vector.hpp diff --git a/SoftwareDesign/Code/2-1/2-1.pro b/SoftwareDesign/Lab2/2-1/2-1.pro similarity index 100% rename from SoftwareDesign/Code/2-1/2-1.pro rename to SoftwareDesign/Lab2/2-1/2-1.pro diff --git a/SoftwareDesign/Code/2-1/main.cpp b/SoftwareDesign/Lab2/2-1/main.cpp similarity index 100% rename from SoftwareDesign/Code/2-1/main.cpp rename to SoftwareDesign/Lab2/2-1/main.cpp diff --git a/SoftwareDesign/Code/2-1/mainwindow.cpp b/SoftwareDesign/Lab2/2-1/mainwindow.cpp similarity index 100% rename from SoftwareDesign/Code/2-1/mainwindow.cpp rename to SoftwareDesign/Lab2/2-1/mainwindow.cpp diff --git a/SoftwareDesign/Code/2-1/mainwindow.h b/SoftwareDesign/Lab2/2-1/mainwindow.h similarity index 100% rename from SoftwareDesign/Code/2-1/mainwindow.h rename to SoftwareDesign/Lab2/2-1/mainwindow.h diff --git a/SoftwareDesign/Code/2-1/mainwindow.ui b/SoftwareDesign/Lab2/2-1/mainwindow.ui similarity index 100% rename from SoftwareDesign/Code/2-1/mainwindow.ui rename to SoftwareDesign/Lab2/2-1/mainwindow.ui diff --git a/SoftwareDesign/Code/2-2-1/2-2-1.pro b/SoftwareDesign/Lab2/2-2-1/2-2-1.pro similarity index 100% rename from SoftwareDesign/Code/2-2-1/2-2-1.pro rename to SoftwareDesign/Lab2/2-2-1/2-2-1.pro diff --git a/SoftwareDesign/Code/2-2-1/main.cpp b/SoftwareDesign/Lab2/2-2-1/main.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-1/main.cpp rename to SoftwareDesign/Lab2/2-2-1/main.cpp diff --git a/SoftwareDesign/Code/2-2-1/mainwindow.cpp b/SoftwareDesign/Lab2/2-2-1/mainwindow.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-1/mainwindow.cpp rename to SoftwareDesign/Lab2/2-2-1/mainwindow.cpp diff --git a/SoftwareDesign/Code/2-2-1/mainwindow.h b/SoftwareDesign/Lab2/2-2-1/mainwindow.h similarity index 100% rename from SoftwareDesign/Code/2-2-1/mainwindow.h rename to SoftwareDesign/Lab2/2-2-1/mainwindow.h diff --git a/SoftwareDesign/Code/2-2-1/mainwindow.ui b/SoftwareDesign/Lab2/2-2-1/mainwindow.ui similarity index 100% rename from SoftwareDesign/Code/2-2-1/mainwindow.ui rename to SoftwareDesign/Lab2/2-2-1/mainwindow.ui diff --git a/SoftwareDesign/Code/2-2-2/2-2-2.pro b/SoftwareDesign/Lab2/2-2-2/2-2-2.pro similarity index 100% rename from SoftwareDesign/Code/2-2-2/2-2-2.pro rename to SoftwareDesign/Lab2/2-2-2/2-2-2.pro diff --git a/SoftwareDesign/Code/2-2-2/main.cpp b/SoftwareDesign/Lab2/2-2-2/main.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-2/main.cpp rename to SoftwareDesign/Lab2/2-2-2/main.cpp diff --git a/SoftwareDesign/Code/2-2-2/mainwindow.cpp b/SoftwareDesign/Lab2/2-2-2/mainwindow.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-2/mainwindow.cpp rename to SoftwareDesign/Lab2/2-2-2/mainwindow.cpp diff --git a/SoftwareDesign/Code/2-2-2/mainwindow.h b/SoftwareDesign/Lab2/2-2-2/mainwindow.h similarity index 100% rename from SoftwareDesign/Code/2-2-2/mainwindow.h rename to SoftwareDesign/Lab2/2-2-2/mainwindow.h diff --git a/SoftwareDesign/Code/2-2-2/mainwindow.ui b/SoftwareDesign/Lab2/2-2-2/mainwindow.ui similarity index 100% rename from SoftwareDesign/Code/2-2-2/mainwindow.ui rename to SoftwareDesign/Lab2/2-2-2/mainwindow.ui diff --git a/SoftwareDesign/Code/2-2-3/2-2-3.pro b/SoftwareDesign/Lab2/2-2-3/2-2-3.pro similarity index 100% rename from SoftwareDesign/Code/2-2-3/2-2-3.pro rename to SoftwareDesign/Lab2/2-2-3/2-2-3.pro diff --git a/SoftwareDesign/Code/2-2-3/main.cpp b/SoftwareDesign/Lab2/2-2-3/main.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-3/main.cpp rename to SoftwareDesign/Lab2/2-2-3/main.cpp diff --git a/SoftwareDesign/Code/2-2-3/mainwindow.cpp b/SoftwareDesign/Lab2/2-2-3/mainwindow.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-3/mainwindow.cpp rename to SoftwareDesign/Lab2/2-2-3/mainwindow.cpp diff --git a/SoftwareDesign/Code/2-2-3/mainwindow.h b/SoftwareDesign/Lab2/2-2-3/mainwindow.h similarity index 100% rename from SoftwareDesign/Code/2-2-3/mainwindow.h rename to SoftwareDesign/Lab2/2-2-3/mainwindow.h diff --git a/SoftwareDesign/Code/2-2-3/mainwindow.ui b/SoftwareDesign/Lab2/2-2-3/mainwindow.ui similarity index 100% rename from SoftwareDesign/Code/2-2-3/mainwindow.ui rename to SoftwareDesign/Lab2/2-2-3/mainwindow.ui diff --git a/SoftwareDesign/Code/2-2-4/2-2-4.pro b/SoftwareDesign/Lab2/2-2-4/2-2-4.pro similarity index 100% rename from SoftwareDesign/Code/2-2-4/2-2-4.pro rename to SoftwareDesign/Lab2/2-2-4/2-2-4.pro diff --git a/SoftwareDesign/Code/2-2-4/main.cpp b/SoftwareDesign/Lab2/2-2-4/main.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-4/main.cpp rename to SoftwareDesign/Lab2/2-2-4/main.cpp diff --git a/SoftwareDesign/Code/2-2-4/widget.cpp b/SoftwareDesign/Lab2/2-2-4/widget.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-4/widget.cpp rename to SoftwareDesign/Lab2/2-2-4/widget.cpp diff --git a/SoftwareDesign/Code/2-2-4/widget.h b/SoftwareDesign/Lab2/2-2-4/widget.h similarity index 100% rename from SoftwareDesign/Code/2-2-4/widget.h rename to SoftwareDesign/Lab2/2-2-4/widget.h diff --git a/SoftwareDesign/Code/2-2-4/widget.ui b/SoftwareDesign/Lab2/2-2-4/widget.ui similarity index 100% rename from SoftwareDesign/Code/2-2-4/widget.ui rename to SoftwareDesign/Lab2/2-2-4/widget.ui diff --git a/SoftwareDesign/Code/2-2-5/2-2-5.pro b/SoftwareDesign/Lab2/2-2-5/2-2-5.pro similarity index 100% rename from SoftwareDesign/Code/2-2-5/2-2-5.pro rename to SoftwareDesign/Lab2/2-2-5/2-2-5.pro diff --git a/SoftwareDesign/Code/2-2-5/main.cpp b/SoftwareDesign/Lab2/2-2-5/main.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-5/main.cpp rename to SoftwareDesign/Lab2/2-2-5/main.cpp diff --git a/SoftwareDesign/Code/2-2-5/mainwindow.cpp b/SoftwareDesign/Lab2/2-2-5/mainwindow.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-5/mainwindow.cpp rename to SoftwareDesign/Lab2/2-2-5/mainwindow.cpp diff --git a/SoftwareDesign/Code/2-2-5/mainwindow.h b/SoftwareDesign/Lab2/2-2-5/mainwindow.h similarity index 100% rename from SoftwareDesign/Code/2-2-5/mainwindow.h rename to SoftwareDesign/Lab2/2-2-5/mainwindow.h diff --git a/SoftwareDesign/Code/2-2-5/mainwindow.ui b/SoftwareDesign/Lab2/2-2-5/mainwindow.ui similarity index 100% rename from SoftwareDesign/Code/2-2-5/mainwindow.ui rename to SoftwareDesign/Lab2/2-2-5/mainwindow.ui diff --git a/SoftwareDesign/Code/2-2-5_enhanced/2-2-5_enhanced.pro b/SoftwareDesign/Lab2/2-2-5_enhanced/2-2-5_enhanced.pro similarity index 100% rename from SoftwareDesign/Code/2-2-5_enhanced/2-2-5_enhanced.pro rename to SoftwareDesign/Lab2/2-2-5_enhanced/2-2-5_enhanced.pro diff --git a/SoftwareDesign/Code/2-2-5_enhanced/cal.cpp b/SoftwareDesign/Lab2/2-2-5_enhanced/cal.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-5_enhanced/cal.cpp rename to SoftwareDesign/Lab2/2-2-5_enhanced/cal.cpp diff --git a/SoftwareDesign/Code/2-2-5_enhanced/cal.h b/SoftwareDesign/Lab2/2-2-5_enhanced/cal.h similarity index 100% rename from SoftwareDesign/Code/2-2-5_enhanced/cal.h rename to SoftwareDesign/Lab2/2-2-5_enhanced/cal.h diff --git a/SoftwareDesign/Code/2-2-5_enhanced/main.cpp b/SoftwareDesign/Lab2/2-2-5_enhanced/main.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-5_enhanced/main.cpp rename to SoftwareDesign/Lab2/2-2-5_enhanced/main.cpp diff --git a/SoftwareDesign/Code/2-2-5_enhanced/mainwindow.cpp b/SoftwareDesign/Lab2/2-2-5_enhanced/mainwindow.cpp similarity index 100% rename from SoftwareDesign/Code/2-2-5_enhanced/mainwindow.cpp rename to SoftwareDesign/Lab2/2-2-5_enhanced/mainwindow.cpp diff --git a/SoftwareDesign/Code/2-2-5_enhanced/mainwindow.h b/SoftwareDesign/Lab2/2-2-5_enhanced/mainwindow.h similarity index 100% rename from SoftwareDesign/Code/2-2-5_enhanced/mainwindow.h rename to SoftwareDesign/Lab2/2-2-5_enhanced/mainwindow.h diff --git a/SoftwareDesign/Code/2-2-5_enhanced/mainwindow.ui b/SoftwareDesign/Lab2/2-2-5_enhanced/mainwindow.ui similarity index 100% rename from SoftwareDesign/Code/2-2-5_enhanced/mainwindow.ui rename to SoftwareDesign/Lab2/2-2-5_enhanced/mainwindow.ui diff --git a/SoftwareDesign/Code/2-3-1/2-3-1.pro b/SoftwareDesign/Lab2/2-3-1/2-3-1.pro similarity index 100% rename from SoftwareDesign/Code/2-3-1/2-3-1.pro rename to SoftwareDesign/Lab2/2-3-1/2-3-1.pro diff --git a/SoftwareDesign/Code/2-3-1/main.cpp b/SoftwareDesign/Lab2/2-3-1/main.cpp similarity index 100% rename from SoftwareDesign/Code/2-3-1/main.cpp rename to SoftwareDesign/Lab2/2-3-1/main.cpp diff --git a/SoftwareDesign/Code/2-3-1/mainwindow.cpp b/SoftwareDesign/Lab2/2-3-1/mainwindow.cpp similarity index 100% rename from SoftwareDesign/Code/2-3-1/mainwindow.cpp rename to SoftwareDesign/Lab2/2-3-1/mainwindow.cpp diff --git a/SoftwareDesign/Code/2-3-1/mainwindow.h b/SoftwareDesign/Lab2/2-3-1/mainwindow.h similarity index 100% rename from SoftwareDesign/Code/2-3-1/mainwindow.h rename to SoftwareDesign/Lab2/2-3-1/mainwindow.h diff --git a/SoftwareDesign/Code/2-3-1/mainwindow.ui b/SoftwareDesign/Lab2/2-3-1/mainwindow.ui similarity index 100% rename from SoftwareDesign/Code/2-3-1/mainwindow.ui rename to SoftwareDesign/Lab2/2-3-1/mainwindow.ui diff --git a/SoftwareDesign/Code/2-3-2/2-3-2.pro b/SoftwareDesign/Lab2/2-3-2/2-3-2.pro similarity index 100% rename from SoftwareDesign/Code/2-3-2/2-3-2.pro rename to SoftwareDesign/Lab2/2-3-2/2-3-2.pro diff --git a/SoftwareDesign/Code/2-3-2/main.cpp b/SoftwareDesign/Lab2/2-3-2/main.cpp similarity index 100% rename from SoftwareDesign/Code/2-3-2/main.cpp rename to SoftwareDesign/Lab2/2-3-2/main.cpp diff --git a/SoftwareDesign/Code/2-3-2/mainwindow.cpp b/SoftwareDesign/Lab2/2-3-2/mainwindow.cpp similarity index 100% rename from SoftwareDesign/Code/2-3-2/mainwindow.cpp rename to SoftwareDesign/Lab2/2-3-2/mainwindow.cpp diff --git a/SoftwareDesign/Code/2-3-2/mainwindow.h b/SoftwareDesign/Lab2/2-3-2/mainwindow.h similarity index 100% rename from SoftwareDesign/Code/2-3-2/mainwindow.h rename to SoftwareDesign/Lab2/2-3-2/mainwindow.h diff --git a/SoftwareDesign/Code/2-3-2/mainwindow.ui b/SoftwareDesign/Lab2/2-3-2/mainwindow.ui similarity index 100% rename from SoftwareDesign/Code/2-3-2/mainwindow.ui rename to SoftwareDesign/Lab2/2-3-2/mainwindow.ui diff --git a/SoftwareDesign/Code/2-3-3/2-3-3.pro b/SoftwareDesign/Lab2/2-3-3/2-3-3.pro similarity index 100% rename from SoftwareDesign/Code/2-3-3/2-3-3.pro rename to SoftwareDesign/Lab2/2-3-3/2-3-3.pro diff --git a/SoftwareDesign/Code/2-3-3/main.cpp b/SoftwareDesign/Lab2/2-3-3/main.cpp similarity index 100% rename from SoftwareDesign/Code/2-3-3/main.cpp rename to SoftwareDesign/Lab2/2-3-3/main.cpp diff --git a/SoftwareDesign/Code/2-3-3/mainwindow.cpp b/SoftwareDesign/Lab2/2-3-3/mainwindow.cpp similarity index 100% rename from SoftwareDesign/Code/2-3-3/mainwindow.cpp rename to SoftwareDesign/Lab2/2-3-3/mainwindow.cpp diff --git a/SoftwareDesign/Code/2-3-3/mainwindow.h b/SoftwareDesign/Lab2/2-3-3/mainwindow.h similarity index 100% rename from SoftwareDesign/Code/2-3-3/mainwindow.h rename to SoftwareDesign/Lab2/2-3-3/mainwindow.h diff --git a/SoftwareDesign/Code/2-3-3/mainwindow.ui b/SoftwareDesign/Lab2/2-3-3/mainwindow.ui similarity index 100% rename from SoftwareDesign/Code/2-3-3/mainwindow.ui rename to SoftwareDesign/Lab2/2-3-3/mainwindow.ui diff --git a/SoftwareDesign/Code/2-3-4/2-3-4.pro b/SoftwareDesign/Lab2/2-3-4/2-3-4.pro similarity index 100% rename from SoftwareDesign/Code/2-3-4/2-3-4.pro rename to SoftwareDesign/Lab2/2-3-4/2-3-4.pro diff --git a/SoftwareDesign/Code/2-3-4/main.cpp b/SoftwareDesign/Lab2/2-3-4/main.cpp similarity index 100% rename from SoftwareDesign/Code/2-3-4/main.cpp rename to SoftwareDesign/Lab2/2-3-4/main.cpp diff --git a/SoftwareDesign/Code/2-3-4/mainwindow.cpp b/SoftwareDesign/Lab2/2-3-4/mainwindow.cpp similarity index 100% rename from SoftwareDesign/Code/2-3-4/mainwindow.cpp rename to SoftwareDesign/Lab2/2-3-4/mainwindow.cpp diff --git a/SoftwareDesign/Code/2-3-4/mainwindow.h b/SoftwareDesign/Lab2/2-3-4/mainwindow.h similarity index 100% rename from SoftwareDesign/Code/2-3-4/mainwindow.h rename to SoftwareDesign/Lab2/2-3-4/mainwindow.h diff --git a/SoftwareDesign/Code/2-3-4/mainwindow.ui b/SoftwareDesign/Lab2/2-3-4/mainwindow.ui similarity index 100% rename from SoftwareDesign/Code/2-3-4/mainwindow.ui rename to SoftwareDesign/Lab2/2-3-4/mainwindow.ui diff --git a/SoftwareDesign/Code/Lab2-3_Calculator4490_v3/Lab2-3_Calculator4490_v3.pro b/SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/Lab2-3_Calculator4490_v3.pro similarity index 100% rename from SoftwareDesign/Code/Lab2-3_Calculator4490_v3/Lab2-3_Calculator4490_v3.pro rename to SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/Lab2-3_Calculator4490_v3.pro diff --git a/SoftwareDesign/Code/Lab2-3_Calculator4490_v3/cal.cpp b/SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/cal.cpp similarity index 100% rename from SoftwareDesign/Code/Lab2-3_Calculator4490_v3/cal.cpp rename to SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/cal.cpp diff --git a/SoftwareDesign/Code/Lab2-3_Calculator4490_v3/cal.h b/SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/cal.h similarity index 100% rename from SoftwareDesign/Code/Lab2-3_Calculator4490_v3/cal.h rename to SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/cal.h diff --git a/SoftwareDesign/Code/Lab2-3_Calculator4490_v3/main.cpp b/SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/main.cpp similarity index 100% rename from SoftwareDesign/Code/Lab2-3_Calculator4490_v3/main.cpp rename to SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/main.cpp diff --git a/SoftwareDesign/Code/Lab2-3_Calculator4490_v3/mainwindow.cpp b/SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/mainwindow.cpp similarity index 79% rename from SoftwareDesign/Code/Lab2-3_Calculator4490_v3/mainwindow.cpp rename to SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/mainwindow.cpp index f3fca90..92b397f 100644 --- a/SoftwareDesign/Code/Lab2-3_Calculator4490_v3/mainwindow.cpp +++ b/SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/mainwindow.cpp @@ -119,41 +119,8 @@ void MainWindow::keyPressEvent(QKeyEvent *event) { case Qt::Key_7: emit ui->digitBtn7->clicked(); break; - case Qt::Key_8: - emit ui->digitBtn8->clicked(); - break; - case Qt::Key_9: - emit ui->digitBtn9->clicked(); - break; - case Qt::Key_Plus: - emit ui->addBtn->clicked(); - break; - case Qt::Key_Minus: - emit ui->subtractionBtn->clicked(); - break; - case Qt::Key_Asterisk: - emit ui->mulBtn->clicked(); - break; - case Qt::Key_Slash: - emit ui->divisionBtn->clicked(); - break; - case Qt::Key_Period: - emit ui->pointBtn->clicked(); - break; - case Qt::Key_Equal: - emit ui->equalBtn->clicked(); - case Qt::Key_Backspace: - emit ui->clearBtn->clicked(); - break; - case Qt::Key_Delete: - emit ui->clearAllBtn->clicked(); - break; - case Qt::Key_Enter: - emit ui->equalBtn->clicked(); - break; - case Qt::Key_Escape: - emit ui->clearAllBtn->clicked(); - break; + case Qt::Key_8: + default: break; } diff --git a/SoftwareDesign/Code/Lab2-3_Calculator4490_v3/mainwindow.h b/SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/mainwindow.h similarity index 100% rename from SoftwareDesign/Code/Lab2-3_Calculator4490_v3/mainwindow.h rename to SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/mainwindow.h diff --git a/SoftwareDesign/Code/Lab2-3_Calculator4490_v3/mainwindow.ui b/SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/mainwindow.ui similarity index 100% rename from SoftwareDesign/Code/Lab2-3_Calculator4490_v3/mainwindow.ui rename to SoftwareDesign/Lab2/Lab2-3_Calculator4490_v3/mainwindow.ui diff --git a/SoftwareDesign/Code/lab2-3-5_KeyEvent/lab2-3-5_KeyEvent.pro b/SoftwareDesign/Lab2/lab2-3-5_KeyEvent/lab2-3-5_KeyEvent.pro similarity index 100% rename from SoftwareDesign/Code/lab2-3-5_KeyEvent/lab2-3-5_KeyEvent.pro rename to SoftwareDesign/Lab2/lab2-3-5_KeyEvent/lab2-3-5_KeyEvent.pro diff --git a/SoftwareDesign/Code/lab2-3-5_KeyEvent/main.cpp b/SoftwareDesign/Lab2/lab2-3-5_KeyEvent/main.cpp similarity index 100% rename from SoftwareDesign/Code/lab2-3-5_KeyEvent/main.cpp rename to SoftwareDesign/Lab2/lab2-3-5_KeyEvent/main.cpp diff --git a/SoftwareDesign/Code/lab2-3-5_KeyEvent/mainwindow.cpp b/SoftwareDesign/Lab2/lab2-3-5_KeyEvent/mainwindow.cpp similarity index 100% rename from SoftwareDesign/Code/lab2-3-5_KeyEvent/mainwindow.cpp rename to SoftwareDesign/Lab2/lab2-3-5_KeyEvent/mainwindow.cpp diff --git a/SoftwareDesign/Code/lab2-3-5_KeyEvent/mainwindow.h b/SoftwareDesign/Lab2/lab2-3-5_KeyEvent/mainwindow.h similarity index 100% rename from SoftwareDesign/Code/lab2-3-5_KeyEvent/mainwindow.h rename to SoftwareDesign/Lab2/lab2-3-5_KeyEvent/mainwindow.h diff --git a/SoftwareDesign/Code/lab2-3-5_KeyEvent/mainwindow.ui b/SoftwareDesign/Lab2/lab2-3-5_KeyEvent/mainwindow.ui similarity index 100% rename from SoftwareDesign/Code/lab2-3-5_KeyEvent/mainwindow.ui rename to SoftwareDesign/Lab2/lab2-3-5_KeyEvent/mainwindow.ui diff --git a/SoftwareDesign/Code/workspace.code-workspace b/SoftwareDesign/workspace.code-workspace similarity index 100% rename from SoftwareDesign/Code/workspace.code-workspace rename to SoftwareDesign/workspace.code-workspace