Merge pull request #164 from NREL/hybrids

New Hybrid Configurations
NREL · Sep 18, 2023 · d28005f · d28005f
2 parents 8324d45 + 83bc1f0
commit d28005f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
 
     - name: Get git ref of sibling dependency LK
       run: |
-        ref=$(git ls-remote --exit-code git://github.com/NREL/lk.git refs/heads/develop | awk '{print $1}')
+        ref=$(git ls-remote --exit-code https://github.com/NREL/lk.git refs/heads/develop | awk '{print $1}')
         echo "ref_of_lk=$ref" | tee --append $GITHUB_ENV
     - name: Get cached build data of sibling dependency LK
       uses: actions/cache@v2
@@ -61,16 +61,18 @@ jobs:
         cd $GITHUB_WORKSPACE/lk
         cmake -Bbuild_linux -DCMAKE_BUILD_TYPE=Debug
         cmake --build build_linux -- -j
-    - name: Set LKDIR and LKD_LIB envs
+    - name: Set LKDIR
       run: |
         echo "LKDIR=$GITHUB_WORKSPACE/lk" >>$GITHUB_ENV
-        echo "LKD_LIB=$GITHUB_WORKSPACE/lk/build_linux" >>$GITHUB_ENV # iff CMAKE_BUILD_TYPE=Debug
+    - name: Set LKD_LIB 
+      run: |
+        echo "LKD_LIB=$GITHUB_WORKSPACE/lk/build_linux" >>$GITHUB_ENV
     - name: Set RAPIDJSONDIR
       run: |
         echo "RAPIDJSONDIR=$GITHUB_WORKSPACE/ssc" >>$GITHUB_ENV
     - name: Get git ref of sibling dependency SSC
       run: |
-        ref=$(git ls-remote --exit-code git://github.com/NREL/ssc.git refs/heads/develop | awk '{print $1}')
+        ref=$(git ls-remote --exit-code https://github.com/NREL/ssc.git refs/heads/develop | awk '{print $1}')
         echo "ref_of_ssc=$ref" | tee --append $GITHUB_ENV
     - name: Get cached build data of sibling dependency SSC
       uses: actions/cache@v2

diff --git a/include/wex/dview/dvselectionlist.h b/include/wex/dview/dvselectionlist.h
@@ -69,6 +69,7 @@ class wxDVSelectionListCtrl : public wxScrolledWindow, public wxDVAutoColourAssi
 
     int Append(const wxString &name, const wxString &group = wxEmptyString); // returns row index
     int AppendNoUpdate(const wxString &name, const wxString &group);
+    int AppendNoUpdate(const wxString& name, const wxString& group, const wxString& hybrid_bin);
 
     void
     Append(const wxArrayString &names, const wxString &group = wxEmptyString);  // add a whole list with the same group
@@ -138,6 +139,7 @@ class wxDVSelectionListCtrl : public wxScrolledWindow, public wxDVAutoColourAssi
         wxColour color;
         wxString label;
         wxString group;
+        wxString hybrid_bin = "";
         bool value[NMAXCOLS];
         bool enable[NMAXCOLS];
         wxRect geom[NMAXCOLS]; // filled in by renderer

diff --git a/src/dview/dvselectionlist.cpp b/src/dview/dvselectionlist.cpp
@@ -138,6 +138,23 @@ int wxDVSelectionListCtrl::AppendNoUpdate(const wxString &name, const wxString &
     return m_itemList.size() - 1;
 }
 
+int wxDVSelectionListCtrl::AppendNoUpdate(const wxString& name, const wxString& group, const wxString& hybrid_bin) {
+    row_item* x = new row_item;
+    x->label = name;
+    x->group = group;
+    x->hybrid_bin = hybrid_bin;
+    for (int i = 0; i < NMAXCOLS; i++) {
+        x->value[i] = false;
+        x->enable[i] = true;
+    }
+    x->shown = true;
+
+    m_itemList.push_back(x);
+    x->row_index = m_itemList.size() - 1;
+
+    return m_itemList.size() - 1;
+}
+
 int wxDVSelectionListCtrl::Append(const wxString &name, const wxString &group) {
     int idx = AppendNoUpdate(name, group);