fix resize image

Author: KeltorHD

client/mainwindow.cpp

@@ -461,15 +461,17 @@ void MainWindow::fill_db_patterns(tinyxml2::XMLElement *body)
         QString img_64 {pattern->FirstChildElement("img")->GetText()};
         QString img_type {pattern->FirstChildElement("img_type")->GetText()};
 
-        QString path_to_image {QDir::currentPath() + "/images/" + name + "." + img_type};
+
+        QSqlQuery id_query("SELECT id FROM Pattern ORDER BY id DESC");
+        id_query.next();
+        QString id{QString::number(id_query.value(0).toInt() + 1)};
+
+        QString path_to_image {QDir::currentPath() + "/images/" + id + "." + img_type};
         this->save_img_to_file(path_to_image, img_64);
 
         QSqlQuery insert("INSERT INTO Pattern (name, description, code, path_to_image)"
                         " VALUES ('" + name + "', '" + description + "', '" + code + "', '" + path_to_image + "')");
 
-
-
-
         pattern = pattern->NextSiblingElement("pattern");
     }
 }
@@ -632,6 +634,19 @@ void MainWindow::on_more_btn_clicked(QString name)
 
     this->pattern_pic = QPixmap();
     this->pattern_pic.load(data.path_to_image);
+    int width{this->pattern_pic.width()};
+    if (width > 512)
+    {
+        double ratio {width / 512.0};
+
+        this->pattern_pic = this->pattern_pic.scaled(512, int(this->pattern_pic.height() / ratio), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+    }
+    else
+    {
+        double ratio {512.0 / width};
+
+        this->pattern_pic = this->pattern_pic.scaled(512, int(this->pattern_pic.height() * ratio), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+    }
 
     this->ui->img_more->setPixmap(this->pattern_pic);
 }

client/mainwindow.h

@@ -123,6 +123,7 @@ private slots:
     /*для результатов тестов*/
     std::vector<QLabel*> label_test;
     std::vector<QFrame*> lines_test;
+
     /*для списка паттернов*/
     std::vector<QLabel*> pattern_label_list;
     std::vector<QFrame*> pattern_frame_list;

client/mainwindow.ui

@@ -6,10 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>490</width>
-    <height>369</height>
+    <width>710</width>
+    <height>539</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>512</width>
+    <height>0</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Паттерны Проектирования</string>
   </property>
@@ -22,7 +28,7 @@
     <item>
      <widget class="QStackedWidget" name="screen_stacked">
       <property name="currentIndex">
-       <number>5</number>
+       <number>3</number>
       </property>
       <widget class="QWidget" name="login">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -453,8 +459,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>240</width>
-             <height>20</height>
+             <width>254</width>
+             <height>460</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -568,7 +574,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>240</width>
+             <width>237</width>
              <height>395</height>
             </rect>
            </property>
@@ -679,6 +685,12 @@
        </layout>
       </widget>
       <widget class="QWidget" name="more_pattern">
+       <property name="minimumSize">
+        <size>
+         <width>512</width>
+         <height>0</height>
+        </size>
+       </property>
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
          <widget class="QScrollArea" name="scrollArea_2">
@@ -689,11 +701,17 @@
            <property name="geometry">
             <rect>
              <x>0</x>
-             <y>-310</y>
-             <width>438</width>
-             <height>599</height>
+             <y>0</y>
+             <width>655</width>
+             <height>594</height>
             </rect>
            </property>
+           <property name="minimumSize">
+            <size>
+             <width>512</width>
+             <height>0</height>
+            </size>
+           </property>
            <layout class="QVBoxLayout" name="verticalLayout_5">
             <item>
              <widget class="QLabel" name="name_more">
@@ -763,21 +781,12 @@
             </item>
             <item>
              <widget class="QLabel" name="img_more">
-              <property name="maximumSize">
-               <size>
-                <width>512</width>
-                <height>512</height>
-               </size>
-              </property>
               <property name="text">
                <string/>
               </property>
               <property name="pixmap">
                <pixmap resource="res.qrc">:/default.png</pixmap>
               </property>
-              <property name="scaledContents">
-               <bool>false</bool>
-              </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
               </property>
@@ -822,7 +831,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>490</width>
+     <width>710</width>
      <height>21</height>
     </rect>
    </property>