diff --git a/.github/workflows/deploy-linux.yml b/.github/workflows/deploy-linux.yml index 9c757611c..19ddba92c 100644 --- a/.github/workflows/deploy-linux.yml +++ b/.github/workflows/deploy-linux.yml @@ -2,7 +2,7 @@ name: deploy-linux on: push: branches: - - process_reset_err + - test_arm1 release: types: - published diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index a64848790..0aea660b1 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -3,7 +3,7 @@ name: deploy-macos on: push: branches: - - LESTO_project + - test_arm release: types: - published @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ macos-latest ] + os: [ macos-14 ] conda_platform: [ osx-arm64 ] artifact_name: [ gemsgui-macos ] @@ -73,6 +73,7 @@ jobs: mkdir .build && cd .build cmake -GNinja .. \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_OSX_ARCHITECTURES=arm64 \ -DCMAKE_INSTALL_PREFIX=${{ steps.strings2.outputs.deploy-output-dir }} ninja ninja install @@ -87,30 +88,72 @@ jobs: cp "Resources/rungems3-mac.sh" "${{ steps.strings.outputs.deploy-name }}/rungems3.sh" cp "Resources/README-macos.txt" "${{ steps.strings.outputs.deploy-name }}/README.txt" + - name: Install timeout tool + run: brew install coreutils + # ------------------------- - # ZIP packaging + # Verify architecture + smoke test GUI app # ------------------------- - - name: Create zip archive for GitHub release + - name: Verify runner architecture run: | - cd ${{ github.workspace }} - zip -r ${{ steps.strings2.outputs.deploy-output-name }} ${{ steps.strings.outputs.deploy-name }} + echo "uname -m:" + uname -m + if [ "$(uname -m)" != "arm64" ]; then + echo "ERROR: Not running on ARM64 runner" + exit 1 + fi + + - name: Smoke test GEMSGUI + run: | + APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor" + set +e + gtimeout 10 "$APP" -u "$HOME/gems-user-dir" + EXIT_CODE=$? + set -e + if [ "$EXIT_CODE" -ne 124 ] && [ "$EXIT_CODE" -ne 0 ]; then + echo "App crashed with exit code $EXIT_CODE" + exit 1 + fi # ------------------------- - # DMG packaging (system Qt) + # macdeployqt (NO DMG) # ------------------------- - - name: Clean previous DMG - run: | - hdiutil detach /Volumes/gem-selektor || true - rm -f gem-selektor.dmg - - - name: Create DMG with macdeployqt + - name: Run macdeployqt (no DMG) shell: bash -l {0} run: | conda activate GEMSGUI cd "${{ steps.strings2.outputs.deploy-output-dir }}" - /Users/runner/miniconda3/envs/GEMSGUI/lib/qt6/bin/macdeployqt gem-selektor.app -verbose=2 -dmg + /Users/runner/miniconda3/envs/GEMSGUI/lib/qt6/bin/macdeployqt gem-selektor.app -verbose=2 + + # ------------------------- + # Ad-hoc signing + # ------------------------- + - name: Ad-hoc sign .app bundle + run: | + cd "${{ steps.strings2.outputs.deploy-output-dir }}" + xattr -dr com.apple.quarantine gem-selektor.app || true + codesign --force --deep --sign - gem-selektor.app + codesign --verify --deep --strict gem-selektor.app + + # ------------------------- + # Create DMG (signed app inside) + # ------------------------- + - name: Create DMG + run: | + cd "${{ steps.strings2.outputs.deploy-output-dir }}" + hdiutil create -volname gem-selektor \ + -srcfolder gem-selektor.app \ + -ov -format UDZO gem-selektor.dmg mv gem-selektor.dmg "${{ github.workspace }}/macos-${{ steps.strings.outputs.deploy-name }}.dmg" + # ------------------------- + # ZIP packaging + # ------------------------- + - name: Create zip archive for GitHub release + run: | + cd ${{ github.workspace }} + zip -r ${{ steps.strings2.outputs.deploy-output-name }} ${{ steps.strings.outputs.deploy-name }} + # ------------------------- # Upload artifacts # ------------------------- diff --git a/.github/workflows/deploy-windows.yml b/.github/workflows/deploy-windows.yml index 258d1582c..747f2877e 100644 --- a/.github/workflows/deploy-windows.yml +++ b/.github/workflows/deploy-windows.yml @@ -2,7 +2,7 @@ name: deploy-windows on: push: branches: - - LESTO_project1 + - test_arm release: types: - published diff --git a/App/main.cpp b/App/main.cpp index ee725bb3d..5251d01a4 100644 --- a/App/main.cpp +++ b/App/main.cpp @@ -28,9 +28,7 @@ #include #include -#include "visor.h" #include "GemsMainWindow.h" -#include "GEMS3K/jsonconfig.h" class TIntegApp: public QApplication { @@ -80,7 +78,7 @@ TIntegApp::TIntegApp(int& c, char** v): void TIntegApp::InitMainWindow() { pVisorImp = new TVisorImp(argc, argv); - // styleHints()->setColorScheme(static_cast(pVisorImp->getColorScheme())); + styleHints()->setColorScheme(static_cast(pVisorImp->getColorScheme())); pVisorImp->show(); // init Help Window pVisorImp->GetHelp(); diff --git a/GUI/Dialogs4/GemsMainWindow.cpp b/GUI/Dialogs4/GemsMainWindow.cpp index 46eb1552f..e00d480ff 100644 --- a/GUI/Dialogs4/GemsMainWindow.cpp +++ b/GUI/Dialogs4/GemsMainWindow.cpp @@ -83,6 +83,7 @@ TVisorImp::TVisorImp(int c, char** v): ui->setupUi(this); GEMS3KGenerator::default_type_f = GEMS3KGenerator::f_json; ui->action_Use_ThermoFUN->setChecked(GEMS3KGenerator::default_type_f>=GEMS3KGenerator::f_thermofun); + ui->actionExpanded_view->setChecked(getPhaseExpandMode()); (void)statusBar(); //setMinimumSize( 300, 200 ); @@ -222,6 +223,9 @@ TVisorImp::TVisorImp(int c, char** v): GEMS3KGenerator::default_type_f = GEMS3KGenerator::f_json; } }); + connect( ui->actionExpanded_view, &QAction::toggled, [&](bool checked){ + setPhaseExpandMode(checked); + }); connect( ui->action_calcMode, SIGNAL( triggered()), this, SLOT(CmCalcMode())); connect( ui->actionDataBaseMode, SIGNAL( triggered()), this, SLOT(CmDataBaseMode())); diff --git a/GUI/Dialogs4/GemsMainWindow.h b/GUI/Dialogs4/GemsMainWindow.h index 312739191..62e2354b4 100644 --- a/GUI/Dialogs4/GemsMainWindow.h +++ b/GUI/Dialogs4/GemsMainWindow.h @@ -28,7 +28,6 @@ #include #include #include "module_w.h" -#include "v_vals.h" QT_BEGIN_NAMESPACE class QLabel; @@ -162,6 +161,7 @@ class TVisorImp: public QMainWindow int charWidth; int charHeight; int colorScheme=0; + bool phaseExpandMode = false; char TCpoint[32]; // Step point ID for stepwise mode @@ -214,6 +214,11 @@ class TVisorImp: public QMainWindow updateTime = updInterval; } + void setPhaseExpandMode(bool expand_all) + { phaseExpandMode = expand_all; } + bool getPhaseExpandMode() const + { return phaseExpandMode; } + const char* version(); const char* getGEMTitle(); const QFont& getCellFont() const diff --git a/GUI/Dialogs4/GemsMainWindow4.ui b/GUI/Dialogs4/GemsMainWindow4.ui index f598f005d..68b532e2a 100644 --- a/GUI/Dialogs4/GemsMainWindow4.ui +++ b/GUI/Dialogs4/GemsMainWindow4.ui @@ -114,6 +114,7 @@ + @@ -1301,6 +1302,14 @@ Import JSON files... + + + true + + + Expanded view + + diff --git a/GUI/Dialogs4/HelpWindow.cpp b/GUI/Dialogs4/HelpWindow.cpp index 3796f0834..a394c93ab 100644 --- a/GUI/Dialogs4/HelpWindow.cpp +++ b/GUI/Dialogs4/HelpWindow.cpp @@ -108,7 +108,7 @@ HelpWindow::HelpWindow( QWidget* parent): //End Ui form - QString collectionFile = QString( pVisor->docDir().c_str() )+ QLatin1String("gems3help.qhc"); + QString collectionFile = QString::fromStdString(pVisor->localDocDir())+ QLatin1String("gems3help.qhc"); // "/home/gems/gemworks/gems3/shared/doc/html/gems3help.qhc"; findLine = nullptr; diff --git a/GUI/Dialogs4/SettingsDialog.cpp b/GUI/Dialogs4/SettingsDialog.cpp index 413c69c48..4b43eae1d 100644 --- a/GUI/Dialogs4/SettingsDialog.cpp +++ b/GUI/Dialogs4/SettingsDialog.cpp @@ -17,6 +17,8 @@ //------------------------------------------------------------------- #include +#include +#include #include "ui_SettingsDialog4.h" #include "SettingsDialog.h" @@ -35,20 +37,15 @@ SettingsDialog::SettingsDialog (QWidget* parent) setWindowTitle( "GEM-Selektor: Settings and preferences" ); ui->pUpdateInterval->setValue( pVisorImp->updateInterval() ); - ui->comboBox->setCurrentIndex(pVisorImp->getColorScheme()); - ui->pLocalDocDir->setText(pVisor->localDocDir().c_str()); - ui->pRemoteHTML->setText(pVisor->remoteHTML().c_str()); - //pLocalDoc->setChecked(pVisor->localDoc()); - //pRemoteDoc->setChecked(!pVisor->localDoc()); - ui->pSysDBDir->setText(pVisor->sysGEMDir().c_str()); - ui->pUserDBDir->setText(pVisor->userGEMDir().c_str()); - ui->pUserDBDir->setText(pVisor->userProfDir().c_str()); + ui->pLocalDocDir->setText(QString::fromStdString(pVisor->localDocDir())); + ui->pSysDBDir->setText(QString::fromStdString(pVisor->sysGEMDir())); + //ui->pUserDBDir->setText(pVisor->userGEMDir().c_str()); + ui->pUserDBDir->setText(QString::fromStdString(pVisor->userProfDir())); ui->pFontRawName->setText(cellFont.toString()); ui->pNumDigits->setValue(pVisor->getDoubleDigits()); ui->pUpdateInterval->setValue(pVisorImp->updateInterval()); ui->pConfigAutosave->setChecked(pVisor->getConfigAutosave()); - // pConfigAutosave->setChecked( true ); if( pVisor->getElemPrMode() ) { ui->rbNewPrMode->setChecked( true ); @@ -84,20 +81,14 @@ void SettingsDialog::accept() void SettingsDialog::CmApply() { pVisorImp->setCellFont(cellFont); - pVisorImp->setColorScheme(ui->comboBox->currentIndex()); pVisor->setDoubleDigits(ui->pNumDigits->value()); pVisorImp->setUpdateInterval( ui->pUpdateInterval->value() ); pVisor->setConfigAutosave( ui->pConfigAutosave->isChecked() ); pVisor->setElemPrMode(ui->rbNewPrMode->isChecked()); - - pVisor->setLocalDocDir(ui->pLocalDocDir->text().toStdString()); - pVisor->setRemoteHTML(ui->pRemoteHTML->text().toStdString()); - + //pVisor->setLocalDocDir(ui->pLocalDocDir->text().toStdString()); pVisor->setDefaultBuiltinTDB(ui->pBuiltinTDB->text().toStdString()); - - //pVisor->setLocalDoc(pLocalDoc->isChecked()); - + qApp->styleHints()->setColorScheme(static_cast(pVisorImp->getColorScheme())); //pVisorImp->Update(true); } diff --git a/GUI/Dialogs4/SettingsDialog4.ui b/GUI/Dialogs4/SettingsDialog4.ui index 14b59b200..d43c4aaa8 100644 --- a/GUI/Dialogs4/SettingsDialog4.ui +++ b/GUI/Dialogs4/SettingsDialog4.ui @@ -32,6 +32,242 @@ true + + + + Here you can change font for the data screen forms + + + Change &font... + + + Alt+H + + + + + + + Font in data fields + + + false + + + pFontRawName + + + + + + + Currently applied font for data screen forms + + + + + + + QFrame::Shape::HLine + + + QFrame::Shadow::Sunken + + + + + + + + 0 + 0 + + + + Creation/Extension of Modelling Projects + + + + + + Keyword of default built-in TDB + + + + + + + + 0 + 0 + + + + Here, type a TDB name that will be used by default when a new independent project is created + + + + + + + Switch on to select elements and copy all related data from default database into new project + + + &Make an independent project + + + true + + + + + + + Switch on to select files from default database and link them to form a new project + + + Make a project with &linked built-in TDB files + + + + + + + + + + + Auto + + + + + Light + + + + + Dark + + + + + + + + Automatically save configuration on exit + + + true + + + + + + + Color Scheme + + + + + + + + 0 + 0 + + + + Database Folders + + + + + + Program resources folder + + + false + + + + + + + + 0 + 0 + + + + QFrame::Shape::Panel + + + QFrame::Shadow::Sunken + + + false + + + + + + + User's projects folder + + + false + + + + + + + + 0 + 0 + + + + QFrame::Shape::Panel + + + QFrame::Shadow::Sunken + + + false + + + + + + + Help file + + + + + + + + 0 + 0 + + + + QFrame::Shape::Panel + + + QFrame::Shadow::Sunken + + + false + + + + + + @@ -211,249 +447,6 @@ - - - - Color Scheme - - - - - - - QFrame::Shape::HLine - - - QFrame::Shadow::Sunken - - - - - - - - 0 - 0 - - - - Database Folders - - - - - - Program resources folder - - - false - - - - - - - - 0 - 0 - - - - QFrame::Shape::Panel - - - QFrame::Shadow::Sunken - - - false - - - - - - - User's projects folder - - - false - - - - - - - - 0 - 0 - - - - QFrame::Shape::Panel - - - QFrame::Shadow::Sunken - - - false - - - - - - - - - - - 0 - 0 - - - - Paths to Help Contents - - - - - - Help file - - - - - - - - 0 - 0 - - - - - - - - &HTML source - - - - - - - true - - - - 0 - 0 - - - - - - - - - - - Currently applied font for data screen forms - - - - - - - - 0 - 0 - - - - Creation/Extension of Modelling Projects - - - - - - Keyword of default built-in TDB - - - - - - - - 0 - 0 - - - - Here, type a TDB name that will be used by default when a new independent project is created - - - - - - - Switch on to select elements and copy all related data from default database into new project - - - &Make an independent project - - - true - - - - - - - Switch on to select files from default database and link them to form a new project - - - Make a project with &linked built-in TDB files - - - - - - - - - - Font in data fields - - - false - - - pFontRawName - - - - - - - Here you can change font for the data screen forms - - - Change &font... - - - Alt+H - - - - - - - Automatically save configuration on exit - - - true - - - @@ -461,31 +454,10 @@ - - - - - Auto - - - - - Light - - - - - Dark - - - - - pLocalDocDir - pRemoteHTML rbNewPrMode rbOldPrMode pNumDigits diff --git a/GUI/Services4/model_tree.cpp b/GUI/Services4/model_tree.cpp index a59a9f9e3..fbb43af4f 100644 --- a/GUI/Services4/model_tree.cpp +++ b/GUI/Services4/model_tree.cpp @@ -16,7 +16,7 @@ // E-mail gems2.support@psi.ch //------------------------------------------------------------------- -#include +#include #include #include #include @@ -26,7 +26,7 @@ #include "m_param.h" #include "CalcDialog.h" #include "CalcCheckDialog.h" -#include "GemsMainWindow.h" +//#include "GemsMainWindow.h" TreeLine::TreeLine(int aiPh, int aiDC, int aiDCPh): iPh( aiPh), iDC( aiDC), iDC_Ph( aiDCPh), UGval('J') @@ -611,6 +611,14 @@ void TTreeView::printList( std::fstream& ff ) } } + void TTreeView::resetList() + { + ((TTreeModel *)(model() ))->setupModelData(); + if(pVisorImp->getPhaseExpandMode()) { + expandAll(); + } + } + void TTreeView::slotPopupContextMenu(const QPoint &pos) { QModelIndex index = indexAt( pos ); diff --git a/GUI/Services4/model_tree.h b/GUI/Services4/model_tree.h index 97c4f5137..60c563005 100644 --- a/GUI/Services4/model_tree.h +++ b/GUI/Services4/model_tree.h @@ -159,10 +159,7 @@ class TTreeView: public QTreeView public: TTreeView( QWidget * parent = 0 ); void printList( std::fstream& ff ); - void resetList() - { - ((TTreeModel *)(model() ))->setupModelData(); - } + void resetList(); }; diff --git a/GUI/Services4/visor.cpp b/GUI/Services4/visor.cpp index c2c49273e..008a9d78d 100644 --- a/GUI/Services4/visor.cpp +++ b/GUI/Services4/visor.cpp @@ -60,7 +60,6 @@ const char *VISOR_DAT = "visor.data/visor.dat"; const char *DEFAULT_DB_DIR = "DB.default/"; const char *IMAGES_SRC_DIR = "img/"; const char *HELP_DB_DIR = "help/"; -const char *HELP_SRC_DIR = "doc/html/"; const char *RESOURCES_DIR = "/Resources/"; const char *DEFAULT_USER_DIR= "/Library/Gems3/"; const char *DEFAULT_PR_DIR= "projects/"; @@ -282,9 +281,6 @@ TVisor::TVisor(int c, char *v[]): // LocalDir = userGEMDir(); LocalDocDir = SysGEMDir + HELP_DB_DIR; - //RemoteDocURL = "http://gems.web.psi.ch/doc/html/"; - RemoteHTML = SysGEMDir + HELP_SRC_DIR; - LocalDoc = true; DefaultBuiltinTDB = "psi-nagra"; // PSI-Nagra TDB update TT 03.04.2013 // DefaultBuiltinTDB = "kernel"; temporary for using old Nagra-PSI (2003) dataset // DefaultBuiltinTDB = "psinagra"; // To be used after update to PSI-Nagra 2012 @@ -303,7 +299,6 @@ TVisor::TVisor(int c, char *v[]): gui_logger->info("UserGEM : {}", UserGEMDir); gui_logger->debug("UserProj : {}", UserProfDir); gui_logger->debug("LocalDoc : {}", LocalDocDir); - gui_logger->debug("LocalHTML: {}", RemoteHTML); } TVisor::~TVisor() @@ -704,8 +699,6 @@ void TVisor::toSettingsCFG() win_cfg_object["config_autosave"] = pVisor->getConfigAutosave(); win_cfg_object["local_dir"] = QString::fromStdString(LocalDir); win_cfg_object["local_doc_dir"] = QString::fromStdString(LocalDocDir); - win_cfg_object["remote_doc_url"] = QString::fromStdString(RemoteHTML); - win_cfg_object["local_doc"] = LocalDoc; win_cfg_object["current_mode"] = ProfileMode; win_cfg_object["current_project"] = rt[RT_PARAM]->PackKey(); win_cfg_object["current_system"] = rt[RT_SYSEQ]->PackKey(); @@ -750,9 +743,7 @@ void TVisor::fromSettingsCFG() pVisor->setDoubleDigits(visor_conf.value_or_default("double_precision", pVisor->getDoubleDigits())); pVisor->setConfigAutosave(visor_conf.value_or_default("config_autosave", pVisor->getConfigAutosave())); setLocalDir(visor_conf.value_or_default("local_dir", LocalDir)); - setLocalDocDir(visor_conf.value_or_default("local_doc_dir", LocalDocDir)); - setRemoteHTML(visor_conf.value_or_default("remote_doc_url", RemoteHTML)); - setLocalDoc(visor_conf.value_or_default("local_doc", LocalDoc)); + //setLocalDocDir(visor_conf.value_or_default("local_doc_dir", LocalDocDir)); ProfileMode = visor_conf.value_or_default("current_mode", ProfileMode); setDefaultBuiltinTDB(visor_conf.value_or_default("default_built_in_TDB", DefaultBuiltinTDB)); lastProjectKey = visor_conf.value_or_default("current_project", lastProjectKey); diff --git a/GUI/Services4/visor.h b/GUI/Services4/visor.h index 0a3afcaae..fbc53cb39 100644 --- a/GUI/Services4/visor.h +++ b/GUI/Services4/visor.h @@ -52,8 +52,6 @@ class TVisor //std::string ServerGems3Dir; std::string LocalDocDir; - std::string RemoteHTML; - bool LocalDoc; // obsolete std::string ImgDir; bool isElementsProfileMode = true; @@ -139,30 +137,9 @@ class TVisor LocalDir = localDir; } - std::string docDir() const { - return LocalDocDir; - // return (LocalDoc) ? LocalDocDir : RemoteDocURL; - } const std::string& localDocDir() const { return LocalDocDir; } - void setLocalDocDir(const std::string& localDir) { - LocalDocDir = localDir; - } - - const std::string& remoteHTML() const { - return RemoteHTML; - } - void setRemoteHTML(const std::string& remoteURL) { - RemoteHTML = remoteURL; - } - - bool localDoc() const { // obsolete - return LocalDoc; - } - void setLocalDoc(bool local) { // obsolete - LocalDoc = local; - } // const std::string& serverGems3Dir() const { // return ServerGems3Dir; diff --git a/Modules/gemsgui_version.h b/Modules/gemsgui_version.h index d1cf6663d..a8d440c3c 100644 --- a/Modules/gemsgui_version.h +++ b/Modules/gemsgui_version.h @@ -1,8 +1,8 @@ #pragma once -#define GEMSGUI_VERSION "3.11.0" -#define GEMSGUI_VERSION_HASH "3d18f3e7" -#define GEMSGUI_GIT_BRANCH "LESTO_project" +#define GEMSGUI_VERSION "3.11.1" +#define GEMSGUI_VERSION_HASH "43515f17" +#define GEMSGUI_GIT_BRANCH "test_arm" #define GEMSGUI_OSX "Linux" #define GEMSGUI_COMPILER_ID "GNU" #define GEMSGUI_COMPILER_VERSION "13.3.0" diff --git a/Modules/m_proces.cpp b/Modules/m_proces.cpp index 01936cbc0..0a7dd9e41 100644 --- a/Modules/m_proces.cpp +++ b/Modules/m_proces.cpp @@ -1081,6 +1081,7 @@ void TProcess::pe_text_analyze() } } + // calc function for Method of golden section double TProcess::f_proc( double x ) { @@ -1095,6 +1096,7 @@ double TProcess::f_proc( double x ) // PRof->CalcEqstat( &pep->kdt, pep->kst, pep->c_Tau ); // calc current SyStat pep->Loop = 1; CalcEquat(); + gems_logger->trace("golden section c_Eh={} c_Nu={}", pep->c_Eh,pep->c_Nu); return( pep->c_Nu ); } diff --git a/Resources/projects/CASHNK/phase.CASHNK.ndx b/Resources/projects/CASHNK/phase.CASHNK.ndx index fb370e595..5f21eab1d 100644 Binary files a/Resources/projects/CASHNK/phase.CASHNK.ndx and b/Resources/projects/CASHNK/phase.CASHNK.ndx differ diff --git a/Resources/projects/CASHNK/phase.CASHNK.pdb b/Resources/projects/CASHNK/phase.CASHNK.pdb index bff4cfcc2..7990d286f 100644 Binary files a/Resources/projects/CASHNK/phase.CASHNK.pdb and b/Resources/projects/CASHNK/phase.CASHNK.pdb differ diff --git a/Resources/projects/CASHNK/projec.CASHNK.ndx b/Resources/projects/CASHNK/projec.CASHNK.ndx index 9fc738f64..732e45cfa 100644 Binary files a/Resources/projects/CASHNK/projec.CASHNK.ndx and b/Resources/projects/CASHNK/projec.CASHNK.ndx differ diff --git a/Resources/projects/CASHNK/projec.CASHNK.pdb b/Resources/projects/CASHNK/projec.CASHNK.pdb index 4b62d49a9..3d9be157f 100644 Binary files a/Resources/projects/CASHNK/projec.CASHNK.pdb and b/Resources/projects/CASHNK/projec.CASHNK.pdb differ diff --git a/Resources/projects/CASHNK/syseq.CASHNK.ndx b/Resources/projects/CASHNK/syseq.CASHNK.ndx index 34e7740f8..7ce274356 100644 Binary files a/Resources/projects/CASHNK/syseq.CASHNK.ndx and b/Resources/projects/CASHNK/syseq.CASHNK.ndx differ diff --git a/Resources/projects/CASHNK/syseq.CASHNK.pdb b/Resources/projects/CASHNK/syseq.CASHNK.pdb index 1f5339b02..854aa6943 100644 Binary files a/Resources/projects/CASHNK/syseq.CASHNK.pdb and b/Resources/projects/CASHNK/syseq.CASHNK.pdb differ diff --git a/Resources/projects/CalcDolo/phase.CalcDolo.ndx b/Resources/projects/CalcDolo/phase.CalcDolo.ndx index 66fda23fa..e4feb9090 100644 Binary files a/Resources/projects/CalcDolo/phase.CalcDolo.ndx and b/Resources/projects/CalcDolo/phase.CalcDolo.ndx differ diff --git a/Resources/projects/CalcDolo/phase.CalcDolo.pdb b/Resources/projects/CalcDolo/phase.CalcDolo.pdb index cbcb96594..feb65e66b 100644 Binary files a/Resources/projects/CalcDolo/phase.CalcDolo.pdb and b/Resources/projects/CalcDolo/phase.CalcDolo.pdb differ diff --git a/Resources/projects/CalcDolo/projec.CalcDolo.ndx b/Resources/projects/CalcDolo/projec.CalcDolo.ndx index 07afb0743..f5b3ee547 100644 Binary files a/Resources/projects/CalcDolo/projec.CalcDolo.ndx and b/Resources/projects/CalcDolo/projec.CalcDolo.ndx differ diff --git a/Resources/projects/CalcDolo/projec.CalcDolo.pdb b/Resources/projects/CalcDolo/projec.CalcDolo.pdb index b1ba5c56f..2905fe668 100644 Binary files a/Resources/projects/CalcDolo/projec.CalcDolo.pdb and b/Resources/projects/CalcDolo/projec.CalcDolo.pdb differ diff --git a/Resources/projects/CalcDolo/syseq.CalcDolo.ndx b/Resources/projects/CalcDolo/syseq.CalcDolo.ndx index bd531bcaf..7722f08b9 100644 Binary files a/Resources/projects/CalcDolo/syseq.CalcDolo.ndx and b/Resources/projects/CalcDolo/syseq.CalcDolo.ndx differ diff --git a/Resources/projects/CalcDolo/syseq.CalcDolo.pdb b/Resources/projects/CalcDolo/syseq.CalcDolo.pdb index 2214e7d54..4ade09d1e 100644 Binary files a/Resources/projects/CalcDolo/syseq.CalcDolo.pdb and b/Resources/projects/CalcDolo/syseq.CalcDolo.pdb differ diff --git a/Resources/projects/ClaySorMo/phase.ClaySorMo.ndx b/Resources/projects/ClaySorMo/phase.ClaySorMo.ndx index 36a413b3d..cc55d1af3 100644 Binary files a/Resources/projects/ClaySorMo/phase.ClaySorMo.ndx and b/Resources/projects/ClaySorMo/phase.ClaySorMo.ndx differ diff --git a/Resources/projects/ClaySorMo/phase.ClaySorMo.pdb b/Resources/projects/ClaySorMo/phase.ClaySorMo.pdb index a9da2c9a3..4675128ca 100644 Binary files a/Resources/projects/ClaySorMo/phase.ClaySorMo.pdb and b/Resources/projects/ClaySorMo/phase.ClaySorMo.pdb differ diff --git a/Resources/projects/ClaySorMo/projec.ClaySorMo.ndx b/Resources/projects/ClaySorMo/projec.ClaySorMo.ndx index c56f9e919..7ea1eb7bc 100644 Binary files a/Resources/projects/ClaySorMo/projec.ClaySorMo.ndx and b/Resources/projects/ClaySorMo/projec.ClaySorMo.ndx differ diff --git a/Resources/projects/ClaySorMo/projec.ClaySorMo.pdb b/Resources/projects/ClaySorMo/projec.ClaySorMo.pdb index 0bb4cabd1..00adf7554 100644 Binary files a/Resources/projects/ClaySorMo/projec.ClaySorMo.pdb and b/Resources/projects/ClaySorMo/projec.ClaySorMo.pdb differ diff --git a/Resources/projects/ClaySorMo/syseq.ClaySorMo.ndx b/Resources/projects/ClaySorMo/syseq.ClaySorMo.ndx index cb9851bda..083d8bc3d 100644 Binary files a/Resources/projects/ClaySorMo/syseq.ClaySorMo.ndx and b/Resources/projects/ClaySorMo/syseq.ClaySorMo.ndx differ diff --git a/Resources/projects/ClaySorMo/syseq.ClaySorMo.pdb b/Resources/projects/ClaySorMo/syseq.ClaySorMo.pdb index 1dd87b953..766bcbae2 100644 Binary files a/Resources/projects/ClaySorMo/syseq.ClaySorMo.pdb and b/Resources/projects/ClaySorMo/syseq.ClaySorMo.pdb differ diff --git a/Resources/projects/Flowline/phase.Flowline.ndx b/Resources/projects/Flowline/phase.Flowline.ndx index 305c98ccd..f6898114e 100644 Binary files a/Resources/projects/Flowline/phase.Flowline.ndx and b/Resources/projects/Flowline/phase.Flowline.ndx differ diff --git a/Resources/projects/Flowline/phase.Flowline.pdb b/Resources/projects/Flowline/phase.Flowline.pdb index f132df06d..1f3147a8a 100644 Binary files a/Resources/projects/Flowline/phase.Flowline.pdb and b/Resources/projects/Flowline/phase.Flowline.pdb differ diff --git a/Resources/projects/Flowline/projec.Flowline.ndx b/Resources/projects/Flowline/projec.Flowline.ndx index 5e767b483..b0391933f 100644 Binary files a/Resources/projects/Flowline/projec.Flowline.ndx and b/Resources/projects/Flowline/projec.Flowline.ndx differ diff --git a/Resources/projects/Flowline/projec.Flowline.pdb b/Resources/projects/Flowline/projec.Flowline.pdb index 80f9317f4..6ddb833df 100644 Binary files a/Resources/projects/Flowline/projec.Flowline.pdb and b/Resources/projects/Flowline/projec.Flowline.pdb differ diff --git a/Resources/projects/Flowline/syseq.Flowline.ndx b/Resources/projects/Flowline/syseq.Flowline.ndx index dd9c01bb1..50ad93ba9 100644 Binary files a/Resources/projects/Flowline/syseq.Flowline.ndx and b/Resources/projects/Flowline/syseq.Flowline.ndx differ diff --git a/Resources/projects/Flowline/syseq.Flowline.pdb b/Resources/projects/Flowline/syseq.Flowline.pdb index 7886b5300..207540902 100644 Binary files a/Resources/projects/Flowline/syseq.Flowline.pdb and b/Resources/projects/Flowline/syseq.Flowline.pdb differ diff --git a/Resources/projects/GEOTHERM/phase.GEOTHERM.ndx b/Resources/projects/GEOTHERM/phase.GEOTHERM.ndx index f69c1ad72..9470782bf 100644 Binary files a/Resources/projects/GEOTHERM/phase.GEOTHERM.ndx and b/Resources/projects/GEOTHERM/phase.GEOTHERM.ndx differ diff --git a/Resources/projects/GEOTHERM/phase.GEOTHERM.pdb b/Resources/projects/GEOTHERM/phase.GEOTHERM.pdb index 38a80de8d..e37b2618c 100644 Binary files a/Resources/projects/GEOTHERM/phase.GEOTHERM.pdb and b/Resources/projects/GEOTHERM/phase.GEOTHERM.pdb differ diff --git a/Resources/projects/GEOTHERM/projec.GEOTHERM.ndx b/Resources/projects/GEOTHERM/projec.GEOTHERM.ndx index fed41040e..19760a155 100644 Binary files a/Resources/projects/GEOTHERM/projec.GEOTHERM.ndx and b/Resources/projects/GEOTHERM/projec.GEOTHERM.ndx differ diff --git a/Resources/projects/GEOTHERM/projec.GEOTHERM.pdb b/Resources/projects/GEOTHERM/projec.GEOTHERM.pdb index 86cb82868..457803901 100644 Binary files a/Resources/projects/GEOTHERM/projec.GEOTHERM.pdb and b/Resources/projects/GEOTHERM/projec.GEOTHERM.pdb differ diff --git a/Resources/projects/GEOTHERM/syseq.GEOTHERM.ndx b/Resources/projects/GEOTHERM/syseq.GEOTHERM.ndx index ecd3a9787..234a8ff35 100644 Binary files a/Resources/projects/GEOTHERM/syseq.GEOTHERM.ndx and b/Resources/projects/GEOTHERM/syseq.GEOTHERM.ndx differ diff --git a/Resources/projects/GEOTHERM/syseq.GEOTHERM.pdb b/Resources/projects/GEOTHERM/syseq.GEOTHERM.pdb index 7db0a8ca3..3dd3f9413 100644 Binary files a/Resources/projects/GEOTHERM/syseq.GEOTHERM.pdb and b/Resources/projects/GEOTHERM/syseq.GEOTHERM.pdb differ diff --git a/Resources/projects/Kaolinite/phase.Kaolinite.ndx b/Resources/projects/Kaolinite/phase.Kaolinite.ndx index 4041fda91..71e68d78b 100644 Binary files a/Resources/projects/Kaolinite/phase.Kaolinite.ndx and b/Resources/projects/Kaolinite/phase.Kaolinite.ndx differ diff --git a/Resources/projects/Kaolinite/phase.Kaolinite.pdb b/Resources/projects/Kaolinite/phase.Kaolinite.pdb index 960b09f1c..302b1582a 100644 Binary files a/Resources/projects/Kaolinite/phase.Kaolinite.pdb and b/Resources/projects/Kaolinite/phase.Kaolinite.pdb differ diff --git a/Resources/projects/Kaolinite/projec.Kaolinite.ndx b/Resources/projects/Kaolinite/projec.Kaolinite.ndx index b338b148e..197b61bb5 100644 Binary files a/Resources/projects/Kaolinite/projec.Kaolinite.ndx and b/Resources/projects/Kaolinite/projec.Kaolinite.ndx differ diff --git a/Resources/projects/Kaolinite/projec.Kaolinite.pdb b/Resources/projects/Kaolinite/projec.Kaolinite.pdb index 23cda7531..8613cd2c9 100644 Binary files a/Resources/projects/Kaolinite/projec.Kaolinite.pdb and b/Resources/projects/Kaolinite/projec.Kaolinite.pdb differ diff --git a/Resources/projects/Kaolinite/syseq.Kaolinite.ndx b/Resources/projects/Kaolinite/syseq.Kaolinite.ndx index 810ebdd93..e61a54eb0 100644 Binary files a/Resources/projects/Kaolinite/syseq.Kaolinite.ndx and b/Resources/projects/Kaolinite/syseq.Kaolinite.ndx differ diff --git a/Resources/projects/Kaolinite/syseq.Kaolinite.pdb b/Resources/projects/Kaolinite/syseq.Kaolinite.pdb index 4b48b67a7..5dee68d44 100644 Binary files a/Resources/projects/Kaolinite/syseq.Kaolinite.pdb and b/Resources/projects/Kaolinite/syseq.Kaolinite.pdb differ diff --git a/Resources/projects/PitzerTHE/phase.PitzerTHE.ndx b/Resources/projects/PitzerTHE/phase.PitzerTHE.ndx index 44a365082..16a949526 100644 Binary files a/Resources/projects/PitzerTHE/phase.PitzerTHE.ndx and b/Resources/projects/PitzerTHE/phase.PitzerTHE.ndx differ diff --git a/Resources/projects/PitzerTHE/phase.PitzerTHE.pdb b/Resources/projects/PitzerTHE/phase.PitzerTHE.pdb index 973bcdf0c..b1a8eb89e 100644 Binary files a/Resources/projects/PitzerTHE/phase.PitzerTHE.pdb and b/Resources/projects/PitzerTHE/phase.PitzerTHE.pdb differ diff --git a/Resources/projects/PitzerTHE/projec.PitzerTHE.ndx b/Resources/projects/PitzerTHE/projec.PitzerTHE.ndx index e389386a2..49d710377 100644 Binary files a/Resources/projects/PitzerTHE/projec.PitzerTHE.ndx and b/Resources/projects/PitzerTHE/projec.PitzerTHE.ndx differ diff --git a/Resources/projects/PitzerTHE/projec.PitzerTHE.pdb b/Resources/projects/PitzerTHE/projec.PitzerTHE.pdb index 0f2c9db23..e837ccfc0 100644 Binary files a/Resources/projects/PitzerTHE/projec.PitzerTHE.pdb and b/Resources/projects/PitzerTHE/projec.PitzerTHE.pdb differ diff --git a/Resources/projects/PitzerTHE/syseq.PitzerTHE.ndx b/Resources/projects/PitzerTHE/syseq.PitzerTHE.ndx index 3751d6abd..f7a522365 100644 Binary files a/Resources/projects/PitzerTHE/syseq.PitzerTHE.ndx and b/Resources/projects/PitzerTHE/syseq.PitzerTHE.ndx differ diff --git a/Resources/projects/PitzerTHE/syseq.PitzerTHE.pdb b/Resources/projects/PitzerTHE/syseq.PitzerTHE.pdb index 8632ea410..c0ac03e1f 100644 Binary files a/Resources/projects/PitzerTHE/syseq.PitzerTHE.pdb and b/Resources/projects/PitzerTHE/syseq.PitzerTHE.pdb differ diff --git a/Resources/projects/Solvus/phase.Solvus.ndx b/Resources/projects/Solvus/phase.Solvus.ndx index a7a255f2f..7d55f2bfe 100644 Binary files a/Resources/projects/Solvus/phase.Solvus.ndx and b/Resources/projects/Solvus/phase.Solvus.ndx differ diff --git a/Resources/projects/Solvus/phase.Solvus.pdb b/Resources/projects/Solvus/phase.Solvus.pdb index 6fe9c82ec..be2af500a 100644 Binary files a/Resources/projects/Solvus/phase.Solvus.pdb and b/Resources/projects/Solvus/phase.Solvus.pdb differ diff --git a/Resources/projects/Solvus/projec.Solvus.ndx b/Resources/projects/Solvus/projec.Solvus.ndx index 1caffc7fd..5598e28cf 100644 Binary files a/Resources/projects/Solvus/projec.Solvus.ndx and b/Resources/projects/Solvus/projec.Solvus.ndx differ diff --git a/Resources/projects/Solvus/projec.Solvus.pdb b/Resources/projects/Solvus/projec.Solvus.pdb index 736899696..81fed6a37 100644 Binary files a/Resources/projects/Solvus/projec.Solvus.pdb and b/Resources/projects/Solvus/projec.Solvus.pdb differ diff --git a/Resources/projects/Solvus/syseq.Solvus.ndx b/Resources/projects/Solvus/syseq.Solvus.ndx index 4ffaf3a1b..98d8be53f 100644 Binary files a/Resources/projects/Solvus/syseq.Solvus.ndx and b/Resources/projects/Solvus/syseq.Solvus.ndx differ diff --git a/Resources/projects/Solvus/syseq.Solvus.pdb b/Resources/projects/Solvus/syseq.Solvus.pdb index d10fd6958..9b7964ac4 100644 Binary files a/Resources/projects/Solvus/syseq.Solvus.pdb and b/Resources/projects/Solvus/syseq.Solvus.pdb differ diff --git a/Resources/projects/TestPNTDB/phase.TestPNTDB.ndx b/Resources/projects/TestPNTDB/phase.TestPNTDB.ndx index 811ef07ba..ff98f37a4 100644 Binary files a/Resources/projects/TestPNTDB/phase.TestPNTDB.ndx and b/Resources/projects/TestPNTDB/phase.TestPNTDB.ndx differ diff --git a/Resources/projects/TestPNTDB/phase.TestPNTDB.pdb b/Resources/projects/TestPNTDB/phase.TestPNTDB.pdb index 99b9d9c57..3d70228e1 100644 Binary files a/Resources/projects/TestPNTDB/phase.TestPNTDB.pdb and b/Resources/projects/TestPNTDB/phase.TestPNTDB.pdb differ diff --git a/Resources/projects/TestPNTDB/projec.TestPNTDB.ndx b/Resources/projects/TestPNTDB/projec.TestPNTDB.ndx index 31278b3a5..6f138a04a 100644 Binary files a/Resources/projects/TestPNTDB/projec.TestPNTDB.ndx and b/Resources/projects/TestPNTDB/projec.TestPNTDB.ndx differ diff --git a/Resources/projects/TestPNTDB/projec.TestPNTDB.pdb b/Resources/projects/TestPNTDB/projec.TestPNTDB.pdb index 2182b41bc..848e4b584 100644 Binary files a/Resources/projects/TestPNTDB/projec.TestPNTDB.pdb and b/Resources/projects/TestPNTDB/projec.TestPNTDB.pdb differ diff --git a/Resources/projects/TestPNTDB/syseq.TestPNTDB.ndx b/Resources/projects/TestPNTDB/syseq.TestPNTDB.ndx index 5b9977ecf..9ae6a6b67 100644 Binary files a/Resources/projects/TestPNTDB/syseq.TestPNTDB.ndx and b/Resources/projects/TestPNTDB/syseq.TestPNTDB.ndx differ diff --git a/Resources/projects/TestPNTDB/syseq.TestPNTDB.pdb b/Resources/projects/TestPNTDB/syseq.TestPNTDB.pdb index ede03cfd5..f96e15877 100644 Binary files a/Resources/projects/TestPNTDB/syseq.TestPNTDB.pdb and b/Resources/projects/TestPNTDB/syseq.TestPNTDB.pdb differ diff --git a/Resources/projects/TestSUP98/phase.TestSUP98.ndx b/Resources/projects/TestSUP98/phase.TestSUP98.ndx index 88f004fc8..840ed9306 100644 Binary files a/Resources/projects/TestSUP98/phase.TestSUP98.ndx and b/Resources/projects/TestSUP98/phase.TestSUP98.ndx differ diff --git a/Resources/projects/TestSUP98/phase.TestSUP98.pdb b/Resources/projects/TestSUP98/phase.TestSUP98.pdb index 11dc46a72..212218973 100644 Binary files a/Resources/projects/TestSUP98/phase.TestSUP98.pdb and b/Resources/projects/TestSUP98/phase.TestSUP98.pdb differ diff --git a/Resources/projects/TestSUP98/projec.TestSUP98.ndx b/Resources/projects/TestSUP98/projec.TestSUP98.ndx index 10c188fe7..cc7b86a36 100644 Binary files a/Resources/projects/TestSUP98/projec.TestSUP98.ndx and b/Resources/projects/TestSUP98/projec.TestSUP98.ndx differ diff --git a/Resources/projects/TestSUP98/projec.TestSUP98.pdb b/Resources/projects/TestSUP98/projec.TestSUP98.pdb index d6a1182fe..e87a2c660 100644 Binary files a/Resources/projects/TestSUP98/projec.TestSUP98.pdb and b/Resources/projects/TestSUP98/projec.TestSUP98.pdb differ diff --git a/Resources/projects/TestSUP98/syseq.TestSUP98.ndx b/Resources/projects/TestSUP98/syseq.TestSUP98.ndx index c70536299..51ac2dadb 100644 Binary files a/Resources/projects/TestSUP98/syseq.TestSUP98.ndx and b/Resources/projects/TestSUP98/syseq.TestSUP98.ndx differ diff --git a/Resources/projects/TestSUP98/syseq.TestSUP98.pdb b/Resources/projects/TestSUP98/syseq.TestSUP98.pdb index e32a369a7..c66b7e615 100644 Binary files a/Resources/projects/TestSUP98/syseq.TestSUP98.pdb and b/Resources/projects/TestSUP98/syseq.TestSUP98.pdb differ