Merge branch 'main' of https://github.com/kactus2/kactus2dev

kactus2 · Jul 17, 2024 · c647d49 · c647d49
2 parents 84f654d + 2329eac
commit c647d49
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/Kactus2.vcxproj b/Kactus2.vcxproj
@@ -2914,8 +2914,6 @@ CreateHelp
  </QtMoc>
  </ItemGroup>
  <ItemGroup>
- <None Include="ClassDiagram2.cd" />
- <None Include="ClassDiagram21.cd" />
  <None Include="common\graphicsItems\ConnectionItem.inl" />
  <None Include="wizards\common\IPXactElementComparator.inl" />
  <None Include="wizards\common\ListComparator.inl" />

diff --git a/Kactus2.vcxproj.filters b/Kactus2.vcxproj.filters
@@ -5835,8 +5835,6 @@
  <None Include="common\graphicsItems\ConnectionItem.inl">
  <Filter>Source Files\common\graphicsItems</Filter>
  </None>
- <None Include="ClassDiagram2.cd" />
- <None Include="ClassDiagram21.cd" />
  </ItemGroup>
  <ItemGroup>
  <Image Include="appicon.ico" />

diff --git a/common/graphicsItems/ConnectionEndpoint.cpp b/common/graphicsItems/ConnectionEndpoint.cpp
@@ -171,10 +171,7 @@ bool ConnectionEndpoint::canConnect(ConnectionEndpoint const* other) const
  return false;
  }
 
- // ConnectionEndpoint:: is crucial, becuse omitting it leads to isConnectionValid using wrong "this" value;
- // as an example, if ConnectionEndpoint is of type OffPageConnectorItem, the isConnectionValid will be called on
- // parent connector, so not off page connection will be checked, but its parent connector.
- return ConnectionEndpoint::isConnectionValid(other);
+ return isConnectionValid(other);
 }
 
 //-----------------------------------------------------------------------------

diff --git a/library/HierarchyView/hierarchyfilter.cpp b/library/HierarchyView/hierarchyfilter.cpp
@@ -55,7 +55,7 @@ bool HierarchyFilter::filterAcceptsRow(int sourceRow, QModelIndex const& sourceP
  }
 
  if (auto document = getLibraryInterface()->getModelReadOnly(item->getVLNV()); 
- checkRevision(document->getRevision()) == false || checkTags(document) == false)
+ !document || checkRevision(document->getRevision()) == false || checkTags(document) == false)
  {
  return false;
  }

diff --git a/version.h b/version.h
@@ -10,20 +10,20 @@
 #ifndef VERSIONNO__H
 #define VERSIONNO__H
 
-#define VERSION_FULL 3.13.517.0
+#define VERSION_FULL 3.13.524.0
 
 #define VERSION_BASEYEAR 0
 #define VERSION_DATE "2024-07-12"
-#define VERSION_TIME "09:50:38"
+#define VERSION_TIME "16:14:01"
 
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 13
-#define VERSION_BUILDNO 517
+#define VERSION_BUILDNO 524
 #define VERSION_EXTEND 0
 
-#define VERSION_FILE 3,13,517,0
-#define VERSION_PRODUCT 3,13,517,0
-#define VERSION_FILESTR "3,13,517,0"
-#define VERSION_PRODUCTSTR "3,13,517,0"
+#define VERSION_FILE 3,13,524,0
+#define VERSION_PRODUCT 3,13,524,0
+#define VERSION_FILESTR "3,13,524,0"
+#define VERSION_PRODUCTSTR "3,13,524,0"
 
 #endif