[CLEANUP] Replace BusDefinitionParameterFinder with ListParameterFinder.

kactus2 · Aug 26, 2024 · 3ef490f · 3ef490f
1 parent ccd9534
commit 3ef490f
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 250 deletions.
diff --git a/KactusAPI/KactusAPI.vcxproj b/KactusAPI/KactusAPI.vcxproj
@@ -18,7 +18,6 @@
     <ClInclude Include="include\AddressBlockInterface.h" />
     <ClInclude Include="include\AddressSpaceExpressionsGatherer.h" />
     <ClInclude Include="include\AdHocConnectionInterface.h" />
-    <ClInclude Include="include\BusDefinitionParameterFinder.h" />
     <ClInclude Include="include\BusInterfaceInterface.h" />
     <ClInclude Include="include\BusInterfaceInterfaceFactory.h" />
     <ClInclude Include="include\BusInterfaceUtilities.h" />
@@ -126,7 +125,6 @@
     <ClCompile Include="expressions\RegisterExpressionsGatherer.cpp" />
     <ClCompile Include="expressions\RegisterFileExpressionsGatherer.cpp" />
     <ClCompile Include="expressions\SystemVerilogExpressionParser.cpp" />
-    <ClCompile Include="include\BusDefinitionParameterFinder.cpp" />
     <ClCompile Include="interfaces\bus\AbstractionTypeInterface.cpp" />
     <ClCompile Include="interfaces\bus\PortAbstractionInterface.cpp" />
     <ClCompile Include="interfaces\common\AbstractParameterInterface.cpp" />

diff --git a/KactusAPI/KactusAPI.vcxproj.filters b/KactusAPI/KactusAPI.vcxproj.filters
@@ -297,9 +297,6 @@
     <ClInclude Include="include\NullChannel.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\BusDefinitionParameterFinder.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="utilities\ConsoleMediator.cpp">
@@ -515,9 +512,6 @@
     <ClCompile Include="utilities\NullChannel.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="include\BusDefinitionParameterFinder.cpp">
-      <Filter>Source Files\expressions</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\ComponentInstanceInterface.h">

diff --git a/KactusAPI/include/BusDefinitionParameterFinder.cpp b/KactusAPI/include/BusDefinitionParameterFinder.cpp
diff --git a/KactusAPI/include/BusDefinitionParameterFinder.h b/KactusAPI/include/BusDefinitionParameterFinder.h
diff --git a/common/widgets/ParameterGroupBox/parametergroupbox.cpp b/common/widgets/ParameterGroupBox/parametergroupbox.cpp
@@ -152,9 +152,10 @@ void ParameterGroupBox::refresh()
 // Function: parametergroupbox::setNewParameters()
 //-----------------------------------------------------------------------------
 void ParameterGroupBox::setNewParameters(QSharedPointer<QList<QSharedPointer<Parameter> > > newParameters, 
-    Document::Revision docRevision)
+    QSharedPointer<QList<QSharedPointer<Choice> > > newChoices, Document::Revision docRevision)
 {
     parameterInterface_->setParameters(newParameters);
+    parameterInterface_->setChoices(newChoices);
     model_->resetModelItems();
     delegate_->setStdRevision(docRevision);
     parameterValidator_->setStdRevision(docRevision);

diff --git a/common/widgets/ParameterGroupBox/parametergroupbox.h b/common/widgets/ParameterGroupBox/parametergroupbox.h
@@ -69,7 +69,8 @@ class ParameterGroupBox : public QGroupBox
      *
      *      @param [in] newParameters   New parameter list.
      */
-    void setNewParameters(QSharedPointer<QList<QSharedPointer<Parameter> > > newParameters, Document::Revision docRevision);
+    void setNewParameters(QSharedPointer<QList<QSharedPointer<Parameter> > > newParameters, 
+        QSharedPointer<QList<QSharedPointer<Choice> > > newChoices, Document::Revision docRevision);
 
 signals:
 

diff --git a/editors/BusDefinitionEditor/BusDefinitionEditor.cpp b/editors/BusDefinitionEditor/BusDefinitionEditor.cpp
@@ -24,7 +24,7 @@
 #include <KactusAPI/include/SystemVerilogExpressionParser.h>
 #include <KactusAPI/include/PortAbstractionInterface.h>
 #include <KactusAPI/include/ExpressionFormatter.h>
-#include <KactusAPI/include/BusDefinitionParameterFinder.h>
+#include <KactusAPI/include/ListParameterFinder.h>
 
 #include <QApplication>
 #include <QFile>
@@ -43,7 +43,7 @@ TabDocument(parent, libHandler, DOC_PROTECTION_SUPPORT),
 busDef_(busDef),
 expressionParser_(new SystemVerilogExpressionParser()),
 busDefinitionValidator_(new BusDefinitionValidator(libHandler, expressionParser_)),
-busDefParameterFinder_(new BusDefinitionParameterFinder(busDef)),
+busDefParameterFinder_(new ListParameterFinder()),
 expressionFormatter_(new ExpressionFormatter(busDefParameterFinder_)),
 referenceCounter_(new ParameterReferenceCounter(busDefParameterFinder_)),
 parameterReferenceTree_(new BusDefinitionParameterReferenceTree(busDef, expressionFormatter_, referenceCounter_, this)),
@@ -67,6 +67,8 @@ busDefGroup_(libHandler, expressionFormatter_, busDefParameterFinder_, this)
         setProtection(true);
     }    
 
+    busDefParameterFinder_->setParameterList(busDef_->getParameters());
+
     setupLayout();
 
     connect(&busDefGroup_, SIGNAL(contentChanged()), this, SIGNAL(contentChanged()), Qt::UniqueConnection);
@@ -148,6 +150,7 @@ void BusDefinitionEditor::setBusDef(QSharedPointer<BusDefinition> busDef)
 
     busDefGroup_.setBusDef(busDef_);
     busDefGroup_.setDisabled(false);
+    busDefParameterFinder_->setParameterList(busDef->getParameters());
 
     VLNV vlnv = busDef_->getVlnv();
     setDocumentName(vlnv.getName() + " (" + vlnv.getVersion() + ")");

diff --git a/editors/BusDefinitionEditor/BusDefinitionEditor.h b/editors/BusDefinitionEditor/BusDefinitionEditor.h
@@ -29,7 +29,7 @@ class ExpressionParser;
 class ExpressionFormatter;
 class BusDefinitionParameterReferenceTree;
 class ParameterReferenceTreeWindow;
-class BusDefinitionParameterFinder;
+class ListParameterFinder;
 
 //-----------------------------------------------------------------------------
 //! Bus Editor is editor for Bus- and Abstraction definition.
@@ -156,7 +156,7 @@ public slots:
     bool busDefinitionSaved_= false;
 
     //! Parameter finder for bus definitions.
-    QSharedPointer<BusDefinitionParameterFinder> busDefParameterFinder_;
+    QSharedPointer<ListParameterFinder> busDefParameterFinder_;
 
     //! Expression formatter to use.
     QSharedPointer<ExpressionFormatter> expressionFormatter_;

diff --git a/editors/BusDefinitionEditor/busdefgroup.cpp b/editors/BusDefinitionEditor/busdefgroup.cpp
@@ -124,7 +124,7 @@ void BusDefGroup::setBusDef( QSharedPointer<BusDefinition> busDef )
 
     systemGroupEditor_.setItems(busDef_);
 
-    parameterEditor_->setNewParameters(busDef->getParameters(), busDef->getRevision());
+    parameterEditor_->setNewParameters(busDef->getParameters(), busDef->getChoices(), busDef->getRevision());
 }
 
 //-----------------------------------------------------------------------------

diff --git a/mainwindow/DockWidgetHandler.cpp b/mainwindow/DockWidgetHandler.cpp
@@ -803,7 +803,7 @@ void DockWidgetHandler::documentChanged(TabDocument* doc)
 
             QSharedPointer<Design> design = designwidget->getDiagram()->getDesign();
             designParametersEditor_->setDisabled(designwidget->isProtected());
-            designParametersEditor_->setNewParameters(design->getParameters(), design->getRevision());
+            designParametersEditor_->setNewParameters(design->getParameters(), nullptr, design->getRevision());
             designParameterTree_->setDesign(design);
             designParameterReferenceCounter_->setDesign(design);
 
@@ -1136,7 +1136,7 @@ void DockWidgetHandler::refreshDesignDocument(QWidget* currentTabWidget)
         instanceEditor_->setContext(topComponent, designWidget->getDiagram()->getEditProvider());
 
         QSharedPointer<Design> design = designWidget->getDiagram()->getDesign();
-        designParametersEditor_->setNewParameters(design->getParameters(), design->getRevision());
+        designParametersEditor_->setNewParameters(design->getParameters(), nullptr, design->getRevision());
         designParameterTree_->setDesign(design);
         designParameterReferenceCounter_->setDesign(design);
 

diff --git a/version.h b/version.h
@@ -10,20 +10,20 @@
 #ifndef VERSIONNO__H
 #define VERSIONNO__H
 
-#define VERSION_FULL           3.13.587.0
+#define VERSION_FULL           3.13.589.0
 
 #define VERSION_BASEYEAR       0
-#define VERSION_DATE           "2024-08-23"
-#define VERSION_TIME           "14:09:58"
+#define VERSION_DATE           "2024-08-26"
+#define VERSION_TIME           "13:44:51"
 
 #define VERSION_MAJOR          3
 #define VERSION_MINOR          13
-#define VERSION_BUILDNO        587
+#define VERSION_BUILDNO        589
 #define VERSION_EXTEND         0
 
-#define VERSION_FILE           3,13,587,0
-#define VERSION_PRODUCT        3,13,587,0
-#define VERSION_FILESTR        "3,13,587,0"
-#define VERSION_PRODUCTSTR     "3,13,587,0"
+#define VERSION_FILE           3,13,589,0
+#define VERSION_PRODUCT        3,13,589,0
+#define VERSION_FILESTR        "3,13,589,0"
+#define VERSION_PRODUCTSTR     "3,13,589,0"
 
 #endif