Port to CMake and GCC, fix dark theme, add example circuits

Author: ArtSin

.gitignore

@@ -337,4 +337,73 @@ ASALocalRun/
 .localhistory/
 
 # BeatPulse healthcheck temp database
-healthchecksdb
+healthchecksdb
+
+# https://github.com/github/gitignore/blob/master/CMake.gitignore
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+
+# https://github.com/github/gitignore/blob/master/Qt.gitignore
+# C++ objects and libs
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.so.*
+*.dll
+*.dylib
+
+# Qt-es
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
+/.qmake.cache
+/.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+ui_*.h
+*.qmlc
+*.jsc
+Makefile*
+*build*
+*.qm
+*.prl
+
+# Qt unit tests
+target_wrapper.*
+
+# QtCreator
+*.autosave
+
+# QtCreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCreator CMake
+CMakeLists.txt.user*
+
+# QtCreator 4.8< compilation database 
+compile_commands.json
+
+# QtCreator local machine specific files for imported projects
+*creator.user*
+
+*_qmlcache.qrc

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools"
+}

CMakeLists.txt

@@ -0,0 +1,52 @@
+cmake_minimum_required(VERSION 3.7.0)
+
+project(OOP_Task4 VERSION 1.0.0 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
+
+add_executable(OOP_Task4
+    AddElementDialog.cpp
+    AddElementDialog.h
+    AddElementWindow.ui
+    EditElementDialog.cpp
+    EditElementDialog.h
+    EditElementWindow.ui
+    ElectricalCircuitCalculator.cpp
+    ElectricalCircuitCalculator.h
+    ElectricalElement.cpp
+    ElectricalElement.h
+    ElectricalElements/CurrentSource.cpp
+    ElectricalElements/CurrentSource.h
+    ElectricalElements/ElectricHeater.cpp
+    ElectricalElements/ElectricHeater.h
+    ElectricalElements/ElectricLamp.cpp
+    ElectricalElements/ElectricLamp.h
+    ElectricalElements/Resistor.cpp
+    ElectricalElements/Resistor.h
+    ElectricalElements/Switch.cpp
+    ElectricalElements/Switch.h
+    ElectricalElements/VoltageSource.cpp
+    ElectricalElements/VoltageSource.h
+    ElectricalElements/Wire.cpp
+    ElectricalElements/Wire.h
+    ElectricalElementsManager.cpp
+    ElectricalElementsManager.h
+    main.cpp
+    MainWindow.cpp
+    MainWindow.h
+    MainWindow.qrc
+    MainWindow.ui
+    RenderArea.cpp
+    RenderArea.h
+)
+
+target_link_libraries(OOP_Task4 Qt5::Core Qt5::Gui Qt5::Widgets)

ElectricalCircuitCalculator.cpp

@@ -46,8 +46,8 @@ bool ElectricalCircuitCalculator::findNodesAndElements(QString& error)
 
     // Каждой точке сетки сопоставляются элементы, подключённые к ней
     QMap<QPoint, QVector<ElectricalElement*>> allPoints;
-    for (int or = 0; or < 2; or++) // 2 ориентации
-        for (auto el : ElectricalElementsManager::getInstance().getElements()[or]) // Все элементы с данной ориентацией
+    for (int orient = 0; orient < 2; orient++) // 2 ориентации
+        for (auto el : ElectricalElementsManager::getInstance().getElements()[orient]) // Все элементы с данной ориентацией
             for (auto p : el->getEndPoints()) // Все крайние точки элемента
                 allPoints[p].push_back(el);
 
@@ -225,7 +225,7 @@ bool ElectricalCircuitCalculator::findVoltagesAndCurrents(QString& error)
         // Вершины, к которым подключён элемент
         int i = pr.second.first, j = pr.second.second;
         // Если есть внутреннее сопротивление
-        if (!isinf(pr.first->getResistance()))
+        if (!std::isinf(pr.first->getResistance()))
         {
             // Проводимость элемента
             double conductance = 1.0 / pr.first->getResistance();
@@ -387,7 +387,7 @@ bool ElectricalCircuitCalculator::getCurrent(const QPoint& loc, Qt::Orientation
         if (currentSources[i].first == el)
         {
             // Если идеальный источник
-            if (isinf(el->getResistance()))
+            if (std::isinf(el->getResistance()))
                 res = currentSources[i].first->getCurrent();
             else
             {