Skip to content

Commit

Permalink
Code-review, removed warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@hirseboy
hirseboy committed Dec 18, 2023
1 parent d1ffd08 commit 37bfe3a
Show file tree
Hide file tree
Showing 18 changed files with 62 additions and 581 deletions.
6 changes: 2 additions & 4 deletions SIM-VICUS/projects/Qt/SIM-VICUS.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ INCLUDEPATH = \
../../../externals/TiCPP/src \
../../../externals/qwt/src \
../../../externals/clipper/src \
../../../externals/RoomClipper/src \
../../../externals/RoomClipper/src \
../../../externals/QuaZIP/src \
../../../externals/QuaZIP/src/zlib \
../../../externals/IDFReader/src \
Expand All @@ -83,7 +83,7 @@ PRE_TARGETDEPS += \
$$PWD/../../../externals/lib$${DIR_PREFIX}/QtExt.lib \
$$PWD/../../../externals/lib$${DIR_PREFIX}/qwt6.lib \
$$PWD/../../../externals/lib$${DIR_PREFIX}/clipper.lib \
$$PWD/../../../externals/lib$${DIR_PREFIX}/RoomClipper.lib \
$$PWD/../../../externals/lib$${DIR_PREFIX}/RoomClipper.lib \
$$PWD/../../../externals/lib$${DIR_PREFIX}/QuaZIP.lib \
$$PWD/../../../externals/lib$${DIR_PREFIX}/Vicus.lib \
$$PWD/../../../externals/lib$${DIR_PREFIX}/Nandrad.lib \
Expand Down Expand Up @@ -263,7 +263,6 @@ SOURCES += \
../../src/SVDebugApplication.cpp \
../../src/SVGeometryView.cpp \
../../src/SVImportIDFDialog.cpp \
../../src/SVLCA.cpp \
../../src/SVLocalCoordinateView.cpp \
../../src/SVLogFileDialog.cpp \
../../src/SVLogWidget.cpp \
Expand Down Expand Up @@ -483,7 +482,6 @@ HEADERS += \
../../src/SVDebugApplication.h \
../../src/SVGeometryView.h \
../../src/SVImportIDFDialog.h \
../../src/SVLCA.h \
../../src/SVLocalCoordinateView.h \
../../src/SVLogFileDialog.h \
../../src/SVLogWidget.h \
Expand Down
12 changes: 6 additions & 6 deletions SIM-VICUS/src/SVCoSimCO2VentilationDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ struct SVCoSimCO2VentilationDialog::CO2ComfortVentilationProject {
double m_simulationEndTime = -999;

/*! Check if room is covered by ventilation control. */
static bool hasVentilationControl(const VICUS::Room &room, const VICUS::Project &project);
static bool hasVentilationControl(const VICUS::Room &room, const VICUS::Project &);
/*! Check if room is covered by ventilation model and checks parameters. Throws an exception if something is missing*/
static void checkVentilationControl(const VICUS::Room &room, const VICUS::Project &project, QString &errmsg);
static void checkVentilationControl(const VICUS::Room &room, const VICUS::Project &, QString &errmsg);
/*! Check if room is covered by ventilation model and checks parameters. Fills an error string if something is missing*/
static void checkVentilation(const VICUS::Room &room, const VICUS::Project &project, QString &errmsg);
static void checkVentilation(const VICUS::Room &room, const VICUS::Project &, QString &errmsg);

// initialize from VICUS project file
void init(const VICUS::Project &project);
Expand Down Expand Up @@ -506,7 +506,7 @@ void SVCoSimCO2VentilationDialog::CO2ComfortVentilationProject::generateFMIDefin
}


bool SVCoSimCO2VentilationDialog::CO2ComfortVentilationProject::hasVentilationControl(const VICUS::Room & room, const VICUS::Project &project)
bool SVCoSimCO2VentilationDialog::CO2ComfortVentilationProject::hasVentilationControl(const VICUS::Room & room, const VICUS::Project &/*project*/)
{
// no zone template
if(room.m_idZoneTemplate == VICUS::INVALID_ID) {
Expand All @@ -532,7 +532,7 @@ bool SVCoSimCO2VentilationDialog::CO2ComfortVentilationProject::hasVentilationCo
}


void SVCoSimCO2VentilationDialog::CO2ComfortVentilationProject::checkVentilationControl(const VICUS::Room & room, const VICUS::Project & project, QString &errmsg)
void SVCoSimCO2VentilationDialog::CO2ComfortVentilationProject::checkVentilationControl(const VICUS::Room & room, const VICUS::Project & /*project*/, QString &errmsg)
{
// no zone template
if(room.m_idZoneTemplate == VICUS::INVALID_ID) {
Expand Down Expand Up @@ -562,7 +562,7 @@ void SVCoSimCO2VentilationDialog::CO2ComfortVentilationProject::checkVentilation
}


void SVCoSimCO2VentilationDialog::CO2ComfortVentilationProject::checkVentilation(const VICUS::Room & room, const VICUS::Project & project, QString &errmsg)
void SVCoSimCO2VentilationDialog::CO2ComfortVentilationProject::checkVentilation(const VICUS::Room & room, const VICUS::Project & /*project*/, QString &errmsg)
{
// no zone template
if(room.m_idZoneTemplate == VICUS::INVALID_ID) {
Expand Down
9 changes: 9 additions & 0 deletions SIM-VICUS/src/SVDBDuplicatesDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ void SVDBDuplicatesDialog::onCurrentRowChanged(const QModelIndex & current, cons
case SVDatabase::DT_VentilationNatural: dbItem(db.m_ventilationNatural, leftID, rightID, dbElemLeft, dbElemRight); break;
case SVDatabase::DT_Infiltration: dbItem(db.m_infiltration, leftID, rightID, dbElemLeft, dbElemRight); break;
case SVDatabase::DT_ZoneTemplates: dbItem(db.m_zoneTemplates, leftID, rightID, dbElemLeft, dbElemRight); break;
case SVDatabase::DT_EpdDatasets: dbItem(db.m_epdDatasets, leftID, rightID, dbElemLeft, dbElemRight); break;
case SVDatabase::DT_AcousticTemplates: dbItem(db.m_acousticTemplates, leftID, rightID, dbElemLeft, dbElemRight); break;
case SVDatabase::NUM_DT:
break;
}
Expand Down Expand Up @@ -485,7 +487,14 @@ void SVDBDuplicatesDialog::updateUi() {
left = tr("%1 [%2]").arg( QtExt::MultiLangString2QString(db.m_zoneTemplates[duplicates.m_idFirst]->m_displayName) ).arg(duplicates.m_idFirst);
right = tr("%1 [%2]").arg( QtExt::MultiLangString2QString(db.m_zoneTemplates[duplicates.m_idSecond]->m_displayName) ).arg(duplicates.m_idSecond);
break;
case SVDatabase::DT_EpdDatasets:
item->setText(tr("EpdDatasets"));
left = tr("%1 [%2]").arg( QtExt::MultiLangString2QString(db.m_epdDatasets[duplicates.m_idFirst]->m_displayName) ).arg(duplicates.m_idFirst);
right = tr("%1 [%2]").arg( QtExt::MultiLangString2QString(db.m_epdDatasets[duplicates.m_idSecond]->m_displayName) ).arg(duplicates.m_idSecond);
break;
case SVDatabase::DT_AcousticTemplates:
case SVDatabase::NUM_DT:;// just to make compiler happy
break;
}

if (dbElemLeft != nullptr) {
Expand Down
2 changes: 1 addition & 1 deletion SIM-VICUS/src/SVDBEpdEditWidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ void SVDBEpdEditWidget::on_lineEditUUID_editingFinished() {
}


void SVDBEpdEditWidget::on_lineEditUUID_textEdited(const QString &arg1) {
void SVDBEpdEditWidget::on_lineEditUUID_textEdited(const QString &/*arg1*/) {

}

Expand Down
2 changes: 1 addition & 1 deletion SIM-VICUS/src/SVDBEpdTableModel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ void SVDBEpdTableModel::setItemLocal(const QModelIndex &index, bool local)

template <typename T>
void importDBElement(T & e, VICUS::Database<T> & db, std::map<unsigned int, unsigned int> & idSubstitutionMap,
const char * const importMsg, const char * const existingMsg)
const char * const /*importMsg*/, const char * const existingMsg)
{
FUNCID(SVProjectHandler-importDBElement);
// check, if element exists in built-in DB
Expand Down
8 changes: 4 additions & 4 deletions SIM-VICUS/src/SVDBMaterialEditWidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ void SVDBMaterialEditWidget::on_toolButtonSelectCatA_clicked() {
SVDatabaseEditDialog * editDialog = SVMainWindow::instance().dbEpdEditDialog();
unsigned int idCatA = editDialog->select(m_current->m_epdCategorySet.m_idCategory[VICUS::EpdCategorySet::C_IDCategoryA], false, "A", 4);
if (idCatA != VICUS::INVALID_ID && idCatA != m_current->m_epdCategorySet.m_idCategory[VICUS::EpdCategorySet::C_IDCategoryA]) {
VICUS::EpdDataset * epd = const_cast<VICUS::EpdDataset *>(m_db->m_epdDatasets[idCatA]);
// VICUS::EpdDataset * epd = const_cast<VICUS::EpdDataset *>(m_db->m_epdDatasets[idCatA]);

// if(epd->m_module != VICUS::EpdDataset::M_A1 &&
// epd->m_module != VICUS::EpdDataset::M_A1_A2 &&
Expand Down Expand Up @@ -464,7 +464,7 @@ void SVDBMaterialEditWidget::on_toolButtonSelectCatB_clicked() {
SVDatabaseEditDialog * editDialog = SVMainWindow::instance().dbEpdEditDialog();
unsigned int idCatB = editDialog->select(m_current->m_epdCategorySet.m_idCategory[VICUS::EpdCategorySet::C_IDCategoryB], false, "B", 4);
if (idCatB != VICUS::INVALID_ID && idCatB != m_current->m_epdCategorySet.m_idCategory[VICUS::EpdCategorySet::C_IDCategoryB]) {
VICUS::EpdDataset * epd = const_cast<VICUS::EpdDataset *>(m_db->m_epdDatasets[idCatB]);
// VICUS::EpdDataset * epd = const_cast<VICUS::EpdDataset *>(m_db->m_epdDatasets[idCatB]);

// if(epd->m_module != VICUS::EpdDataset::M_B1 &&
// epd->m_module != VICUS::EpdDataset::M_B2 &&
Expand Down Expand Up @@ -495,7 +495,7 @@ void SVDBMaterialEditWidget::on_toolButtonSelectCatC_clicked() {
unsigned int idCatC = editDialog->select(m_current->m_epdCategorySet.m_idCategory[VICUS::EpdCategorySet::C_IDCategoryC], false, "C", 4); // we do not want to reset the model all the time

if (idCatC != VICUS::INVALID_ID && idCatC != m_current->m_epdCategorySet.m_idCategory[VICUS::EpdCategorySet::C_IDCategoryC]) {
VICUS::EpdDataset * epd = const_cast<VICUS::EpdDataset *>(m_db->m_epdDatasets[idCatC]);
// VICUS::EpdDataset * epd = const_cast<VICUS::EpdDataset *>(m_db->m_epdDatasets[idCatC]);

// if(epd->m_module != VICUS::EpdDataset::M_C1 &&
// epd->m_module != VICUS::EpdDataset::M_C2 &&
Expand Down Expand Up @@ -526,7 +526,7 @@ void SVDBMaterialEditWidget::on_toolButtonSelectCatD_clicked() {
SVDatabaseEditDialog * editDialog = SVMainWindow::instance().dbEpdEditDialog();
unsigned int idCatD = editDialog->select(m_current->m_epdCategorySet.m_idCategory[VICUS::EpdCategorySet::C_IDCategoryD], false, "D", 4);
if (idCatD != VICUS::INVALID_ID && idCatD != m_current->m_epdCategorySet.m_idCategory[VICUS::EpdCategorySet::C_IDCategoryD]) {
VICUS::EpdDataset * epd = const_cast<VICUS::EpdDataset *>(m_db->m_epdDatasets[idCatD]);
// VICUS::EpdDataset * epd = const_cast<VICUS::EpdDataset *>(m_db->m_epdDatasets[idCatD]);

// if(epd->m_module != VICUS::EpdDataset::M_D )
// {
Expand Down
17 changes: 15 additions & 2 deletions SIM-VICUS/src/SVDatabase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1059,10 +1059,23 @@ void SVDatabase::removeDBElement(SVDatabase::DatabaseTypes dbType, unsigned int
m_zoneTemplates.remove(elementID);
m_zoneTemplates.m_modified = true;
break;

case DT_AcousticTemplates:
// components are referenced from project
if (SVProjectHandler::instance().isValid()) {
for (const VICUS::Building & b : project().m_buildings)
for (const VICUS::BuildingLevel & bl : b.m_buildingLevels)
for (const VICUS::Room & r : bl.m_rooms) {
VICUS::Room & c = const_cast<VICUS::Room &>(r); // const-cast is ok here
if (c.m_idZoneTemplate == elementID)
c.m_idZoneTemplate = replacementElementID;
}
}
m_zoneTemplates.remove(elementID);
m_zoneTemplates.m_modified = true;
break;
case SVDatabase::NUM_DT: ; // just to make compiler happy
break;
}

}


Expand Down
4 changes: 2 additions & 2 deletions SIM-VICUS/src/SVImportIDFDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ void SVImportIDFDialog::transferData(const EP::Project & prj, unsigned int start
// find material by name
unsigned int opaqueIdx = VICUS::elementIndex(prj.m_materials, matLay, false);
unsigned int windowIdx = VICUS::elementIndex(prj.m_windowMaterial, matLay, false);
unsigned int blindIdx, shadeIdx, screenIdx;
// unsigned int blindIdx, shadeIdx, screenIdx;

if (opaqueIdx < prj.m_materials.size()) {
IBK_ASSERT(matType == NUM_MT || matType == Opaque);
Expand Down Expand Up @@ -694,7 +694,7 @@ void SVImportIDFDialog::transferData(const EP::Project & prj, unsigned int start

// *** Adiabatic boundary conditions ("adiabatic") ***

unsigned int bcIDAdiabatic= VICUS::INVALID_ID;
// unsigned int bcIDAdiabatic = VICUS::INVALID_ID;
{
VICUS::BoundaryCondition bc;
bc.m_id = ++nextID;
Expand Down
Loading

0 comments on commit 37bfe3a

Please sign in to comment.