Bugfix/windows fix configurators

.gitlab/ci/download_superbuild.cmake

@@ -10,16 +10,16 @@ cmake_minimum_required(VERSION 3.12)
 set(data_host "https://data.kitware.com")
 
 # Determine the tarball to download. ci-smtk-ci-developer-{date}-{git-sha}.tar.gz
-# 20231127: Enable Python in bundles
+# 20240724: Refresh for Units Library supporting "*" units
 if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2022")
-  set(file_item "6564b7f7c5a2b36857ad16c4")
-  set(file_hash "8b3687c140346c6b23629ff5373694cab068b5197be963ccf699b42ec708baaad80aa9d5e2eff26ee36c5eaea72629d212866c735789d1b0509c6f9756ec7a32")
+  set(file_item "66a13fdd5d2551c516b1d5c7")
+  set(file_hash "e248699a4b7926b2bb5fc19880a460ac36c4ebe0896dab77d8232ce96fe934e539ec77ce7602d60490499b8edf756a1ad3a68c18365606e2d8b3e45c6488a240")
 elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "macos_x86_64")
-  set(file_item "6564b7f7c5a2b36857ad16c2")
-  set(file_hash "06513bdf597172315a27fa4dce524ea4a8588721b33f5c86833140214e3f94d2e312c80cc2d5efb4b61226d4736bb0860c377722d96f89e4a20a5c91584c1329")
+  set(file_item "66a13fdd5d2551c516b1d5c5")
+  set(file_hash "807ceb6fdfad77103b849659fa033f242d8211895ebd21d9492809cae96e16fb17050daffc7f71a7fc65b8746d34c66e8d05e479fbb523b8a1b4ce0ef9af7cb5")
 elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "macos_arm64")
-  set(file_item "6564b7f6c5a2b36857ad16c0")
-  set(file_hash "cb44f9cf11f18c3517828cb76f893e8265ee01a4f1a0ae89e96695c7fa5a930226a422cb9151e7845245584e85585772eca24e029846d459e934717a8b11aace")
+  set(file_item "66a13fdd5d2551c516b1d5c3")
+  set(file_hash "a4697df02417badf76f28ab51d51db4815f13cb861a3e5f0a0d224b5dde0a389c230d385a8f03f3959b32434cadfb375ebe105c041400481d93e70711e9c8389")
 else ()
   message(FATAL_ERROR
     "Unknown build to use for the superbuild")

.gitlab/os-linux.yml

@@ -6,8 +6,8 @@
 ### Fedora
 
 .fedora33:
-    # Update to include Python support in containers.
-    image: "kitware/cmb:ci-smtk-fedora33-20231127"
+    # Update to use Units Library that supports "*" units.
+    image: "kitware/cmb:ci-smtk-fedora33-20240724"
 
     variables:
         GIT_SUBMODULE_STRATEGY: recursive
@@ -67,21 +67,21 @@
 
 .fedora33_vtk_python3:
     extends: .fedora33
-    image: "kitware/cmb:ci-smtk-fedora33-vtk-20231127"
+    image: "kitware/cmb:ci-smtk-fedora33-vtk-20240724"
 
     variables:
         CMAKE_CONFIGURATION: fedora33_vtk_python3
 
 .fedora33_paraview:
     extends: .fedora33
-    image: "kitware/cmb:ci-smtk-fedora33-paraview-20231127"
+    image: "kitware/cmb:ci-smtk-fedora33-paraview-20240724"
 
     variables:
         CMAKE_CONFIGURATION: fedora33_paraview
 
 .fedora33_paraview59_compat:
     extends: .fedora33
-    image: "kitware/cmb:ci-smtk-fedora33-paraview59-20231127"
+    image: "kitware/cmb:ci-smtk-fedora33-paraview59-20240724"
 
     variables:
         CMAKE_CONFIGURATION: fedora33_paraview59_compat

applications/TemplateEditor/AttDefDataModel.cxx

@@ -82,7 +82,7 @@ bool AttDefDataModel::hasDerivedTypes(const QModelIndex& index) const
   auto def = this->get(index);
 
   DefinitionPtrVec defVec;
-  def->resource()->derivedDefinitions(def, defVec);
+  def->attributeResource()->derivedDefinitions(def, defVec);
   return !defVec.empty();
 }
 

applications/TemplateEditor/AttDefDialog.cxx

@@ -60,7 +60,7 @@ bool AttDefDialog::validate_impl()
   const QString type = this->Ui->leType->text();
   valid &= !type.isEmpty();
 
-  auto def = this->BaseDef->resource()->findDefinition(type.toStdString());
+  auto def = this->BaseDef->attributeResource()->findDefinition(type.toStdString());
   valid &= !def;
 
   return valid;

applications/TemplateEditor/ItemDefDataModel.cxx

@@ -157,7 +157,7 @@ void ItemDefDataModel::remove(const QModelIndex& itemIndex, smtk::attribute::Def
 void ItemDefDataModel::clearAttributes(smtk::attribute::DefinitionPtr def)
 {
   std::vector<smtk::attribute::AttributePtr> atts;
-  auto sys = def->resource();
+  auto sys = def->attributeResource();
   sys->findAttributes(def->type(), atts);
   for (const auto& att : atts)
   {

data/attribute/attribute_collection/ConfigurationTestV8.sbt

@@ -0,0 +1,238 @@
+<?xml version="1.0"?>
+<!--Created by XmlV8StringWriter-->
+<SMTK_AttributeResource Version="8" ID="8fe66bab-ac3a-4ee8-bf6c-f371946f58c0" NameSeparator="-" DisplayHint="true">
+  <!--**********  Category and Analysis Information ***********-->
+  <Categories>
+    <Cat>Enclosure Radiation</Cat>
+    <Cat>Fluid Flow</Cat>
+    <Cat>Heat Transfer</Cat>
+    <Cat>Induction Heating</Cat>
+    <Cat>Solid Mechanics</Cat>
+  </Categories>
+  <ActiveCategories Enabled="false" />
+  <Analyses>
+    <Analysis Type="EC2">
+      <Cat>ec2</Cat>
+    </Analysis>
+    <Analysis Type="EC1">
+      <Cat>ec1</Cat>
+    </Analysis>
+    <Analysis Type="Solid Mechanics">
+      <Cat>Solid Mechanics</Cat>
+    </Analysis>
+    <Analysis Type="Fluid Flow">
+      <Cat>Fluid Flow</Cat>
+    </Analysis>
+    <Analysis Type="Heat Transfer">
+      <Cat>Heat Transfer</Cat>
+    </Analysis>
+    <Analysis Type="Induction Heating" BaseType="Heat Transfer">
+      <Cat>Induction Heating</Cat>
+    </Analysis>
+    <Analysis Type="Enclosure Radiation" BaseType="Heat Transfer">
+      <Cat>Enclosure Radiation</Cat>
+    </Analysis>
+  </Analyses>
+  <!--**********  Attribute Definitions ***********-->
+  <Associations />
+  <Definitions>
+    <AttDef Type="description" Label="Description" BaseType="" Version="0" Unique="false" IgnoreCategories="false">
+      <CategoryExpression InheritanceMode="Or" />
+      <ItemDefinitions>
+        <String Name="s1" Label="Advance Level and Enum Test String" Version="0" NumberOfRequiredValues="1">
+          <CategoryExpression InheritanceMode="Or" />
+          <DiscreteInfo>
+            <Structure>
+              <Value Enum="e1" AdvanceLevel="1">a</Value>
+              <CategoryExpression>('ec1')</CategoryExpression>
+            </Structure>
+            <Structure>
+              <Value Enum="e2">b</Value>
+              <CategoryExpression>('ec2')</CategoryExpression>
+            </Structure>
+            <Structure>
+              <Value Enum="e3" AdvanceLevel="1">c</Value>
+              <CategoryExpression PassMode="All" />
+            </Structure>
+          </DiscreteInfo>
+        </String>
+        <String Name="description" Label="text:" Version="0" NumberOfRequiredValues="1" MultipleLines="true">
+          <CategoryExpression InheritanceMode="Or">
+            ('Enclosure Radiation' + 'Induction Heating')
+          </CategoryExpression>
+          <BriefDescription>Text added to top of input file</BriefDescription>
+          <DefaultValue># Truchas simulation</DefaultValue>
+        </String>
+      </ItemDefinitions>
+    </AttDef>
+    <AttDef Type="numerics" Label="Numerics" BaseType="" Version="0" Unique="true" IgnoreCategories="false">
+      <CategoryExpression InheritanceMode="Or" />
+      <ItemDefinitions>
+        <Group Name="velocity-group" Label="Velocity" Version="0" NumberOfRequiredGroups="1" Extensible="true">
+          <CategoryExpression InheritanceMode="Or" />
+          <ComponentLabels CommonLabel="" />
+          <ItemDefinitions>
+            <Component Name="uniqueTest" Label="Unique Test" Version="0" EnforceCategories="false" Role="0" NumberOfRequiredValues="1">
+              <CategoryExpression InheritanceMode="Or">('Heat Transfer')</CategoryExpression>
+              <Accepts>
+                <Resource Name="smtk::model::Resource" Filter="face" />
+              </Accepts>
+              <Rejects />
+            </Component>
+            <Double Name="velocity-value" Label="Velocity" Version="0" NumberOfRequiredValues="4">
+              <CategoryExpression InheritanceMode="Or">('Fluid Flow')</CategoryExpression>
+              <ComponentLabels>
+                <Label>t</Label>
+                <Label>u</Label>
+                <Label>v</Label>
+                <Label>w</Label>
+              </ComponentLabels>
+              <DefaultValue>0.0</DefaultValue>
+            </Double>
+          </ItemDefinitions>
+        </Group>
+        <Double Name="dt_init" Label="Dt_Init" Version="0" NumberOfRequiredValues="1">
+          <CategoryExpression InheritanceMode="Or">('Fluid Flow')</CategoryExpression>
+          <BriefDescription>Integration time step value used for
+the first computation cycle</BriefDescription>
+          <DefaultValue>1.0e-6</DefaultValue>
+          <RangeInfo>
+            <Min Inclusive="false">0</Min>
+          </RangeInfo>
+        </Double>
+        <Double Name="dt_grow" Label="Dt_Grow" Version="0" NumberOfRequiredValues="1">
+          <CategoryExpression InheritanceMode="Or">('Fluid Flow')</CategoryExpression>
+          <BriefDescription>A factor to multiply the current integration time step
+when estimating the next cycle time step.</BriefDescription>
+          <DefaultValue>1.05</DefaultValue>
+          <RangeInfo>
+            <Min Inclusive="true">1</Min>
+          </RangeInfo>
+        </Double>
+        <Double Name="dt_max" Label="Dt_Max" Version="0" NumberOfRequiredValues="1">
+          <CategoryExpression InheritanceMode="Or">('Solid Mechanics')</CategoryExpression>
+          <BriefDescription>Maximum allowable value for the time step.</BriefDescription>
+          <DefaultValue>10.0</DefaultValue>
+          <RangeInfo>
+            <Min Inclusive="false">0</Min>
+          </RangeInfo>
+        </Double>
+        <Double Name="dt_min" Label="Dt_Min" Version="0" NumberOfRequiredValues="1">
+          <CategoryExpression InheritanceMode="Or">('Solid Mechanics')</CategoryExpression>
+          <BriefDescription>Minimum allowable value for the time step.</BriefDescription>
+          <DefaultValue>1.0e-6</DefaultValue>
+          <RangeInfo>
+            <Min Inclusive="false">0</Min>
+          </RangeInfo>
+        </Double>
+      </ItemDefinitions>
+    </AttDef>
+    <AttDef Type="outputs" Label="Outputs" BaseType="" Version="0" Unique="true" IgnoreCategories="false">
+      <CategoryExpression InheritanceMode="Or" />
+      <ItemDefinitions>
+        <Double Name="start-time" Label="Start Time" Version="0" NumberOfRequiredValues="1">
+          <CategoryExpression InheritanceMode="Or">
+            ('Induction Heating' ∨ 'Solid Mechanics')
+          </CategoryExpression>
+          <DefaultValue>0.0</DefaultValue>
+          <RangeInfo>
+            <Min Inclusive="true">0</Min>
+          </RangeInfo>
+        </Double>
+        <Double Name="end-time" Label="End Time" Version="0" NumberOfRequiredValues="1">
+          <CategoryExpression InheritanceMode="Or">
+            ('Induction Heating' | 'Solid Mechanics')
+          </CategoryExpression>
+          <DefaultValue>1.0</DefaultValue>
+          <RangeInfo>
+            <Min Inclusive="true">0</Min>
+          </RangeInfo>
+        </Double>
+        <Double Name="output-dt" Label="Initial Output Delta-Time" Version="0" NumberOfRequiredValues="1">
+          <CategoryExpression InheritanceMode="Or">('Heat Transfer')</CategoryExpression>
+          <DefaultValue>1.0</DefaultValue>
+          <RangeInfo>
+            <Min Inclusive="true">0</Min>
+          </RangeInfo>
+        </Double>
+        <Group Name="output-times" Label="Additional Output Control" Version="0" NumberOfRequiredGroups="0" Extensible="true">
+          <CategoryExpression InheritanceMode="Or" />
+          <ComponentLabels CommonLabel="" />
+          <ItemDefinitions>
+            <Double Name="time" Label="Output Times" Version="0" NumberOfRequiredValues="2">
+              <CategoryExpression InheritanceMode="Or">('Fluid Flow')</CategoryExpression>
+              <ComponentLabels>
+                <Label>After time:</Label>
+                <Label>Use delta time:</Label>
+              </ComponentLabels>
+            </Double>
+          </ItemDefinitions>
+        </Group>
+      </ItemDefinitions>
+    </AttDef>
+    <AttDef Type="simulation-control" Label="Simulation Control" BaseType="" Version="0" Unique="true" IgnoreCategories="false">
+      <CategoryExpression InheritanceMode="Or" />
+      <ItemDefinitions>
+        <Group Name="simulation-control" Label="Simulation Control" Version="0" Optional="true" IsEnabledByDefault="false" NumberOfRequiredGroups="1">
+          <CategoryExpression InheritanceMode="Or" />
+          <BriefDescription>This item is superseded by the displacement sequence when
+moving-enclosure radiation is enabled</BriefDescription>
+          <ItemDefinitions>
+            <Double Name="phase-start-times" Label="Phase Start Times" Version="0" NumberOfRequiredValues="1" Extensible="true">
+              <CategoryExpression InheritanceMode="Or">('Heat Transfer')</CategoryExpression>
+              <BriefDescription>The list of starting times of each of the phases</BriefDescription>
+            </Double>
+            <Double Name="phase-init-dt-factor" Label="Phase Init Dt Factor" Version="0" NumberOfRequiredValues="1">
+              <CategoryExpression InheritanceMode="Or">('Fluid Flow' | 'Heat Transfer' | 'Solid Mechanics')
+              </CategoryExpression>
+            </Double>
+          </ItemDefinitions>
+        </Group>
+      </ItemDefinitions>
+    </AttDef>
+  </Definitions>
+  <Exclusions />
+  <!--********** Workflow Views ***********-->
+  <Views>
+    <View Type="Group" Name="TopLevel" ConfigurationLabel="My Configurations:" ConfigurationType="Analysis" FilterByAdvanceLevel="true" TabPosition="North" TopLevel="true" UseConfigurations="true">
+      <Views>
+        <View Title="Test" />
+        <View Title="Configurations" />
+      </Views>
+    </View>
+    <View Type="Attribute" Name="Configurations" IgnoreCategories="true">
+      <AttributeTypes>
+        <Att Type="Analysis" />
+      </AttributeTypes>
+    </View>
+    <View Type="Instanced" Name="Description">
+      <InstancedAttributes>
+        <Att Name="description" Type="description" />
+      </InstancedAttributes>
+    </View>
+    <View Type="Instanced" Name="General">
+      <InstancedAttributes>
+        <Att Name="numerics-att" Type="numerics">
+          <ItemViews>
+            <View InsertMode="Prepend" Item="velocity-group" Type="Default" />
+            <View EditPrecision="6" Item="dt_init" Precision="2" Type="Default" />
+            <View EditPrecision="6" Item="dt_max" Notation="Fixed" Precision="6" Type="Default" />
+            <View EditPrecision="6" Item="dt_min" Notation="Scientific" Precision="6" Type="Default" />
+          </ItemViews>
+        </Att>
+        <Att Name="outputs-att" Type="outputs" />
+        <Att Name="simulation-control-att" Type="simulation-control" />
+      </InstancedAttributes>
+    </View>
+    <View Type="Group" Name="Test" Style="Tiled">
+      <Views>
+        <View Title="Description" />
+        <View Title="General" />
+      </Views>
+    </View>
+  </Views>
+  <UniqueRoles>
+    <Role ID="0" />
+    <Role ID="10" />
+  </UniqueRoles>
+</SMTK_AttributeResource>

data/attribute/attribute_collection/DoubleItemExample.sbt

@@ -1,15 +1,16 @@
 <?xml version="1.0"?>
 <!--Created by XmlV4StringWriter-->
-<SMTK_AttributeResource Version="4">
+<SMTK_AttributeResource Version="8"  DisplayHint="true">
   <!--**********  Attribute Definitions ***********-->
   <Associations />
   <Definitions>
-    <AttDef Type="doubleFunc" Association="None"/>
-    <AttDef Type="A" Label="A" BaseType="" Unique="false">
+    <AttDef Type="doubleFunc" Association="None" Units="*"/>
+    <AttDef Type="B" Label="B" BaseType="" Unique="false" Units="*"/>
+    <AttDef Type="A" Label="A" BaseType="" Unique="false" Units="m">
       <ItemDefinitions>
         <Double Name="d0" Label="Optional Double" Optional="true">
         </Double>
-        <Double Name="d1" Label="Expression Double">
+        <Double Name="d1" Label="Expression Double" Units="feet">
           <ExpressionType>doubleFunc</ExpressionType>
         </Double>
       </ItemDefinitions>
@@ -19,11 +20,22 @@
   <Views>
     <View Type="Instanced" Title="DoubleItemTest" Label="Simple Double Item Test" TopLevel="true">
       <InstancedAttributes>
-        <Att Type="A" Name="doubleTestAttribute">
+        <Att Type="A" Name="Attribute (editable units)">
           <ItemViews>
             <View Item="d1" ExpressionOnly="true"/>
           </ItemViews>
         </Att>
+        <Att Type="A" Name="Attribute (read only units)" UnitsMode="ViewOnly">
+          <ItemViews>
+            <View Item="d1" ExpressionOnly="true"/>
+          </ItemViews>
+        </Att>
+        <Att Type="A" Name="Attribute (don't show units)" UnitsMode="None">
+          <ItemViews>
+            <View Item="d1" ExpressionOnly="true"/>
+          </ItemViews>
+        </Att>
+        <Att Type="B" Name="Attribute (any units)"/>
       </InstancedAttributes>
     </View>
   </Views>